[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1+git20110318.941cde9-1-6-g58bd429

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 698a528af3093232df0c94833618a24a412e7d9d
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Mar 30 02:52:47 2011 +0300

    Ship network.svgz uncompressed as network.svg.
    
    Ship usr/share/kde4/apps/desktoptheme/default/icons/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
---
 debian/changelog                               |    4 ++++
 debian/plasma-widget-networkmanagement.install |    2 +-
 debian/rules                                   |    8 ++++++++
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0fd5cd..4fc9c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ plasma-widget-networkmanagement (0.1+git20110318.941cde9-2) UNRELEASED; urgency=
 
   * Drop topgit support.
   * Drop README.source, obsolelte and not needed anymore.
+  * Ship usr/share/kde4/apps/desktoptheme/default/icons/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
 
  -- Modestas Vainius <modax at debian.org>  Wed, 30 Mar 2011 02:41:19 +0300
 
diff --git a/debian/plasma-widget-networkmanagement.install b/debian/plasma-widget-networkmanagement.install
index 148af70..1bfd925 100644
--- a/debian/plasma-widget-networkmanagement.install
+++ b/debian/plasma-widget-networkmanagement.install
@@ -4,4 +4,4 @@ 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.svgz
+usr/share/kde4/apps/desktoptheme/default/icons/network.svg
diff --git a/debian/rules b/debian/rules
index c4c4365..2494060 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,14 @@ 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_makeshlibs:
 	dh_makeshlibs -pknm-runtime -V'knm-runtime (= $(DEB_BINARY_VERSION))'
 	dh_makeshlibs --remaining-packages

-- 
"Network Management" Plasma widget Debian packaging