[SCM] muon packaging branch, master, updated. debian/5.4.3-1-1-gbd480e7

Scott Kitterman kitterman at moszumanska.debian.org
Fri Jul 15 01:45:47 UTC 2016 

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

The following commit has been merged in the master branch:
commit bd480e765ba83646b1cf60986245af7b22ad1de7
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Jul 14 21:45:33 2016 -0400

    New upstream release.
    
    * Team upload.
    * New upstream release 5.6.0 (Closes LP: #1562406)
      - Drop binaries that conflict with plasma-discover (Closes: #831279)
    * Update debian/patches/no-canonical-support for new file structure
    * Drop muon-dbg binary and migrate to -dbgsym package and update
      debian/rules
    * Bump standards version to 3.9.8 without further change
---
 debian/changelog                       | 16 +++++++
 debian/control                         | 85 ++--------------------------------
 debian/libmuon.install                 | 12 -----
 debian/libmuon.lintian-overrides       |  6 ---
 debian/muon-common.install             |  1 -
 debian/muon-discover.install           |  6 ---
 debian/muon-discover.lintian-overrides |  1 -
 debian/muon-notifier.install           |  6 ---
 debian/muon-updater.install            |  4 --
 debian/muon-updater.lintian-overrides  |  1 -
 debian/not-installed                   |  2 -
 debian/patches/no-canonical-support    | 10 ++--
 debian/rules                           |  5 +-
 13 files changed, 30 insertions(+), 125 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ceb3111..70c890f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+muon (4:5.6.0-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Clive Johnston ]
+  * New upstream release 5.6.0 (Closes LP: #1562406)
+    - Drop binaries that conflict with plasma-discover (Closes: #831279) 
+
+  [ Scott Kitterman ]
+  * Update debian/patches/no-canonical-support for new file structure
+  * Drop muon-dbg binary and migrate to -dbgsym package and update
+    debian/rules
+  * Bump standards version to 3.9.8 without further change
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 14 Jul 2016 21:27:43 -0400
+
 muon (4:5.4.3-1) unstable; urgency=medium
 
   * New upstream release (5.4.3).
diff --git a/debian/control b/debian/control
index 014da63..63bc5c4 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5widgetsaddons-dev,
                libphonon4qt5-dev,
                libphonon4qt5experimental-dev,
-               libqapt-dev (>= 3.0.0),
+               libqapt-dev (>= 3.0.2),
                libqca-qt5-2-dev,
                libqt5svg5-dev (>= 5.4.0~),
                pkg-config,
@@ -36,7 +36,7 @@ Build-Depends: cmake (>= 2.8.12),
                plasma-framework-dev,
                qtbase5-dev (>= 5.4.0~),
                qtdeclarative5-dev (>= 5.4.0~)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/workspace/muon
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/muon.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/muon.git
@@ -44,8 +44,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/muon.git
 Package: muon
 Architecture: any
 Depends: apt-xapian-index,
-         libmuon (= ${binary:Version}),
-         libqapt3-runtime,
+         libqapt3 (>= 3.0.2),
+         libqapt3-runtime (>= 3.0.2),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: muon-updater
@@ -67,80 +67,3 @@ Description: package manager for KDE
     removals
   * Support for download the latest changelog of a package
   * Package screenshots
-
-Package: muon-common
-Architecture: all
-Depends: ${misc:Depends}
-Description: Muon package manager suite (common data files)
- Muon is a graphical package manager for the Plasma workspace.
- .
- This package contains data files shared by various parts of the Muon suite.
-
-Package: muon-discover
-Architecture: any
-Depends: apt-xapian-index,
-         libmuon (= ${binary:Version}),
-         libqapt3-runtime,
-         muon-common (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Utility for browsing, installing, and removing applications
- Muon 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
-Architecture: any
-Depends: libmuon (= ${binary:Version}),
-         libqapt3-runtime,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: muon-notifier
-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.
-
-Package: muon-notifier
-Architecture: any
-Depends: muon-common (= ${source:Version}),
-         muon-updater,
-         ${misc:Depends},
-         ${shlibs:Depends}
-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.
-
-Package: libmuon
-Architecture: any
-Depends: policykit-1,
-         python3,
-         software-properties-kde,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libmuonprivate1, libmuonprivate2, muon-installer (<< 1.3.65-0ubuntu2)
-Replaces: libmuonprivate1, libmuonprivate2, muon-installer (<< 1.3.65-0ubuntu2)
-Description: Runtime files for the Muon package management suite
- The Muon package management suite is a collection of package management
- applications built on the KDE platform.
- .
- This package contains runtime libraries
-
-Package: muon-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libmuon (= ${binary:Version}),
-         muon (= ${binary:Version}) | muon-updater (= ${binary:Version}) | muon-notifier (= ${binary:Version}),
-         ${misc:Depends}
-Recommends: qapt-dbg
-Description: Muon debugging symbols
- This package contains debugging symbols for Muon.
- When Muon crashes, in most cases this package is
- needed to get a backtrace that is useful for developers. If you have
- experienced a Muon crash without this package
- installed, please install it, try to reproduce the problem and fill a bug
- report with a new backtrace attached.
diff --git a/debian/libmuon.install b/debian/libmuon.install
deleted file mode 100644
index 81bd72f..0000000
--- a/debian/libmuon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-etc/dbus-1/system.d/org.kde.muon.repo.conf
-usr/lib/*/libMuonApt.so
-usr/lib/*/libMuonCommon.so
-usr/lib/*/libMuonNotifiers.so
-usr/lib/*/libexec/muon_repo_helper
-usr/lib/*/qt5/plugins/muon-notifier/
-usr/lib/*/qt5/plugins/muon/
-usr/lib/*/qt5/qml/org/kde/muon/
-usr/share/dbus-1/system-services/org.kde.muon.repo.service
-usr/share/libmuon/
-usr/share/locale/*/LC_MESSAGES/libmuon.mo
-usr/share/polkit-1/actions/org.kde.muon.repo.policy
diff --git a/debian/libmuon.lintian-overrides b/debian/libmuon.lintian-overrides
deleted file mode 100644
index ed46720..0000000
--- a/debian/libmuon.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# Private libs
-libmuon: package-name-doesnt-match-sonames libMuonApt libMuonCommon libMuonNotifiers
-libmuon: shlib-without-versioned-soname usr/lib/*/libMuonApt.so libMuonApt.so
-libmuon: shlib-without-versioned-soname usr/lib/*/libMuonNotifiers.so libMuonNotifiers.so
-libmuon: shlib-without-versioned-soname usr/lib/*/libMuonCommon.so libMuonCommon.so
-libmuon: postinst-must-call-ldconfig usr/lib/*/libMuonNotifiers.so
diff --git a/debian/muon-common.install b/debian/muon-common.install
deleted file mode 100644
index a32f7d5..0000000
--- a/debian/muon-common.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/icons/hicolor/*/apps/muondiscover.*
diff --git a/debian/muon-discover.install b/debian/muon-discover.install
deleted file mode 100644
index 432e42f..0000000
--- a/debian/muon-discover.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/muon-discover
-usr/share/applications/org.kde.discover.desktop
-usr/share/desktoptheme/muon-contenttheme/
-usr/share/kxmlgui5/muondiscover/
-usr/share/locale/*/LC_MESSAGES/muon-discover.mo
-usr/share/muondiscover/
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-notifier.install b/debian/muon-notifier.install
deleted file mode 100644
index 532e92b..0000000
--- a/debian/muon-notifier.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/muonnotifier/
-usr/share/knotifications5/
-usr/share/kservices5/plasma-applet-org.kde.muonnotifier.desktop
-usr/share/locale/*/LC_MESSAGES/muon-notifier.mo
-usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.muonnotifier.mo
-usr/share/plasma/plasmoids/org.kde.muonnotifier/
diff --git a/debian/muon-updater.install b/debian/muon-updater.install
deleted file mode 100644
index 83f2bd2..0000000
--- a/debian/muon-updater.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/muon-updater
-usr/share/applications/muon-updater.desktop
-usr/share/kxmlgui5/muonupdater/
-usr/share/locale/*/LC_MESSAGES/muon-updater.mo
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/not-installed b/debian/not-installed
deleted file mode 100644
index c204cba..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,2 +0,0 @@
-./usr/bin/muon-exporter
-usr/share/locale/*/LC_MESSAGES/muon-exporter.mo
diff --git a/debian/patches/no-canonical-support b/debian/patches/no-canonical-support
index 337b6b6..f41936a 100644
--- a/debian/patches/no-canonical-support
+++ b/debian/patches/no-canonical-support
@@ -6,11 +6,13 @@ Author: Scott Kitterman <scott at kitterman.com>
 Origin: vendor
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791875
 Forwarded: not-needed
-Last-Update: 2015-09-15
+Last-Update: 2016-07-14
 
---- muon-5.4.1.orig/muon/DetailsTabs/MainTab.cpp
-+++ muon-5.4.1/muon/DetailsTabs/MainTab.cpp
-@@ -179,19 +179,19 @@ void MainTab::refresh()
+Index: muon-5.6.0/src/DetailsTabs/MainTab.cpp
+===================================================================
+--- muon-5.6.0.orig/src/DetailsTabs/MainTab.cpp	2016-07-14 21:16:59.311134381 -0400
++++ muon-5.6.0/src/DetailsTabs/MainTab.cpp	2016-07-14 21:16:59.303134381 -0400
+@@ -178,19 +178,19 @@
      m_packageShortDescLabel->setText(m_package->shortDescription());
  
      m_descriptionBrowser->setText(m_package->longDescription());
diff --git a/debian/rules b/debian/rules
index 5755edf..97ac3eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,11 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+override_dh_auto_install:
+	$(overridden_command) --destdir=debian/tmp
+
 override_dh_strip:
-	$(overridden_command) --dbg-package=muon-dbg
+	$(overridden_command) --dbgsym-migration='muon-dbg (<= 4:5.6.0-1~~)'
 
 # Do not pull plugins into the shlibs file, it makes lintian angry.
 # This happens because dh_makeshlibs will look for sonames matching

-- 
muon packaging

More information about the pkg-kde-commits mailing list