[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1-svn1125524-1-12-gf34a8e7

[Michael Biebl]

The following commit has been merged in the master branch:
commit 28a82d71bcdec2bf090a846de37113da900b2638
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Jun 18 11:58:55 2010 +0200

    Keep installing the knm autostart file.
    
    Revert 1045c713ede7caaf4146a1fc180bfc3c24f5e06a and instead set
    -DINSTALL_KNM_AUTOSTART=ON.
---
 debian/changelog                   |    6 +++---
 debian/network-manager-kde.install |    1 +
 debian/rules                       |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1447162..5c8898c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,9 @@ plasma-widget-networkmanagement (0.1~svn1133205-1) UNRELEASED; urgency=low
   * debian/control
     - Drop Build-Depends on libknotificationitem-1-dev which was merged and
       renamed in kde4libs 4.4. (Closes: #584360)
-  * debian/network-manager-kde.install
-    - No longer install the autostart file for knetworkmanager. Upstream
-      recommends to use the plasma-widgets-networkmanagment frontend.
+  * debian/rules
+    - Set -DINSTALL_KNM_AUTOSTART=ON to enable installation of knetworkmanager
+      autostart file.
   * Re-add plasma-widget-networkmanagement package and remove the Conflicts
     from network-manager-kde as both packages should now be co-installable.
 
diff --git a/debian/network-manager-kde.install b/debian/network-manager-kde.install
index cab9853..ad31737 100644
--- a/debian/network-manager-kde.install
+++ b/debian/network-manager-kde.install
@@ -1,3 +1,4 @@
 usr/bin/knetworkmanager
 usr/share/applications/kde4/knetworkmanager.desktop
+usr/share/autostart/kde4-knetworkmanager-autostart.desktop
 usr/share/icons/hicolor/32x32/apps/knetworkmanager.png
diff --git a/debian/rules b/debian/rules
index da6b0a4..080d937 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEB_BINARY_VERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^
 DEB_KNETWORKMANAGER_VERSION := $(shell echo '$(DEB_BINARY_VERSION)' | sed 's/^[[:digit:].]\+/1:0.9/')
 
 override_dh_auto_configure:
-	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
+	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d -DINSTALL_KNM_AUTOSTART=ON
 
 override_dh_bugfiles:
 	dh_bugfiles -A

-- 
"Network Management" Plasma widget Debian packaging