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

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

Author: shawarma-guest
Date: Tue Oct  2 17:49:36 2007
New Revision: 1757

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


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

Modified: packages/unstable/network-manager-openvpn/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/changelog?rev=1757&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/changelog (original)
+++ packages/unstable/network-manager-openvpn/debian/changelog Tue Oct  2 17:49:36 2007
@@ -3,7 +3,8 @@
   * New SVN checkout (Closes: #444907)
   * Fixed wrong awk path (Closes: #421381)
   * Added libnm-util-dev to build-depends (Closes: #441188)
-  * Split package into n-m-o and n-m-o-gnome (Closes: #425126)
+  * Split package into n-m-o and n-m-o-gnome (added Replaces and
+    Conflicts accordingly) (Closes: #425126)
   * Pick up patches from Ubuntu (Thanks to Philipp Kern for collecting these!)
     - 03_allow_servercert_override.diff
       + Allow the user to turn off the check for a proper nsCertType=server
@@ -17,6 +18,8 @@
       + Pull DNS domain setting from remote OpenVPN server.
   * 06_pull_dns_domain.diff
     - Don't crash if the server doesn't provide us with a DNS domain.
+  * Use /etc/init.d/NetworkManager instead of
+    /etc/dbus/event.d/25NetworkManager.
 
  -- Soren Hansen <soren at ubuntu.com>  Tue, 02 Oct 2007 12:30:00 +0200
 

Modified: packages/unstable/network-manager-openvpn/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/control?rev=1757&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/control (original)
+++ packages/unstable/network-manager-openvpn/debian/control Tue Oct  2 17:49:36 2007
@@ -19,7 +19,9 @@
 
 Package: network-manager-openvpn-gnome
 Architecture: any
-Depends: ${shlibs:Depends}, network-manager-openvpn
+Depends: ${shlibs:Depends}, network-manager-openvpn (= ${binary:Version})
+Replaces: network-manager-openvpn (<< 0.6.4svn2855-1)
+Conflicts: network-manager-openvpn (<< 0.6.4svn2855-1)
 Description: network management framework (OpenVPN 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-openvpn/debian/network-manager-openvpn.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst?rev=1757&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst (original)
+++ packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst Tue Oct  2 17:49:36 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