[SCM] plasma-desktop packaging branch, master, updated. debian/5.4.0-3-18-g67fa898
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Sep 9 14:49:01 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=22012a2
The following commit has been merged in the master branch:
commit 22012a24fc646d6b3635e94a27ad23bc1a560995
Merge: 208a24ff8a11535f5a101dfe5bb37558b51dd5ac 9a2cff294ef5892fd48d5c7b2741108a4404bb74
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Sep 9 15:05:03 2015 +0200
Merge tag 'ubuntu/4%5.4.0-0ubuntu1'
'plasma-desktop Ubuntu release 4:5.4.0-0ubuntu1'
debian/changelog | 40 ++++++++++++++++++++++++++++++++++++++--
debian/control | 10 +++++++++-
2 files changed, 47 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index fcb5aaf,da468e2..a57b014
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,61 -1,39 +1,97 @@@
+plasma-desktop (4:5.4.1-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.4.1).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 09 Sep 2015 14:55:15 +0200
+
+plasma-desktop (4:5.4.0-3) experimental; urgency=medium
+
+ * Build with -gstabs instead of -g on mips and mipsel to work around
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 05 Sep 2015 19:32:33 +0200
+
+plasma-desktop (4:5.4.0-2) unstable; urgency=medium
+
+ * Force building against the experimental version of baloo.
+ virtual memory exhaustion.
+
+ -- Felix Geyer <fgeyer at debian.org> Fri, 04 Sep 2015 21:07:53 +0200
+
+plasma-desktop (4:5.4.0-1) unstable; urgency=medium
+
+ * New upstream release (5.4.0).
+ * Remove upstream patch: upstream-
+ replace_license_reference_by_license_text
+ * Remove upstream patch: upstream_add_missing_licenses
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 04 Sep 2015 09:49:23 +0200
+
+ plasma-desktop (4:5.4.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 31 Aug 2015 15:54:56 +0100
+
+ plasma-desktop (4:5.3.95-0ubuntu1) wily; urgency=medium
+
+ [ Scarlett Clark ]
- * Vivid backport.
- * Manual merge.
++ * Vivid backport.
++ * Manual merge.
+
+ [ Jonathan Riddell ]
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 10 Aug 2015 23:19:44 +0200
+
+plasma-desktop (4:5.3.2-2) unstable; urgency=high
+
+ * Team upload.
+
+ [ Maximiliano Curia ]
+ * Add missing Breaks/Replaces. (Closes: #791891) Thanks to Andreas
+ Beckman
+
+ [ Felix Geyer ]
+ * Make Breaks/Replaces against kde-touchpad and kde-config-touchpad
+ versioned. (Closes: #793568)
+ They are transitional packages now.
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org> Sun, 26 Jul 2015 15:38:15 +0200
+
+plasma-desktop (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.
+ * Add the missing Breaks/Replaces.
+ * New upstream patch: upstream-
+ replace_license_reference_by_license_text
+ * New upstream approved patch (reviewboard
+ https://git.reviewboard.kde.org/r/124290/):
+ upstream_add_missing_licenses.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 08 Jul 2015 22:33:00 +0200
+
+ plasma-desktop (4:5.3.2-0ubuntu3) wily; urgency=medium
+
+ * add those breaks/replaces to plasma-desktop-data as well
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sun, 26 Jul 2015 21:26:47 +0200
+
+ plasma-desktop (4:5.3.2-0ubuntu2) wily; urgency=medium
+
+ * add versions to breaks/replaces for touchpad which have
+ transitionals
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 14 Jul 2015 23:44:09 +0200
+
+ plasma-desktop (4:5.3.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 02 Jul 2015 12:36:43 +0000
+
plasma-desktop (4:5.3.1-0ubuntu3) wily; urgency=medium
* Remove dep on plasma-nm at upstream's request
@@@ -249,7 -234,7 +285,7 @@@ plasma-desktop (4:4.98.0-0ubuntu1) utop
* New upstream RC release
[ Scarlett Clark ]
-- * fix install file
++ * fix install file
-- Jonathan Riddell <jriddell at ubuntu.com> Mon, 07 Jul 2014 13:27:40 +0200
@@@ -257,6 -242,6 +293,6 @@@ plasma-desktop (4:4.97.0-0ubuntu1) utop
[ Scarlett Clark ]
* Initial release.
-- * add plasma-nm networking depend
++ * add plasma-nm networking depend
-- Scarlett Clark <scarlett at scarlettgatelyclark.com> Tue, 10 Jun 2014 10:24:08 +0100
diff --cc debian/control
index 9f6d5d7,5453950..0f59547
--- a/debian/control
+++ b/debian/control
@@@ -7,11 -7,11 +7,11 @@@ Build-Depends: baloo-kf5-dev (>= 5.13~)
cmake (>= 2.8.12),
debhelper (>= 9),
extra-cmake-modules (>= 1.8.0~),
- kded5-dev (>= 5.9.0~),
- kdoctools-dev (>= 5.9.0~),
+ kded5-dev (>= 5.12.0~),
+ kdoctools-dev (>= 5.12.0~),
kinit-dev,
kio-dev,
- kwin-dev (>= 4:5.2.2),
+ kwin-dev (>= 4:5.4.0~),
libboost-dev,
libcanberra-dev,
libfontconfig1-dev,
@@@ -131,12 -135,14 +135,14 @@@ Recommends: bluedevil
systemsettings,
user-manager
Breaks: baloo-kf5 (<< 5.5),
- kde-config-touchpad (<< ${source:Version}),
- kde-touchpad (<< ${source:Version}),
+ kde-config-touchpad (<< 4:5),
+ kde-touchpad (<< 5.1.95~),
+ plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
Replaces: baloo-kf5 (<< 5.5),
- kde-config-touchpad (<< ${source:Version}),
- kde-touchpad (<< ${source:Version}),
+ kde-config-touchpad (<< 4:5),
+ kde-touchpad (<< 5.1.95~),
+ plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
Conflicts: kde-workspace-bin
Description: Tools and widgets for the desktop
@@@ -202,13 -208,13 +208,15 @@@ Recommends: plasma-framework
qml-module-qtquick-dialogs
Conflicts: kde-workspace-bin, kde-workspace-data
Breaks: baloo-kf5 (<< 5.5),
- kde-config-touchpad (<< ${source:Version}),
- kde-touchpad (<< ${source:Version}),
- plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+ kde-config-touchpad (<< 4:5),
++ kde-touchpad (<< 5.1.95~),
+ plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+ ${kde-l10n:all}
Replaces: baloo-kf5 (<< 5.5),
- kde-config-touchpad (<< ${source:Version}),
- kde-touchpad (<< ${source:Version}),
- plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+ kde-config-touchpad (<< 4:5),
++ kde-touchpad (<< 5.1.95~),
+ plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+ ${kde-l10n:all}
Description: Tools and widgets for the desktop data files
Plasma Desktop offers a beautiful looking desktop
that takes complete advantage of modern computing technology.
--
plasma-desktop packaging
More information about the pkg-kde-commits
mailing list