[Pkg-utopia-commits] r1756 - in /packages/unstable/network-manager-vpnc/debian: changelog control network-manager-vpnc.postinst

[shawarma-guest at users.alioth.debian.org]

Author: shawarma-guest
Date: Tue Oct  2 17:44:21 2007
New Revision: 1756

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1756
Log:
Tightened network-manager-vpnc-gnome's dependency on network-manager-vpnc to match the binary version.
Added Replaces+Conflicts to versions of network-manager-vpnc before the split.
Changed /etc/dbus/event.d/25NetworkManager to /etc/init.d/NetworkManager


Modified:
    packages/unstable/network-manager-vpnc/debian/changelog
    packages/unstable/network-manager-vpnc/debian/control
    packages/unstable/network-manager-vpnc/debian/network-manager-vpnc.postinst

Modified: packages/unstable/network-manager-vpnc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-vpnc/debian/changelog?rev=1756&op=diff
==============================================================================
--- packages/unstable/network-manager-vpnc/debian/changelog (original)
+++ packages/unstable/network-manager-vpnc/debian/changelog Tue Oct  2 17:44:21 2007
@@ -2,12 +2,15 @@
 
   * New SVN checkout.
   * Updated maintainer.
-  * Split package into n-m-v and n-m-v-gnome.
+  * Split package into n-m-v and n-m-v-gnome (added Replaces and
+    Conflicts accordingly).
   * Added lib-nm-util to Build-Depends.
   * Don't try to generate vietnamese translations. They don't exist.
   * Fix library references in nm-vpnc-service.name.in.
+  * Use /etc/init.d/NetworkManager instead of
+    /etc/dbus/event.d/25NetworkManager.
 
- -- Soren Hansen <soren at ubuntu.com>  Tue, 02 Oct 2007 17:10:18 +0200
+ -- Soren Hansen <soren at ubuntu.com>  Tue, 02 Oct 2007 19:42:57 +0200
 
 network-manager-vpnc (0.6.4svn2569-1) UNRELEASED; urgency=low
 

Modified: packages/unstable/network-manager-vpnc/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-vpnc/debian/control?rev=1756&op=diff
==============================================================================
--- packages/unstable/network-manager-vpnc/debian/control (original)
+++ packages/unstable/network-manager-vpnc/debian/control Tue Oct  2 17:44:21 2007
@@ -20,7 +20,9 @@
 
 Package: network-manager-vpnc-gnome
 Architecture: any
-Depends: ${shlibs:Depends}, network-manager-vpnc
+Depends: ${shlibs:Depends}, network-manager-vpnc (= ${binary:Version})
+Replaces: network-manager-vpnc (<< 0.6.4svn2806-1)
+Conflicts: network-manager-vpnc (<< 0.6.4svn2806-1)
 Description: network management framework (VPNC plugin GNOME GUI) 
  NetworkManager attempts to keep an active network connection available at
  all times.  It is intended primarily for laptops where it allows easy

Modified: packages/unstable/network-manager-vpnc/debian/network-manager-vpnc.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-vpnc/debian/network-manager-vpnc.postinst?rev=1756&op=diff
==============================================================================
--- packages/unstable/network-manager-vpnc/debian/network-manager-vpnc.postinst (original)
+++ packages/unstable/network-manager-vpnc/debian/network-manager-vpnc.postinst Tue Oct  2 17:44:21 2007
@@ -4,8 +4,12 @@
 
 case "$1" in
 	configure)
-		if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then
-			/etc/dbus-1/event.d/25NetworkManager restart
+		if [ -x "/etc/init.d/NetworkManager" ]; then
+			if [ -x /usr/sbin/invoke-rc.d ]; then
+				invoke-rc.d NetworkManager restart
+			else
+				/etc/init.d/NetworkManager restart
+			fi
 		fi
         ;;
 esac