[Pkg-utopia-commits] r475 - in packages/unstable: dhcdbd/debian networkmanager/debian

[Riccardo Setti]

Author: giskard-guest
Date: 2006-01-16 08:48:43 +0000 (Mon, 16 Jan 2006)
New Revision: 475

Modified:
   packages/unstable/dhcdbd/debian/changelog
   packages/unstable/dhcdbd/debian/control
   packages/unstable/dhcdbd/debian/dhcdbd.postinst
   packages/unstable/dhcdbd/debian/rules
   packages/unstable/networkmanager/debian/rules
Log:
some changes

Modified: packages/unstable/dhcdbd/debian/changelog
===================================================================
--- packages/unstable/dhcdbd/debian/changelog	2006-01-13 20:43:47 UTC (rev 474)
+++ packages/unstable/dhcdbd/debian/changelog	2006-01-16 08:48:43 UTC (rev 475)
@@ -1,4 +1,4 @@
-dhcdbd (1.10-1) experimental; urgency=low
+dhcdbd (1.10-1) unstable; urgency=low
 
   * Initial upload to Debian (Closes #)
   * based on the ubuntu work

Modified: packages/unstable/dhcdbd/debian/control
===================================================================
--- packages/unstable/dhcdbd/debian/control	2006-01-13 20:43:47 UTC (rev 474)
+++ packages/unstable/dhcdbd/debian/control	2006-01-16 08:48:43 UTC (rev 475)
@@ -7,7 +7,7 @@
 
 Package: dhcdbd
 Architecture: any
-Depends: ${misc:Depends}, dhcp3-client, dbus (>= 0.60)
+Depends: ${misc:Depends}, ${shlibs:Depends}, dhcp3-client, dbus (>= 0.60)
 Description: dbus interface for dhclient
  dhcdbd provides a dbus interface to dhclient, so applications such as
  NetworkManager can query and control dhclient. This allows an application 

Modified: packages/unstable/dhcdbd/debian/dhcdbd.postinst
===================================================================
--- packages/unstable/dhcdbd/debian/dhcdbd.postinst	2006-01-13 20:43:47 UTC (rev 474)
+++ packages/unstable/dhcdbd/debian/dhcdbd.postinst	2006-01-16 08:48:43 UTC (rev 475)
@@ -3,10 +3,11 @@
 
 case "$1" in
   configure)
-    if [ -x /usr/bin/dbus-send ]; then
-		/usr/bin/dbus-send --system --type=method_call \
-        	--dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
-    fi
+		#  Ask the bus to reload the config file  		
+		if [ -x "/etc/init.d/dbus" ]; then
+		invoke-rc.d dbus force-reload || true
+		fi
+					
     ;;
 esac
 

Modified: packages/unstable/dhcdbd/debian/rules
===================================================================
--- packages/unstable/dhcdbd/debian/rules	2006-01-13 20:43:47 UTC (rev 474)
+++ packages/unstable/dhcdbd/debian/rules	2006-01-16 08:48:43 UTC (rev 475)
@@ -4,12 +4,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-test:
-	$(MAKE) tests
-
 DEB_MAKE_INSTALL_TARGET=install DESTDIR=$(CURDIR)/debian/dhcdbd/
 
-install_arch:: build test
+binary-install/dhcdbd:: build
 	
 	mkdir -p $(CURDIR)/debian/dhcdbd/etc/dhcp3/dhclient-exit-hooks.d/
 	cp $(CURDIR)/debian/dhcdbd.dhcp3 $(CURDIR)/debian/dhcdbd/etc/dhcp3/dhclient-exit-hooks.d/dhcdbd

Modified: packages/unstable/networkmanager/debian/rules
===================================================================
--- packages/unstable/networkmanager/debian/rules	2006-01-13 20:43:47 UTC (rev 474)
+++ packages/unstable/networkmanager/debian/rules	2006-01-16 08:48:43 UTC (rev 475)
@@ -25,6 +25,3 @@
 	install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf
 	install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf
 	
-	mkdir -p debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/
-	cp debian/dhcdbd.dhcp3 debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/dhcdbd
-