[SCM] KDE Discover packaging branch, master, updated. 19da338d7ceaf4cb48817554f2e20fdb5f0073f6

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 19da338d7ceaf4cb48817554f2e20fdb5f0073f6
Author: Matthias Klumpp <mak at debian.org>
Date:   Mon Mar 7 23:36:18 2016 +0100

    Drop lintian overrides
    
    Since the last commit, those are no longer necessary.
---
 debian/control                                      | 6 +++---
 debian/plasma-discover-private.install              | 3 +--
 debian/plasma-discover-private.lintian-overrides.in | 4 ----
 debian/rules                                        | 9 ---------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index e7b8750..a0c204c 100644
--- a/debian/control
+++ b/debian/control
@@ -41,9 +41,9 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/plasma-discover.git
 Package: plasma-discover
 Architecture: any
 Depends: appstream,
-         plasma-discover-private (= ${binary:Version}),
          libqapt3-runtime,
          plasma-discover-common (= ${source:Version}),
+         plasma-discover-private (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: muon-discover (<< 4:5.5.3a)
@@ -59,8 +59,8 @@ Description: Utility for browsing, installing, and removing applications
 
 Package: plasma-discover-updater
 Architecture: any
-Depends: plasma-discover-private (= ${binary:Version}),
-         libqapt3-runtime,
+Depends: libqapt3-runtime,
+         plasma-discover-private (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: plasma-discover-notifier
diff --git a/debian/plasma-discover-private.install b/debian/plasma-discover-private.install
index b1ab9b9..7ef5100 100644
--- a/debian/plasma-discover-private.install
+++ b/debian/plasma-discover-private.install
@@ -1,7 +1,6 @@
 etc/dbus-1/system.d/org.kde.muon.repo.conf
-usr/lib/*/libDiscoverCommon.so
-usr/lib/*/libDiscoverNotifiers.so
 usr/lib/*/libexec/muon_repo_helper
+usr/lib/*/plasma-discover/*
 usr/lib/*/qt5/plugins/discover-notifier/
 usr/lib/*/qt5/plugins/discover/
 usr/lib/*/qt5/qml/org/kde/discover/
diff --git a/debian/plasma-discover-private.lintian-overrides.in b/debian/plasma-discover-private.lintian-overrides.in
deleted file mode 100644
index f1ebfe9..0000000
--- a/debian/plasma-discover-private.lintian-overrides.in
+++ /dev/null
@@ -1,4 +0,0 @@
-plasma-discover-private: shlib-without-versioned-soname usr/lib/@DEB_HOST_MULTIARCH@/libDiscoverNotifiers.so libDiscoverNotifiers.so
-plasma-discover-private: shlib-without-versioned-soname usr/lib/@DEB_HOST_MULTIARCH@/libDiscoverCommon.so libDiscoverCommon.so
-plasma-discover-private: postinst-must-call-ldconfig usr/lib/@DEB_HOST_MULTIARCH@/libDiscoverNotifiers.so
-plasma-discover-private: package-name-doesnt-match-sonames libDiscoverCommon libDiscoverNotifiers
diff --git a/debian/rules b/debian/rules
index 896e391..cee5eee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,15 +20,6 @@ override_dh_gencontrol:
 	dh_gencontrol -pmuon-notifier -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
 	dh_gencontrol --remaining-packages
 
-override_dh_lintian:
-	sed -e "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" \
-		$(CURDIR)/debian/plasma-discover-private.lintian-overrides.in > $(CURDIR)/debian/plasma-discover-private.lintian-overrides
-	dh_lintian
-
-override_dh_clean:
-	rm -f $(CURDIR)/debian/plasma-discover-private.lintian-overrides
-	dh_clean
-
 # FIXME: tests are broken at time
 override_dh_auto_test:
 	:

-- 
KDE Discover packaging