[SCM] kscreen packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-35-ge4ca5ae
Philip Muškovac
yofel-guest at moszumanska.debian.org
Fri Jan 8 19:03:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreen.git;a=commitdiff;h=1bbe7c5
The following commit has been merged in the kubuntu_wily_backports branch:
commit 1bbe7c59db7bc7125e086a25bfccbf13e12d2f51
Merge: 0c123ea381e7369d6630db891920b567bcda867a 15f9ef39385ebf8492cd918ffa88043a9fb9c46c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Dec 4 22:05:20 2015 -0800
* New upstream release (5.4.3).
-- Maximiliano Curia <maxy at debian.org> Tue, 01 Dec 2015 11:45:44 +0100 * New upstream release (5.4.2).
-- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 09:22:13 +0200 * New upstream release (5.4.1).
-- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:03 +0200 * New upstream release (5.4.0).
-- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 09:12:06 +0200 * Team upload. * Fix spelling of qml-module-qtgraphicaleffects
-- Scott Kitterman <scott at kitterman.com> Sun, 26 Jul 2015 18:44:47 -0400 * Team upload. * High urgency for RC bug fix for stretch * Add missing depends on plasma-framework and qml-module-graphicaleffects (Closes: #791437)
-- Scott Kitterman <scott at kitterman.com> Sun, 26 Jul 2015 14:52:54 -0400 * Team upload * Add kde-cli-tools to depends for kcmshell5 (Closes: #791340)
-- Scott Kitterman <scott at kitterman.com> Sun, 12 Jul 2015 13:09:32 -0400 * New upstream release (5.3.0). * New upstream release (5.3.1). * New upstream release (5.3.2).
-- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 12:31:53 +0200
* New upstream release (5.4.3).
-- Maximiliano Curia <maxy at debian.org> Tue, 01 Dec 2015 11:45:44 +0100
* New upstream release (5.4.2).
-- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 09:22:13 +0200
* New upstream release (5.4.1).
-- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 18:45:03 +0200
* New upstream release (5.4.0).
-- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 09:12:06 +0200
* Team upload.
* Fix spelling of qml-module-qtgraphicaleffects
-- Scott Kitterman <scott at kitterman.com> Sun, 26 Jul 2015 18:44:47 -0400
* Team upload.
* High urgency for RC bug fix for stretch
* Add missing depends on plasma-framework and qml-module-graphicaleffects
(Closes: #791437)
-- Scott Kitterman <scott at kitterman.com> Sun, 26 Jul 2015 14:52:54 -0400
* Team upload
* Add kde-cli-tools to depends for kcmshell5 (Closes: #791340)
-- Scott Kitterman <scott at kitterman.com> Sun, 12 Jul 2015 13:09:32 -0400
* New upstream release (5.3.0).
* New upstream release (5.3.1).
* New upstream release (5.3.2).
-- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 12:31:53 +0200
debian/changelog | 72 +++++++++++++++++++++++++++++++++++------
debian/control | 12 ++++++-
debian/tests/control | 6 ++--
debian/tests/testsuite | 7 +---
debian/tests/testsuite.xsession | 10 +-----
5 files changed, 79 insertions(+), 28 deletions(-)
diff --cc debian/changelog
index 19af323,cf7fc41..bff071a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,66 -1,63 +1,127 @@@
++kscreen (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
++
++ * Debian merge: No remaining changes.
++
++ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 04 Dec 2015 21:52:33 -0800
++
+kscreen (4:5.4.3-0ubuntu1) xenial; urgency=medium
+
+ [ Scarlett Clark ]
+ * 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:31:43 +0100
+
+ kscreen (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:44 +0100
+
+ kscreen (4:5.4.2-1) unstable; urgency=medium
+
+ * New upstream release (5.4.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 09:22:13 +0200
+
+kscreen (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
+
+ * Vivid backport
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 05 Oct 2015 11:45:09 -0700
+
+kscreen (4:5.4.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 02 Oct 2015 15:54:37 +0100
+
+ kscreen (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:03 +0200
+
+kscreen (4:5.4.1-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 08 Sep 2015 10:16:55 +0100
+
+ kscreen (4:5.4.0-1) unstable; urgency=medium
+
+ * New upstream release (5.4.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 09:12:06 +0200
+
+kscreen (4:5.4.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 31 Aug 2015 15:50:43 +0100
+
+kscreen (4:5.3.95-0ubuntu2) wily; urgency=medium
+
+ * Bump build-dep of libkf5screen-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 11 Aug 2015 13:45:06 +0200
+
+kscreen (4:5.3.95-0ubuntu1) wily; urgency=medium
+
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 10 Aug 2015 23:14:41 +0200
+
+ kscreen (4:5.3.2-4) unstable; urgency=high
+
+ * Team upload.
+ * Fix spelling of qml-module-qtgraphicaleffects
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 26 Jul 2015 18:44:47 -0400
+
+ kscreen (4:5.3.2-3) unstable; urgency=high
+
+ * Team upload.
+ * High urgency for RC bug fix for stretch
+ * Add missing depends on plasma-framework and qml-module-graphicaleffects
+ (Closes: #791437)
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 26 Jul 2015 14:52:54 -0400
+
+kscreen (4:5.3.2-0ubuntu2) wily; urgency=medium
+
+ * Add kubuntu_disable-test.diff to disable failing test
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 13 Jul 2015 13:37:40 +0200
+
+ kscreen (4:5.3.2-2) unstable; urgency=medium
+
+ * Team upload
+ * Add kde-cli-tools to depends for kcmshell5 (Closes: #791340)
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 12 Jul 2015 13:09:32 -0400
+
+ kscreen (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).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 12:31:53 +0200
+
-kscreen (4:5.3.2-0ubuntu2) wily; urgency=medium
+kscreen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
- * Add kubuntu_disable-test.diff to disable failing test
+ * Vivid backport
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 13 Jul 2015 13:37:40 +0200
+ -- Scarlett Clark <sgclark at kubuntu.org> Thu, 02 Jul 2015 11:38:42 -0700
+
+kscreen (4:5.3.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 02 Jul 2015 12:28:35 +0000
kscreen (4:5.3.1-0ubuntu1) wily; urgency=medium
diff --cc debian/control
index 48a4c0b,20c7897..4e23b26
--- a/debian/control
+++ b/debian/control
@@@ -12,7 -13,8 +13,12 @@@ Build-Depends: cmake (>= 2.8.12)
libkf5dbusaddons-dev (>= 5.1.0),
libkf5globalaccel-dev (>= 5.1.0),
libkf5i18n-dev,
++<<<<<<< HEAD
+ libkf5screen-dev (>= 4:5.4.3~),
++=======
+ libkf5screen-dev (>= 4:5.2.91~),
+ libkf5widgetsaddons-dev,
++>>>>>>> master
libkf5xmlgui-dev (>= 5.1.0),
libqjson-dev,
libqt5x11extras5-dev (>= 5.4),
@@@ -28,7 -29,8 +33,12 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: kscreen
Architecture: any
++<<<<<<< HEAD
+Depends: plasma-framework,
++=======
+ Depends: kde-cli-tools,
+ plasma-framework,
++>>>>>>> master
qml-module-qtgraphicaleffects,
${misc:Depends},
${shlibs:Depends}
--
kscreen packaging
More information about the pkg-kde-commits
mailing list