[Pkg-utopia-commits] r222 - packages/networkmanager/trunk/debian

[Thom May]

Author: thom
Date: 2005-06-13 19:54:17 +0000 (Mon, 13 Jun 2005)
New Revision: 222

Modified:
   packages/networkmanager/trunk/debian/control
   packages/networkmanager/trunk/debian/network-manager.dbus-event
   packages/networkmanager/trunk/debian/network-manager.dirs
   packages/networkmanager/trunk/debian/network-manager.install
   packages/networkmanager/trunk/debian/rules
Log:
continue update to 0.4 branch

Modified: packages/networkmanager/trunk/debian/control
===================================================================
--- packages/networkmanager/trunk/debian/control	2005-06-13 15:24:02 UTC (rev 221)
+++ packages/networkmanager/trunk/debian/control	2005-06-13 19:54:17 UTC (rev 222)
@@ -1,16 +1,19 @@
 Source: network-manager
-Section: unknown
+Section: net
 Priority: optional
 Maintainer: Thom May <thom@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libgnome-keyring-dev, dbus-glib-1-dev, libiw-dev, libhal-dev, dpatch (>= 1.11), libgnomeui-dev, libpanel-applet2-dev
+Build-Depends: debhelper (>= 4.0.0), libgnome-keyring-dev, libdbus-glib-1-dev, libiw-dev, libhal-dev, dpatch (>= 1.11), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev
 Standards-Version: 3.6.0
 
 Package: network-manager
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcp3-client | dhcp-client
-Conflicts: arping, ifplugd, pump
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd, bind9
+#Conflicts: arping, ifplugd, pump
+Description: network management framework daemon
+ NetworkManager - great networking since 2004, powered by dbus and hal
+  * automatic switching between active devices
+  * discovery of available wireless networks
+  * easy switching to new wireless networks
 
 Package: network-manager-gnome
 Architecture: any

Modified: packages/networkmanager/trunk/debian/network-manager.dbus-event
===================================================================
--- packages/networkmanager/trunk/debian/network-manager.dbus-event	2005-06-13 15:24:02 UTC (rev 221)
+++ packages/networkmanager/trunk/debian/network-manager.dbus-event	2005-06-13 19:54:17 UTC (rev 222)
@@ -34,7 +34,6 @@
 d_start() {
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
 		--user $USER --exec $DAEMON -- $DAEMON_OPTS
-	NMLaunchHelper
 }
 
 #

Modified: packages/networkmanager/trunk/debian/network-manager.dirs
===================================================================
--- packages/networkmanager/trunk/debian/network-manager.dirs	2005-06-13 15:24:02 UTC (rev 221)
+++ packages/networkmanager/trunk/debian/network-manager.dirs	2005-06-13 19:54:17 UTC (rev 222)
@@ -2,3 +2,4 @@
 etc/dbus-1/system.d
 usr/bin
 usr/share/locale
+var/lib/NetworkManager

Modified: packages/networkmanager/trunk/debian/network-manager.install
===================================================================
--- packages/networkmanager/trunk/debian/network-manager.install	2005-06-13 15:24:02 UTC (rev 221)
+++ packages/networkmanager/trunk/debian/network-manager.install	2005-06-13 19:54:17 UTC (rev 222)
@@ -1,6 +1,4 @@
 debian/tmp/usr/bin/NetworkManager usr/sbin/
-debian/tmp/usr/bin/NMLoadModules usr/sbin/
-debian/tmp/usr/bin/NMLaunchHelper usr/sbin/
 debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/
-debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
 debian/tmp/usr/share/locale/*
+debian/tmp/usr/share/NetworkManager/*

Modified: packages/networkmanager/trunk/debian/rules
===================================================================
--- packages/networkmanager/trunk/debian/rules	2005-06-13 15:24:02 UTC (rev 221)
+++ packages/networkmanager/trunk/debian/rules	2005-06-13 19:54:17 UTC (rev 222)
@@ -62,7 +62,6 @@
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-	rm -f po/*.gmo
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -88,6 +87,7 @@
 
 	install -m 755 debian/network-manager.dbus-event debian/network-manager/etc/dbus-1/event.d/zz99NetworkManager
 	install -m 644 debian/network-manager-gnome.dbus-conf debian/network-manager-gnome/etc/dbus-1/system.d/NetworkManagerInfo.conf
+	install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf
 
 	dh_install -s
 # Must not depend on anything. This is to be called by