[SCM] KDE Discover packaging branch, kubuntu_xenial_archive, updated. 8d2fb6d0cda70a00c6cc6203071e2151791762f9
Philip Muškovac
yofel-guest at moszumanska.debian.org
Thu Jan 14 21:57:45 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=9c57ce0
The following commit has been merged in the kubuntu_xenial_archive branch:
commit 9c57ce09d7fab6eb3a9d43f79eaed47294fe34f8
Merge: 53016851e44ef96df0fbc17d66740ead74f45961 6ccb6e33a96b3547041e035e9357c99297f55959
Author: Philip Muškovac <yofel at gmx.net>
Date: Thu Jan 14 22:55:25 2016 +0100
Merge remote-tracking branch 'origin/master' into kubuntu_xenial_archive
debian/TODO | 6 ++
debian/changelog | 17 +++
debian/control | 117 +++++++++------------
debian/copyright | 1 +
debian/libdiscover.lintian-overrides | 4 -
...bdiscover.install => libdiscovercommon.install} | 1 -
debian/libdiscovercommon.lintian-overrides.in | 3 +
debian/muon.postinst | 11 --
debian/not-installed | 6 +-
debian/plasma-discover-notifier.install | 5 -
debian/plasma-discover.install | 8 +-
debian/rules | 28 +++--
debian/watch | 4 +-
13 files changed, 106 insertions(+), 105 deletions(-)
diff --cc debian/changelog
index 7349991,58c841a..45ef440
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,17 +1,36 @@@
+ plasma-discover (5.5.3+git20160111-1~) UNRELEASED; urgency=medium
+
+ [ Jonathan Riddell ]
+ * Initial package split upstream from Muon.
+
+ [ Matthias Klumpp ]
+ * Rename the packages to plasma-discover-*,
+ add transitional packages for the old muon-* packages.
+ * Merge update notifier into updater package.
+ * Update dependencies to upstream's current requirements.
+ * Drop some cruft postinst calls and runtime dependencies.
+ * Override Lintian warnings concerning Discover's private
+ library in /usr/lib.
+ * Update debian/watch
+ * Update Vcs-* URLs
+
+ -- Matthias Klumpp <mak at debian.org> Mon, 11 Jan 2016 22:45:56 +0100
+plasma-discover (5.5.3a-0ubuntu1) UNRELEASED; urgency=medium
+
+ [ Jonathan Riddell ]
+ * Initial package split upstream from Muon
+
+ [ Clive Johnston ]
+ * New upstream release
+ * New upstream release
+
+ [ Philip Muškovac ]
+ * Rename the muon packages to plasma-discover-* to help handling the epoch
+ drop and prepare for the coming application rename in plasma 5.6
+ * Add transitional packages for muon-discover, muon-updater and
+ muon-notifier to help with upgrades
+ * Add patches from the Plasma/5.5 branch:
+ - upstream_fix_crash_on_pkglist_refresh.diff
+ - upstream_prevent_misleading_notification.diff
+
+ -- Clive Johnston <clivejo at aol.com> Thu, 07 Jan 2016 17:58:43 +0000
diff --cc debian/control
index 2f669de,c5a1100..948d949
--- a/debian/control
+++ b/debian/control
@@@ -2,30 -2,29 +2,31 @@@ Source: plasma-discove
Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Maximiliano Curia <maxy at debian.org>
+ Uploaders: Maximiliano Curia <maxy at debian.org>,
+ Matthias Klumpp <mak at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
- extra-cmake-modules (>= 5.16.0~),
- kio-dev (>= 5.16.0~),
- libappstreamqt-dev (>= 0.9),
+ extra-cmake-modules (>= 5.18.0~),
+ kinit-dev (>= 5.18.0~),
+ kio-dev (>= 5.18.0~),
libdebconf-kde-dev (>= 1.0.0),
- libkf5attica-dev (>= 5.16.0~),
- libkf5config-dev (>= 5.16.0~),
- libkf5configwidgets-dev (>= 5.16.0~),
- libkf5coreaddons-dev (>= 5.16.0~),
- libkf5dbusaddons-dev (>= 5.16.0~),
- libkf5declarative-dev (>= 5.16.0~),
- libkf5i18n-dev (>= 5.16.0~),
- libkf5iconthemes-dev (>= 5.16.0~),
- libkf5itemviews-dev (>= 5.16.0~),
- libkf5kdelibs4support-dev (>= 5.16.0~),
- libkf5newstuff-dev (>= 5.16.0~),
- libkf5notifications-dev (>= 5.16.0~),
- libkf5solid-dev (>= 5.16.0~),
- libkf5wallet-dev (>= 5.16.0~),
- libkf5widgetsaddons-dev (>= 5.16.0~),
+ libkf5attica-dev (>= 5.18.0~),
+ libkf5config-dev (>= 5.18.0~),
+ libkf5configwidgets-dev (>= 5.18.0~),
+ libkf5coreaddons-dev (>= 5.18.0~),
+ libkf5dbusaddons-dev (>= 5.18.0~),
+ libkf5declarative-dev (>= 5.18.0~),
+ libkf5i18n-dev (>= 5.18.0~),
+ libkf5iconthemes-dev (>= 5.18.0~),
+ libkf5itemviews-dev (>= 5.18.0~),
+ libkf5kdelibs4support-dev (>= 5.18.0~),
+ libkf5newstuff-dev (>= 5.18.0~),
+ libkf5notifications-dev (>= 5.18.0~),
+ libkf5solid-dev (>= 5.18.0~),
+ libkf5wallet-dev (>= 5.18.0~),
+ libkf5widgetsaddons-dev (>= 5.18.0~),
+ libphonon4qt5-dev,
+ libphonon4qt5experimental-dev,
libqapt-dev (>= 3.0.0),
libqca-qt5-2-dev,
libqt5svg5-dev (>= 5.4.0~),
@@@ -91,9 -63,11 +65,12 @@@ Depends: libdiscovercommon (= ${binary:
libqapt3-runtime,
${misc:Depends},
${shlibs:Depends}
--Recommends: plasma-discover-notifier
- Breaks: muon-updater (<< 4:5.5.3a)
- Replaces: muon-updater (<< 4:5.5.3a)
+ Breaks: muon-notifier (<< 4:5.5.3a),
- muon-updater (<< 4:5.5.3a)
++ muon-updater (<< 4:5.5.3a),
++ plasma-discover-notifier
+ Replaces: muon-notifier (<< 4:5.5.3a),
- muon-updater (<< 4:5.5.3a)
++ muon-updater (<< 4:5.5.3a),
++ plasma-discover-notifier
Description: update manager for KDE
Plasma Discover Updater is a graphical update manager for KDE. It is part of
the Discover family of software and provides an interface similar to that of
@@@ -120,18 -77,11 +80,11 @@@ Package: libdiscovercommo
Architecture: any
Depends: policykit-1,
python3,
- software-properties-kde,
${misc:Depends},
${shlibs:Depends}
- Breaks: libmuon,
- libmuonprivate1,
- libmuonprivate2,
- muon-installer (<< 1.3.65-0ubuntu2)
- Replaces: libmuon,
- libmuonprivate1,
- libmuonprivate2,
- muon-installer (<< 1.3.65-0ubuntu2)
- Description: Runtime files for the Discover package management suite
-Breaks: libmuon (<< 4:5.5.3a)
-Replaces: libmuon (<< 4:5.5.3a)
++Breaks: libmuon (<< 4:5.5.3a), libdiscover
++Replaces: libmuon (<< 4:5.5.3a), libdiscover
+ Description: Shared runtime files for the Discover package management suite
The Discover package management suite is a collection of package management
applications built on the KDE platform.
.
@@@ -148,16 -98,32 +101,46 @@@ Description: Discover package manager s
This package contains data files shared by various parts of the
Discover suite.
+Package: plasma-discover-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: plasma-discover (= ${binary:Version}), ${misc:Depends}
+Recommends: kdelibs5-dbg, qapt-dbg
+Description: Discover debugging symbols
+ This package contains debugging symbols for Discover.
+ When Discover crashes, in most cases this package is
+ needed to get a backtrace that is useful for developers. If you have
+ experienced a Discover crash without this package
+ installed, please install it, try to reproduce the problem and fill a bug
+ report with a new backtrace attached.
++
+ Package: muon-discover
+ Architecture: all
+ Section: oldlibs
+ Priority: extra
+ Depends: plasma-discover,
+ ${misc:Depends}
+ Description: Transitional package (muon-discover -> plasma-discover)
+ This is a transitional package for plasma-discover and can safely be
+ removed.
+
+ Package: muon-updater
+ Architecture: all
+ Section: oldlibs
+ Priority: extra
+ Depends: plasma-discover-updater,
+ ${misc:Depends}
+ Description: Transitional package (muon-updater -> plasma-discover-updater)
+ This is a transitional package updating muon-updater to plasma-discover-updater
+ and can safely be removed.
+
+ Package: muon-notifier
+ Architecture: all
+ Section: oldlibs
+ Priority: extra
+ Depends: plasma-discover-updater,
+ ${misc:Depends}
+ Description: Transitional package (muon-notifier -> plasma-discover-updater)
+ This is a transitional package updating muon-notifier to
+ plasma-discover-updater and can safely be removed.
diff --cc debian/rules
index e69147a,10b6aaf..21b3ebe
--- a/debian/rules
+++ b/debian/rules
@@@ -3,18 -3,8 +3,12 @@@
include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's/^[0-9]*://')
+override_dh_strip:
+ $(overridden_command) --dbg-package=plasma-discover-dbg
+
- override_dh_gencontrol:
- dh_gencontrol -pmuon-discover -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
- dh_gencontrol -pmuon-updater -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
- dh_gencontrol -pmuon-notifier -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
- dh_gencontrol --remaining-packages
-
# Do not pull plugins into the shlibs file, it makes lintian angry.
# This happens because dh_makeshlibs will look for sonames matching
# (.*)-(.*)\.so where it assumes is the library name and is the version.
--
KDE Discover packaging
More information about the pkg-kde-commits
mailing list