[SCM] ksysguard packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-21-gc5159d7
Philip Muškovac
yofel-guest at moszumanska.debian.org
Fri Jan 8 19:04:34 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/ksysguard.git;a=commitdiff;h=6d28b20
The following commit has been merged in the kubuntu_wily_backports branch:
commit 6d28b20cf16298cc0e714c98ae41f933f90cfb57
Merge: d24c81e367a1dd161711066ab202751c388a1552 59a28ccff923febae61cb93eeac1c2f2be671c97
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Sat Dec 5 02:33:06 2015 -0800
* New upstream release (5.4.3).
-- Maximiliano Curia <maxy at debian.org> Tue, 01 Dec 2015 11:45:57 +0100 * New upstream release (5.4.2).
-- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 07:52:13 +0200 * New upstream release (5.4.1).
-- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:23 +0200 * New upstream release (5.4.0).
-- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 01:13:20 +0200 * Add the missing Breaks/Replaces.
-- Maximiliano Curia <maxy at debian.org> Fri, 03 Jul 2015 14:08:00 +0200 * New upstream release (5.3.0). * New upstream release (5.3.1). * New upstream release (5.3.2). * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 11:24:03 +0200
* New upstream release (5.4.3).
-- Maximiliano Curia <maxy at debian.org> Tue, 01 Dec 2015 11:45:57 +0100
* New upstream release (5.4.2).
-- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 07:52:13 +0200
* New upstream release (5.4.1).
-- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:23 +0200
* New upstream release (5.4.0).
-- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 01:13:20 +0200
* Add the missing Breaks/Replaces.
-- Maximiliano Curia <maxy at debian.org> Fri, 03 Jul 2015 14:08:00 +0200
* New upstream release (5.3.0).
* New upstream release (5.3.1).
* New upstream release (5.3.2).
* Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 11:24:03 +0200
debian/changelog | 56 +++++++++----
debian/control | 6 +-
debian/copyright | 244 +++++++++++++++++++++++++++++++++++++++++++------------
debian/rules | 3 +
4 files changed, 240 insertions(+), 69 deletions(-)
diff --cc debian/changelog
index ff630cd,0bd62eb..8786ff3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,41 +1,82 @@@
++ksysguard (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
++
++ * Debian merge: No remaining changes.
++
++ -- Scarlett Clark <sgclark at kubuntu.org> Sat, 05 Dec 2015 02:28:43 -0800
++
+ksysguard (4:5.4.3-0ubuntu1) xenial; urgency=medium
+
+ [ Scarlett Clark ]
+ * Vivid backport
+ * New upstream bugfix release
+
+ [ Philip Muškovac ]
+ * New upstream bugfix release (LP: #1518598)
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sun, 22 Nov 2015 16:32:38 +0100
+
+ ksysguard (4:5.4.3-1) unstable; urgency=medium
+
+ * New upstream release (5.4.3).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 01 Dec 2015 11:45:57 +0100
+
+ ksysguard (4:5.4.2-1) unstable; urgency=medium
+
+ * New upstream release (5.4.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 07:52:13 +0200
+
+ksysguard (4:5.4.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 02 Oct 2015 15:55:26 +0100
+
+ksysguard (4:5.4.1-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 08 Sep 2015 10:17:31 +0100
+
+ ksysguard (4:5.4.1-1) unstable; urgency=medium
+
+ * New upstream release (5.4.1).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:23 +0200
+
+ ksysguard (4:5.4.0-1) unstable; urgency=medium
+
+ * New upstream release (5.4.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 01:13:20 +0200
+
+ksysguard (4:5.4.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 31 Aug 2015 15:51:18 +0100
+
+ksysguard (4:5.3.95-0ubuntu1) wily; urgency=medium
+
- [ Scarlett Clark ]
- * Vivid backport
-
- [ Jonathan Riddell ]
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 10 Aug 2015 23:15:19 +0200
+
- ksysguard (4:5.3.2-0ubuntu1) wily; urgency=medium
+ ksysguard (4:5.3.2-2) unstable; urgency=medium
- * New upstream release
+ * Add the missing Breaks/Replaces.
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 02 Jul 2015 12:29:00 +0000
+ -- Maximiliano Curia <maxy at debian.org> Fri, 03 Jul 2015 14:08:00 +0200
+
+ ksysguard (4:5.3.2-1) unstable; urgency=medium
+
+ * New upstream release (5.3.0).
+ * New upstream release (5.3.1).
+ * New upstream release (5.3.2).
+ * Update copyright information.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 11:24:03 +0200
ksysguard (4:5.3.1-0ubuntu2) wily; urgency=medium
diff --cc debian/copyright
index df01f91,5538f1d..daae31a
--- a/debian/copyright
+++ b/debian/copyright
@@@ -175,7 -162,64 +162,68 @@@ License: GPL-2+
Files: ksysguardd/FreeBSD/stat.c
Copyright: 2011, David Naylor <naylor.b.david at gmail.com>
++<<<<<<< HEAD
+License: GPL-2+, and BSD-3-clause
++=======
+ License: BSD-3-clause_and_GPL-2+
+ Copyright (c) 2011 David Naylor <naylor.b.david at gmail.com>
+ .
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of version 2 or later of the GNU General Public
+ License as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ /*
+ * Taken from http://cvsweb.freebsd.org/src/usr.bin/systat/fetch.c
+ */
+ /*-
+ * Copyright (c) 1983, 1989, 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+ --
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+ Files: po/bg/ksysguard.po
+ Copyright: 2009-2011, Yasen Pramatarov <yasen at lindeas.com>
+ 2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
+ License: GPL
+ This file is licensed under the GPL.
+ --
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL'.
++>>>>>>> master
Files: debian/*
Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
@@@ -194,29 -266,64 +270,91 @@@ License: GPL-2
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
+ --
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+ License: GPL-2+3
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of
+ the License, or (at your option) version 3.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ --
On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3'.
+
+ License: GPL-2+3+KDEeV
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License version 2 or at your option version 3 as published by
+ the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ --
+ On Debian systems, the complete text of the GNU General Public License
++<<<<<<< HEAD
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
++=======
+ version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3'.
+
+ License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ --
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
++>>>>>>> master
--
ksysguard packaging
More information about the pkg-kde-commits
mailing list