[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. debian/5.4.3-1-32-gaa0e172
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Tue Jan 12 23:19:14 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=aa0e172
The following commit has been merged in the kubuntu_unstable branch:
commit aa0e1727f01a520b9163eed5705b20d02b2718be
Merge: 66b6edf6158920327d5f331dfb16ffdc0f3ece4f 2c01a530d6f30b743bd1d4928e602ea4d513722e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Tue Jan 12 15:19:05 2016 -0800
Debian merge, No remaining changes.
debian/changelog | 105 +++-
debian/control | 103 ++--
debian/copyright | 872 ++++++++++++++++++++++-------
debian/patches/allow_uxterm_overrides.diff | 31 +
debian/patches/series | 1 +
debian/rules | 10 +-
debian/source/lintian-overrides | 1 +
7 files changed, 853 insertions(+), 270 deletions(-)
diff --cc debian/changelog
index c3fd159,0a52277..d419bf5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,54 -1,60 +1,114 @@@
+plasma-desktop (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream release Xenial
+
+ [ Clive Johnston ]
+ * new upstream release
+
+ [ Philip Muškovac ]
+ * plasma-desktop-data breaks/replaces kde-l10n:all << 4:15.08.3-0ubuntu2~
+ * Build-depend on pkg-kde-tools >= 0.15.18 for l10n-packages.mk support
+ * Rename the pam-kwallet recommends to libpam-kwallet as the packages were
+ renamed
+
++ [ Scarlett Clark ]
++ * Debian merge, No remaining changes.
++
+ -- Clive Johnston <clivejo at aol.com> Thu, 07 Jan 2016 17:59:40 +0000
+
+ plasma-desktop (4:5.4.3-2) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Stop depending on qtdeclarative5-kf5declarative transitional package.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 12 Jan 2016 17:02:08 +0300
+
+ plasma-desktop (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:41 +0100
+
+plasma-desktop (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:41:31 +0100
+
+ plasma-desktop (4:5.4.2-1) unstable; urgency=medium
+
+ [ Scott Kitterman ]
+ * Add kio to plasma-desktop depends so I/O using widgets work (Closes:
+ #798664)
+ * Add qml-module-qt-labs-settings and qml-module-qt-labs-
+ folderlistmodel to plasma-desktop Depends (Closes: #799575)
+ - Thanks to Ralph Jung for the report
+
+ [ Maximiliano Curia ]
+ * New patch: allow_uxterm_overrides.diff (Closes: #797482) Thanks to
+ Thorsten Glaser
+ * New upstream release (5.4.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 06 Oct 2015 07:51:52 +0200
+
+plasma-desktop (4:5.4.2-0ubuntu2) wily; urgency=medium
+
+ * Add 0001-add-discover-to-favorties.patch from upstream to add Muon
+ favourites
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 05 Oct 2015 15:15:17 +0100
+
+plasma-desktop (4:5.4.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 02 Oct 2015 15:59:47 +0100
+
+ plasma-desktop (4:5.4.1-1) unstable; urgency=medium
+
+ * New upstream release (5.4.1).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 09 Sep 2015 16:36:27 +0200
+
+plasma-desktop (4:5.4.1-0ubuntu2) wily; urgency=medium
+
+ * Add build-dep on libpackagekitqt5-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 11 Sep 2015 17:02:26 +0100
+
+plasma-desktop (4:5.4.1-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 08 Sep 2015 10:23:03 +0100
+
+ 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
diff --cc debian/control
index 3306139,75c7cf0..bf1c189
--- a/debian/control
+++ b/debian/control
@@@ -18,28 -17,27 +17,26 @@@ Build-Depends: baloo-kf5-dev (>= 5.13~)
libfontconfig1-dev,
libfreetype6-dev,
libglib2.0-dev,
- libkf5activities-dev (>= 5.18.0~),
- libkf5attica-dev (>= 5.18.0~),
- libkf5auth-dev (>= 5.18.0~),
- libkf5config-dev (>= 5.18.0~),
- libkf5coreaddons-dev (>= 5.18.0~),
- libkf5dbusaddons-dev (>= 5.18.0~),
- libkf5declarative-dev (>= 5.18.0~),
- libkf5emoticons-dev (>= 5.18.0~),
- libkf5globalaccel-dev (>= 5.18.0~),
- libkf5guiaddons-dev (>= 5.18.0~),
- libkf5i18n-dev (>= 5.18.0~),
- libkf5itemmodels-dev (>= 5.18.0~),
- libkf5kcmutils-dev (>= 5.18.0~),
- libkf5kdelibs4support-dev (>= 5.18.0~),
- libkf5newstuff-dev (>= 5.18.0~),
- libkf5notifications-dev (>= 5.18.0~),
- libkf5notifyconfig-dev (>= 5.18.0~),
- libkf5people-dev (>= 5.18.0~),
- libkf5runner-dev (>= 5.18.0~),
- libkf5sysguard-dev (>= 4:5.5.1~),
- libkf5wallet-dev (>= 5.18.0~),
- libpackagekitqt5-dev,
- libkf5activities-dev (>= 5.2.0),
+ libkf5attica-dev (>= 5.12.0~),
+ libkf5auth-dev (>= 5.12.0~),
+ libkf5config-dev,
+ libkf5coreaddons-dev,
+ libkf5dbusaddons-dev (>= 5.12.0~),
+ libkf5declarative-dev (>= 5.12.0~),
+ libkf5emoticons-dev,
+ libkf5globalaccel-dev (>= 5.12.0~),
+ libkf5guiaddons-dev,
+ libkf5i18n-dev (>= 5.12.0~),
+ libkf5itemmodels-dev,
+ libkf5kcmutils-dev (>= 5.12.0~),
+ libkf5kdelibs4support-dev (>= 5.12.0~),
+ libkf5newstuff-dev (>= 5.12.0~),
+ libkf5notifications-dev (>= 5.12.0~),
+ libkf5notifyconfig-dev (>= 5.12.0~),
+ libkf5people-dev (>= 5.12.0~),
+ libkf5runner-dev (>= 5.12.0~),
+ libkf5sysguard-dev,
+ libkf5wallet-dev (>= 5.12.0~),
libphonon4qt5-dev (>= 4.6.60),
libphonon4qt5experimental-dev,
libpulse-dev (>= 0.9.16),
@@@ -131,28 -130,29 +134,31 @@@ Recommends: bluedevil
ksysguard,
kwin,
kwrited,
- muon-discover,
muon-notifier,
muon-updater,
- libpam-kwallet4,
- libpam-kwallet5,
+ pam-kwallet5,
plasma-pa,
powerdevil,
sni-qt,
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~),
+ kde-workspace-bin,
+ kde-workspace-data,
plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
- plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+ plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+ plasma-widget-kimpanel
Replaces: baloo-kf5 (<< 5.5),
- kde-config-touchpad (<< ${source:Version}),
- kde-touchpad (<< ${source:Version}),
+ kde-config-touchpad (<< 4:5),
+ kde-touchpad (<< 5.1.95~),
+ kde-workspace-bin,
+ kde-workspace-data,
plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
- plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+ plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+ plasma-widget-kimpanel
+Conflicts: kde-workspace-bin
Description: Tools and widgets for the desktop
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