[SCM] muon packaging branch, master, updated. debian/5.6.0-1-10-g4c829a4

Pino Toscano pino at moszumanska.debian.org
Wed Nov 29 07:17:54 UTC 2017


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

The following commit has been merged in the master branch:
commit 8888cfcdd27376c437ea8346fa8bd0715b5cb751
Author: Pino Toscano <pino at debian.org>
Date:   Wed Nov 29 08:09:47 2017 +0100

    simplify local install
---
 debian/changelog    | 3 +++
 debian/muon.install | 6 ------
 debian/rules        | 3 ---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c69a097..f26d150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ muon (4:5.7.0-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update the patches:
     - no-canonical-support: refresh, and add the .diff suffix to its filename
+  * Stop forcing debian/tmp as local installation directory, installing
+    everything to the final location
+    - drop muon.install, no more useful now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Aug 2016 13:08:26 +0200
 
diff --git a/debian/muon.install b/debian/muon.install
deleted file mode 100644
index 1c6dbaf..0000000
--- a/debian/muon.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/muon
-usr/share/applications/muon.desktop
-usr/share/config.kcfg/muon.kcfg
-usr/share/icons/hicolor/*/apps/muon.*
-usr/share/kxmlgui5/muon/
-usr/share/locale/*/LC_MESSAGES/muon.mo
diff --git a/debian/rules b/debian/rules
index 97ac3eb..b948b16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,6 @@ 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) --dbgsym-migration='muon-dbg (<= 4:5.6.0-1~~)'
 

-- 
muon packaging



More information about the pkg-kde-commits mailing list