[SCM] KDE Discover packaging branch, master, updated. 1837f21b39ff7aa2431f4608c9065ddaee8b3a77

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 1837f21b39ff7aa2431f4608c9065ddaee8b3a77
Author: Matthias Klumpp <mak at debian.org>
Date:   Mon Mar 7 01:44:57 2016 +0100

    Make libdiscovercommon plasma-discover-private
    
    The libdiscovercommon name is still very close to the existing
    libdiscover name from src:discover, also, since it doesn't contain a
    public shared library, keeping the lib* prefix doesn't make much sense.
    With the new name it's clear what this package is meant for, and it has
    better chances to be accepted by the ftpmasters.
---
 debian/control                                                    | 8 ++++----
 debian/libdiscovercommon.lintian-overrides.in                     | 3 ---
 ...{libdiscovercommon.install => plasma-discover-private.install} | 0
 debian/plasma-discover-private.lintian-overrides.in               | 4 ++++
 debian/rules                                                      | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index c5a1100..e7b8750 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/plasma-discover.git
 Package: plasma-discover
 Architecture: any
 Depends: appstream,
-         libdiscovercommon (= ${binary:Version}),
+         plasma-discover-private (= ${binary:Version}),
          libqapt3-runtime,
          plasma-discover-common (= ${source:Version}),
          ${misc:Depends},
@@ -59,7 +59,7 @@ Description: Utility for browsing, installing, and removing applications
 
 Package: plasma-discover-updater
 Architecture: any
-Depends: libdiscovercommon (= ${binary:Version}),
+Depends: plasma-discover-private (= ${binary:Version}),
          libqapt3-runtime,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -73,7 +73,7 @@ Description: update manager for KDE
  the Discover family of software and provides an interface similar to that of
  Discover.
 
-Package: libdiscovercommon
+Package: plasma-discover-private
 Architecture: any
 Depends: policykit-1,
          python3,
@@ -81,7 +81,7 @@ Depends: policykit-1,
          ${shlibs:Depends}
 Breaks: libmuon (<< 4:5.5.3a)
 Replaces: libmuon (<< 4:5.5.3a)
-Description: Shared runtime files for the Discover package management suite
+Description: Private runtime libraries for the Discover package management suite
  The Discover package management suite is a collection of package management
  applications built on the KDE platform.
  .
diff --git a/debian/libdiscovercommon.lintian-overrides.in b/debian/libdiscovercommon.lintian-overrides.in
deleted file mode 100644
index 75d20ea..0000000
--- a/debian/libdiscovercommon.lintian-overrides.in
+++ /dev/null
@@ -1,3 +0,0 @@
-libdiscovercommon: shlib-without-versioned-soname usr/lib/@DEB_HOST_MULTIARCH@/libDiscoverNotifiers.so libDiscoverNotifiers.so
-libdiscovercommon: shlib-without-versioned-soname usr/lib/@DEB_HOST_MULTIARCH@/libDiscoverCommon.so libDiscoverCommon.so
-libdiscovercommon: postinst-must-call-ldconfig usr/lib/@DEB_HOST_MULTIARCH@/libDiscoverNotifiers.so
diff --git a/debian/libdiscovercommon.install b/debian/plasma-discover-private.install
similarity index 100%
rename from debian/libdiscovercommon.install
rename to debian/plasma-discover-private.install
diff --git a/debian/plasma-discover-private.lintian-overrides.in b/debian/plasma-discover-private.lintian-overrides.in
new file mode 100644
index 0000000..f1ebfe9
--- /dev/null
+++ b/debian/plasma-discover-private.lintian-overrides.in
@@ -0,0 +1,4 @@
+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 5619b7b..896e391 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,11 +22,11 @@ override_dh_gencontrol:
 
 override_dh_lintian:
 	sed -e "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" \
-		$(CURDIR)/debian/libdiscovercommon.lintian-overrides.in > $(CURDIR)/debian/libdiscovercommon.lintian-overrides
+		$(CURDIR)/debian/plasma-discover-private.lintian-overrides.in > $(CURDIR)/debian/plasma-discover-private.lintian-overrides
 	dh_lintian
 
 override_dh_clean:
-	rm -f $(CURDIR)/debian/libdiscovercommon.lintian-overrides
+	rm -f $(CURDIR)/debian/plasma-discover-private.lintian-overrides
 	dh_clean
 
 # FIXME: tests are broken at time

-- 
KDE Discover packaging