[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1+git20110318.941cde9-2-3-g2aa2c64

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2aa2c6440c91caee7c484c93bccd27f8e69d41ab
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Apr 2 00:49:21 2011 +0300

    Install network.svgz only if it exists.
    
    network.svgz is not shipped when plasma-widget-networkmanager is built against
    KDE SC 4.5. Install it only if it exists.
---
 debian/changelog                               |    2 ++
 debian/plasma-widget-networkmanagement.install |    1 -
 debian/rules                                   |   11 ++++-------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a66494..2fb2a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ plasma-widget-networkmanagement (0.1+git20110318.941cde9-3) UNRELEASED; urgency=
 
   * Build-Depend on mobile-broadband-provider-info and add it to knm-runtime
     Depends.
+  * network.svgz is not shipped when plasma-widget-networkmanager is
+    built against KDE SC 4.5. Install it only if it exists.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 02 Apr 2011 00:25:25 +0300
 
diff --git a/debian/plasma-widget-networkmanagement.install b/debian/plasma-widget-networkmanagement.install
index 1bfd925..802b063 100644
--- a/debian/plasma-widget-networkmanagement.install
+++ b/debian/plasma-widget-networkmanagement.install
@@ -4,4 +4,3 @@ usr/lib/kde4/kded_networkmanagement.so
 usr/share/kde4/services/plasma-applet-networkmanagement.desktop
 usr/share/kde4/services/plasma-engine-networkmanagement.desktop
 usr/share/kde4/services/kded/networkmanagement.desktop
-usr/share/kde4/apps/desktoptheme/default/icons/network.svg
diff --git a/debian/rules b/debian/rules
index 2494060..c2d8eb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,10 @@ DEB_KNETWORKMANAGER_VERSION := $(shell echo '$(DEB_BINARY_VERSION)' | sed 's/^[[
 override_dh_auto_configure:
 	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d -DINSTALL_KNM_AUTOSTART=ON
 
-override_dh_auto_install:
-	dh_auto_install
-	# Ship network.svgz uncompressed as network.svg in order to avoid file
-	# conflict with kdebase-runtime-data (>= 4:4.5) but still keep
-	# compatibility with KDE SC 4.4
-	( cd debian/tmp/usr/share/kde4/apps/desktoptheme/default/icons && \
-	  gunzip -c network.svgz > network.svg && rm -f network.svgz )
+override_dh_install:
+	dh_install -pplasma-widget-networkmanagement --autodest -- \
+	    $(wildcard debian/tmp/usr/share/kde4/apps/desktoptheme/default/icons/network.svgz)
+	dh_install --remaining-packages
 
 override_dh_makeshlibs:
 	dh_makeshlibs -pknm-runtime -V'knm-runtime (= $(DEB_BINARY_VERSION))'

-- 
"Network Management" Plasma widget Debian packaging