first debian release of NM 0.6 (taken from the experimental branch)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@710 ceb527fc-18e6-0310-9fe2-813c157c29e7

11 files changed, 47 insertions, 33 deletions

diff --git a/debian/compat b/debian/compat
index b8626c4c..7ed6ff82 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index c45529cc..85f29f25 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.2
 
 Package: network-manager
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant
 Description: network management framework daemon
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for
@@ -69,3 +69,33 @@ Description: network management framework daemon (GLib interface)
  .
  This package provides the interface that applications can use to query
  connection status via NetworkManager.
+
+Package: libnm-util0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: network management framework (shared library)
+ NetworkManager attempts to keep an active network connection available at all
+ times. It is intended only for the desktop use-case, and is not intended for
+ usage on servers. The point of NetworkManager is to make networking
+ configuration and setup as painless and automatic as possible.  If using DHCP,
+ NetworkManager is _intended_ to replace default routes, obtain IP addresses
+ from a DHCP server, and change nameservers whenever it sees fit.
+ .
+ This package contains a convenience library to ease the access to
+ NetworkManager.
+
+Package: libnm-util-dev
+Section: libdevel
+Architecture: any
+Depends: libnm-util0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+Description: network management framework (development files)
+ NetworkManager attempts to keep an active network connection available at all
+ times. It is intended only for the desktop use-case, and is not intended for
+ usage on servers. The point of NetworkManager is to make networking
+ configuration and setup as painless and automatic as possible.  If using DHCP,
+ NetworkManager is _intended_ to replace default routes, obtain IP addresses
+ from a DHCP server, and change nameservers whenever it sees fit.
+ .
+ This package contains header and development files.
+
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bbb..00000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install
index 9287a6f6..97a00409 100644
--- a/debian/network-manager-dev.install
+++ b/debian/network-manager-dev.install
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/NetworkManager.pc
 debian/tmp/usr/include/NetworkManager/NetworkManager.h
+debian/tmp/usr/include/NetworkManager/NetworkManagerVPN.h
 debian/tmp/usr/include/NetworkManager/nm-vpn-ui-interface.h
diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event
index e8c216f2..70747683 100644
--- a/debian/network-manager-dispatcher.dbus-event
+++ b/debian/network-manager-dispatcher.dbus-event
@@ -42,10 +42,9 @@ d_start() {
 	fi
 
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--user $USER --exec $DAEMON -- $DAEMON_OPTS
-    RETVAL=$?
-	log_end_msg $RETVAL
-    [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE
+		--user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
+
+	log_end_msg $?
 }
 
 #
diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs
index 92c4831a..e628b1eb 100644
--- a/debian/network-manager-gnome.dirs
+++ b/debian/network-manager-gnome.dirs
@@ -1,2 +1 @@
 etc/dbus-1/system.d/
-usr/share/pixmaps
diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install
index c7b30983..dfa048ea 100644
--- a/debian/network-manager-gnome.install
+++ b/debian/network-manager-gnome.install
@@ -2,5 +2,6 @@ debian/tmp/usr/bin/nm-vpn-properties
 debian/tmp/usr/bin/nm-applet
 debian/tmp/usr/share/locale/*
 debian/tmp/usr/share/nm-applet/*
-debian/tmp/usr/share/icons/hicolor
+debian/tmp/usr/share/icons
 debian/tmp/usr/share/gnome-vpn-properties
+debian/tmp/etc/dbus-1/system.d/nm-applet.conf
diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event
index f18ea28e..d26d18f4 100644
--- a/debian/network-manager.dbus-event
+++ b/debian/network-manager.dbus-event
@@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME
 
 PIDDIR=/var/run/NetworkManager
 PIDFILE=$PIDDIR/$NAME.pid
-NAMED_PIDFILE=/var/lib/NetworkManager/NetworkManager-pid-named
 
 SCRIPTNAME=/etc/dbus-1/event.d/25$NAME
 USER=root
@@ -54,12 +53,9 @@ d_start() {
 	chmod 755 /var/lib/NetworkManager
 
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--user $USER --exec $DAEMON -- $DAEMON_OPTS
-    RETVAL=$?
-	log_end_msg $RETVAL
-    [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE
-
-
+		--user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
+		
+	log_end_msg $?
 }
 
 #
@@ -69,18 +65,8 @@ d_stop() {
         log_begin_msg "Stopping $DESC"
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 		 --oknodo --user $USER --exec $DAEMON
+		 
         log_end_msg $?
-
-        # if NetworkManager does not want to die, apply some more force
-        if [ -e $PIDFILE ]; then
-            kill -9 $(cat $PIDFILE) || true
-            rm -f $PIDFILE
-        fi
-        if [ -e $NAMED_PIDFILE ]; then
-            kill -9 $(cat $NAMED_PIDFILE) || true
-            rm -f $NAMED_PIDFILE
-        fi
-
 }
 
 
diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs
index 86847abc..19c18e1e 100644
--- a/debian/network-manager.dirs
+++ b/debian/network-manager.dirs
@@ -1,5 +1,4 @@
 etc/dbus-1/event.d
 etc/dbus-1/system.d
-usr/bin
-usr/share/locale
+etc/NetworkManager/dispatcher.d
 var/lib/NetworkManager
diff --git a/debian/network-manager.install b/debian/network-manager.install
index d2cbee63..0f9b1179 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/bin/NetworkManager usr/sbin/
-debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/
-debian/tmp/etc/dbus-1/system.d/*
+debian/tmp/usr/sbin/NetworkManager 
+debian/tmp/usr/sbin/NetworkManagerDispatcher
+debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
diff --git a/debian/rules b/debian/rules
index 09657a86..6c5a5ce9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm"
 DEB_CONFIGURE_EXTRA_FLAGS += \
 		--with-dbus-sys=/etc/dbus-1/system.d \
 		--without-named \
+		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
 		--with-dhcdbd=/usr/sbin/dhcdbd \
 		--with-distro=debian