[Pkg-utopia-commits] r710 - packages/unstable/networkmanager/debian
Riccardo Setti
giskard-guest at costa.debian.org
Sat Mar 4 20:07:33 UTC 2006
Author: giskard-guest
Date: 2006-03-04 20:07:31 +0000 (Sat, 04 Mar 2006)
New Revision: 710
Removed:
packages/unstable/networkmanager/debian/dirs
Modified:
packages/unstable/networkmanager/debian/compat
packages/unstable/networkmanager/debian/control
packages/unstable/networkmanager/debian/network-manager-dev.install
packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event
packages/unstable/networkmanager/debian/network-manager-gnome.dirs
packages/unstable/networkmanager/debian/network-manager-gnome.install
packages/unstable/networkmanager/debian/network-manager.dbus-event
packages/unstable/networkmanager/debian/network-manager.dirs
packages/unstable/networkmanager/debian/network-manager.install
packages/unstable/networkmanager/debian/rules
Log:
first debian release of NM 0.6 (taken from the experimental branch)
Modified: packages/unstable/networkmanager/debian/compat
===================================================================
--- packages/unstable/networkmanager/debian/compat 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/compat 2006-03-04 20:07:31 UTC (rev 710)
@@ -1 +1 @@
-4
+5
Modified: packages/unstable/networkmanager/debian/control
===================================================================
--- packages/unstable/networkmanager/debian/control 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/control 2006-03-04 20:07:31 UTC (rev 710)
@@ -7,7 +7,7 @@
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 @@
.
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.
+
Deleted: packages/unstable/networkmanager/debian/dirs
===================================================================
--- packages/unstable/networkmanager/debian/dirs 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/dirs 2006-03-04 20:07:31 UTC (rev 710)
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
Modified: packages/unstable/networkmanager/debian/network-manager-dev.install
===================================================================
--- packages/unstable/networkmanager/debian/network-manager-dev.install 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/network-manager-dev.install 2006-03-04 20:07:31 UTC (rev 710)
@@ -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
Modified: packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event
===================================================================
--- packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event 2006-03-04 20:07:31 UTC (rev 710)
@@ -42,10 +42,9 @@
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 $?
}
#
Modified: packages/unstable/networkmanager/debian/network-manager-gnome.dirs
===================================================================
--- packages/unstable/networkmanager/debian/network-manager-gnome.dirs 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/network-manager-gnome.dirs 2006-03-04 20:07:31 UTC (rev 710)
@@ -1,2 +1 @@
etc/dbus-1/system.d/
-usr/share/pixmaps
Modified: packages/unstable/networkmanager/debian/network-manager-gnome.install
===================================================================
--- packages/unstable/networkmanager/debian/network-manager-gnome.install 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/network-manager-gnome.install 2006-03-04 20:07:31 UTC (rev 710)
@@ -2,5 +2,6 @@
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
Modified: packages/unstable/networkmanager/debian/network-manager.dbus-event
===================================================================
--- packages/unstable/networkmanager/debian/network-manager.dbus-event 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/network-manager.dbus-event 2006-03-04 20:07:31 UTC (rev 710)
@@ -23,7 +23,6 @@
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 @@
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 @@
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
-
}
Modified: packages/unstable/networkmanager/debian/network-manager.dirs
===================================================================
--- packages/unstable/networkmanager/debian/network-manager.dirs 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/network-manager.dirs 2006-03-04 20:07:31 UTC (rev 710)
@@ -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
Modified: packages/unstable/networkmanager/debian/network-manager.install
===================================================================
--- packages/unstable/networkmanager/debian/network-manager.install 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/network-manager.install 2006-03-04 20:07:31 UTC (rev 710)
@@ -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
Modified: packages/unstable/networkmanager/debian/rules
===================================================================
--- packages/unstable/networkmanager/debian/rules 2006-03-04 09:38:27 UTC (rev 709)
+++ packages/unstable/networkmanager/debian/rules 2006-03-04 20:07:31 UTC (rev 710)
@@ -9,6 +9,7 @@
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
More information about the Pkg-utopia-commits
mailing list