[SCM] discover packaging branch, kubuntu_wily_backports, updated. 5bf95571272489e97e4e4315d821f23ba2353621

Sat Jan 9 13:43:34 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/discover.git;a=commitdiff;h=46556ff

The following commit has been merged in the kubuntu_wily_backports branch:
commit 46556ff5b5da971969c07d18cdd81177a40ca769
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sat Jan 9 13:39:28 2016 +0100

    Rename binaries to plasma-discover-* and add transitional packages
---
 debian/control                                     | 75 ++++++++++++++++------
 debian/muon-discover.lintian-overrides             |  1 -
 debian/muon-updater.lintian-overrides              |  1 -
 ...mmon.install => plasma-discover-common.install} |  0
 ...er.install => plasma-discover-notifier.install} |  0
 ...ter.install => plasma-discover-updater.install} |  0
 debian/plasma-discover-updater.lintian-overrides   |  1 +
 ...on-discover.install => plasma-discover.install} |  0
 debian/plasma-discover.lintian-overrides           |  1 +
 debian/rules                                       |  3 +-
 10 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/debian/control b/debian/control
index f4f8ee2..2f669de 100644
--- a/debian/control
+++ b/debian/control
@@ -40,47 +40,81 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/discover.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/discover.git
 
 Package: muon-discover
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: plasma-discover, ${misc:Depends}
+Description: Transitional package for plasma-discover
+ This is a transitional package for plasma-discover and can safely be
+ removed after installation
+
+Package: muon-updater
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: plasma-discover-updater, ${misc:Depends}
+Description: Transitional package for plasma-discover-updater
+ This is a transitional package for plasma-discover-updater and can safely be
+ removed after installation
+
+Package: muon-notifier
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: plasma-discover-notifier, ${misc:Depends}
+Description: Transitional package for plasma-discover-notifier
+ This is a transitional package for plasma-discover-notifier and can safely be
+ removed after installation
+
+Package: plasma-discover
 Architecture: any
 Depends: app-install-data,
          apt-xapian-index,
          libdiscover (= ${binary:Version}),
          libqapt3-runtime,
-         muon-common (= ${source:Version}),
+         plasma-discover-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: muon-discover (<< 4:5.5.3a)
+Replaces: muon-discover (<< 4:5.5.3a)
 Recommends: app-install-data-partner, ubuntu-sso-client
 Description: Utility for browsing, installing, and removing applications
- Muon Discover will help you browse through the huge applications library you
+ Plasma Discover will help you browse through the huge applications library you
  have available and help you find the applications you're looking for.
  .
  To install or remove software using the Center, you need administrator
  access on the computer.
 
-Package: muon-updater
+Package: plasma-discover-updater
 Architecture: any
 Depends: libdiscover (= ${binary:Version}),
          libqapt3-runtime,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: muon-notifier
+Recommends: plasma-discover-notifier
+Breaks: muon-updater (<< 4:5.5.3a)
+Replaces: muon-updater (<< 4:5.5.3a)
 Description: update manager for KDE
- Muon Updater is a graphical update manager for KDE. It is part of the Muon
- family of software and provides an interface similar to that of Muon.
+ 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
+ Discover.
 
-Package: muon-notifier
+Package: plasma-discover-notifier
 Architecture: any
 Depends: libdiscover (= ${binary:Version}),
-         muon-common (= ${source:Version}),
-         muon-updater,
+         plasma-discover-common (= ${source:Version}),
+         plasma-discover-updater,
          update-notifier-common,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: ubuntu-release-upgrader-qt
+Breaks: muon-notifier (<< 4:5.5.3a)
+Replaces: muon-notifier (<< 4:5.5.3a)
 Description: update notifier for KDE
- The Muon Notifier is an update notification daemon for KDE. It uses the KDE
- Daemon frame (KDED) framework to present the user with update notifications,
- providing an opportunity to launch the Muon Updater to deal with these
- updates.
+ The Discover Notifier is an update notification daemon for KDE. It uses the
+ KDE Daemon frame (KDED) framework to present the user with update
+ notifications, providing an opportunity to launch the Discover Updater to deal
+ with these updates.
 
 Package: libdiscover
 Architecture: any
@@ -103,19 +137,22 @@ Description: Runtime files for the Discover package management suite
  .
  This package contains runtime libraries
 
-Package: muon-common
+Package: plasma-discover-common
 Architecture: all
 Depends: ${misc:Depends}
-Description: Muon package manager suite (common data files)
- Muon is a graphical package manager for the Plasma workspace.
+Breaks: muon-common (<< 4:5.5.3a)
+Replaces: muon-common (<< 4:5.5.3a)
+Description: Discover package manager suite (common data files)
+ Discover is a graphical package manager for the Plasma workspace.
  .
- This package contains data files shared by various parts of the Muon suite.
+ This package contains data files shared by various parts of the
+ Discover suite.
 
-Package: muon-discover-dbg
+Package: plasma-discover-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: muon-discover (= ${binary:Version}), ${misc:Depends}
+Depends: plasma-discover (= ${binary:Version}), ${misc:Depends}
 Recommends: kdelibs5-dbg, qapt-dbg
 Description: Discover debugging symbols
  This package contains debugging symbols for Discover.
diff --git a/debian/muon-discover.lintian-overrides b/debian/muon-discover.lintian-overrides
deleted file mode 100644
index afa5759..0000000
--- a/debian/muon-discover.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-muon-discover: binary-without-manpage usr/bin/muon-discover
diff --git a/debian/muon-updater.lintian-overrides b/debian/muon-updater.lintian-overrides
deleted file mode 100644
index 0c1b54e..0000000
--- a/debian/muon-updater.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-muon-updater: binary-without-manpage usr/bin/muon-updater
diff --git a/debian/muon-common.install b/debian/plasma-discover-common.install
similarity index 100%
rename from debian/muon-common.install
rename to debian/plasma-discover-common.install
diff --git a/debian/muon-notifier.install b/debian/plasma-discover-notifier.install
similarity index 100%
rename from debian/muon-notifier.install
rename to debian/plasma-discover-notifier.install
diff --git a/debian/muon-updater.install b/debian/plasma-discover-updater.install
similarity index 100%
rename from debian/muon-updater.install
rename to debian/plasma-discover-updater.install
diff --git a/debian/plasma-discover-updater.lintian-overrides b/debian/plasma-discover-updater.lintian-overrides
new file mode 100644
index 0000000..dd00c87
--- /dev/null
+++ b/debian/plasma-discover-updater.lintian-overrides
@@ -0,0 +1 @@
+plasma-discover-updater: binary-without-manpage usr/bin/muon-updater
diff --git a/debian/muon-discover.install b/debian/plasma-discover.install
similarity index 100%
rename from debian/muon-discover.install
rename to debian/plasma-discover.install
diff --git a/debian/plasma-discover.lintian-overrides b/debian/plasma-discover.lintian-overrides
new file mode 100644
index 0000000..a5a3ce0
--- /dev/null
+++ b/debian/plasma-discover.lintian-overrides
@@ -0,0 +1 @@
+plasma-discover: binary-without-manpage usr/bin/muon-discover
diff --git a/debian/rules b/debian/rules
index c69b32d..598660a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,12 @@ 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=muon-discover-dbg
+	$(overridden_command) --dbg-package=plasma-discover-dbg
 
 override_dh_gencontrol:
 	dh_gencontrol -pmuon-discover -- -4:$(DEB_VERSION_UPSTREAM_REVISION)
 	dh_gencontrol -pmuon-updater -- -4:$(DEB_VERSION_UPSTREAM_REVISION)
 	dh_gencontrol -pmuon-notifier -- -4:$(DEB_VERSION_UPSTREAM_REVISION)
-	dh_gencontrol -pmuon-common -- -4:$(DEB_VERSION_UPSTREAM_REVISION)
 	dh_gencontrol --remaining-packages
 
 # Do not pull plugins into the shlibs file, it makes lintian angry.

-- 
discover packaging

