[SCM] muon packaging branch, kubuntu_unstable, updated. 7f6cbc3b8e79ee8e60cb91d460517746a324ad8c

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 7f6cbc3b8e79ee8e60cb91d460517746a324ad8c
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 13 12:01:06 2015 +0100

    Remove muon.1 it was wrong and is now outdated
    
    * Remove muon.1 it was wrong and is now outdated
    * Fix lintian warnings and ignore all that are bogus or not worth
      fixing
---
 debian/changelog                       |  3 +++
 debian/libmuon.lintian-overrides       |  3 +++
 debian/muon-discover.lintian-overrides |  1 +
 debian/muon-updater.lintian-overrides  |  1 +
 debian/muon.1                          | 49 ----------------------------------
 debian/muon.lintian-overrides          |  1 +
 debian/muon.manpages                   |  1 -
 debian/not-installed                   |  2 +-
 debian/rules                           | 11 ++++++++
 9 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 816a001..64cb26f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ muon (5.1.50-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release based on KDE Frameworks 5
   * muon-installer is no more remove binary package and all references
   * Drop all patches, they all came from upstream anyway
+  * Remove muon.1 it was wrong and is now outdated
+  * Fix lintian warnings and ignore all that are bogus or not worth
+    fixing
 
  -- Harald Sitter <sitter at kde.org>  Thu, 08 Jan 2015 18:36:20 +0100
 
diff --git a/debian/libmuon.lintian-overrides b/debian/libmuon.lintian-overrides
new file mode 100644
index 0000000..fae15d5
--- /dev/null
+++ b/debian/libmuon.lintian-overrides
@@ -0,0 +1,3 @@
+libmuon: package-name-doesnt-match-sonames libMuonApt libMuonNotifiers libmuonprivate5
+libmuon: shlib-without-versioned-soname usr/lib/*/libMuonApt.so libMuonApt.so
+libmuon: shlib-without-versioned-soname usr/lib/*/libMuonNotifiers.so libMuonNotifiers.so
diff --git a/debian/muon-discover.lintian-overrides b/debian/muon-discover.lintian-overrides
new file mode 100644
index 0000000..afa5759
--- /dev/null
+++ b/debian/muon-discover.lintian-overrides
@@ -0,0 +1 @@
+muon-discover: binary-without-manpage usr/bin/muon-discover
diff --git a/debian/muon-updater.lintian-overrides b/debian/muon-updater.lintian-overrides
new file mode 100644
index 0000000..0c1b54e
--- /dev/null
+++ b/debian/muon-updater.lintian-overrides
@@ -0,0 +1 @@
+muon-updater: binary-without-manpage usr/bin/muon-updater
diff --git a/debian/muon.1 b/debian/muon.1
deleted file mode 100644
index 75568f4..0000000
--- a/debian/muon.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
-.TH QT: "1" "August 2010" "Qt: 4.7.0" "User Commands"
-.SH NAME
-Qt: \- manual page for Qt: 4.7.0
-.SH SYNOPSIS
-.B muon
-[
IQt-options
R] [
IKDE-options
R]
-.SH DESCRIPTION
-A package manager
-.SS "Generic options:"
-.TP
-
B\-\-help
R
-Show help about options
-.TP
-
B\-\-help\-qt
R
-Show Qt specific options
-.TP
-
B\-\-help\-kde
R
-Show KDE specific options
-.TP
-
B\-\-help\-all
R
-Show all options
-.TP
-
B\-\-author
R
-Show author information
-.TP
-
B\-v
R, 
B\-\-version
R
-Show version information
-.TP
-
B\-\-license
R
-Show license information
-.TP
-
B\-\-
R
-End of options
-.PP
-KDE Development Platform: 4.5.00 (KDE 4.5.0)
-Muon Package Manager: 1.0.1
-.SH "SEE ALSO"
-The full documentation for
-.B Qt:
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Qt:
-programs are properly installed at your site, the command
-.IP
-.B info Qt:
-.PP
-should give you access to the complete manual.
diff --git a/debian/muon.lintian-overrides b/debian/muon.lintian-overrides
new file mode 100644
index 0000000..5e27fd8
--- /dev/null
+++ b/debian/muon.lintian-overrides
@@ -0,0 +1 @@
+muon: binary-without-manpage usr/bin/muon
diff --git a/debian/muon.manpages b/debian/muon.manpages
deleted file mode 100644
index 06f9387..0000000
--- a/debian/muon.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/muon.1
diff --git a/debian/not-installed b/debian/not-installed
index e26c09e..957ea5d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1 @@
-usr/lib/libmuonprivate.so
+usr/lib/*/libmuonprivate.so
diff --git a/debian/rules b/debian/rules
index a5460ae..55fdeaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,19 @@
 
 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_strip:
 	$(overridden_command) --dbg-package=muon-dbg
 
+# 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.
+# This will then assume that libfoo-backend.so has name 'libfoo' and version
+# 'backend' which makes for bogus, pointless, silly shlibs entries.
+# Couldn't be bothered to report this - sitter, 2015
+override_dh_makeshlibs:
+	$(overridden_command) -Xusr/lib/*/qt5/plugins/muon* -V
+
 # FIXME: tests are broken at this time
 .PHONY: override_dh_auto_test

-- 
muon packaging