diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/network-manager-dispatcher.dbus-event | 11 | ||||
| -rw-r--r-- | debian/network-manager.dbus-event | 9 | ||||
| -rw-r--r-- | debian/network-manager.lintian-override | 2 | ||||
| -rw-r--r-- | debian/network-manager.postinst | 5 | ||||
| -rwxr-xr-x | debian/rules | 8 |
6 files changed, 27 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index f46ff437..ed1853e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.5.1-2) experimental; urgency=low + + * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because + first we need to start NetworkManager and then NetworkManagerDispatcher + * added networkmanger and networkmanaferdispatcher manpages. + + -- Riccardo Setti <giskard@autistici.org> Wed, 25 Jan 2006 22:54:01 +0100 + network-manager (0.5.1-1) experimental; urgency=low * Inital upload to Debian (Closes #) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index e8f5b94c..e8c216f2 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -5,7 +5,8 @@ # connections to the best available connection. # This file should be placed in /etc/init.d. # -# Authors: Jan Gerber <j@bootlab.org> +# Authors: Christian Bjälevik <nafallo@magicalforest.se> +# Jan Gerber <j@bootlab.org> # Mark Roach <mrroach@okmaybe.com> # Thom May <thom@debian.org> # @@ -14,12 +15,12 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="Network connection manager dispatcher daemon" +DESC="NetworkManager dispatcher" NAME="NetworkManagerDispatcher" DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager PIDFILE=$PIDDIR/$NAME.pid -SCRIPTNAME=/etc/dbus-1/event.d/25$NAME +SCRIPTNAME=/etc/dbus-1/event.d/26$NAME USER=root # Gracefully exit if the package has been removed. @@ -34,7 +35,7 @@ test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDi # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $NAME" + log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR @@ -51,7 +52,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $NAME" + log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 25717d6a..2a59a08e 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -5,7 +5,8 @@ # connections to the best available connection. # This file should be placed in /etc/init.d. # -# Authors: Jan Gerber <j@bootlab.org> +# Authors: Christian Bjälevik <nafallo@magicalforest.se> +# Jan Gerber <j@bootlab.org> # Mark Roach <mrroach@okmaybe.com> # Thom May <thom@debian.org> # @@ -15,7 +16,7 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="Network connection manager daemon" +DESC="NetworkManager daemon" NAME="NetworkManager" DAEMON=/usr/sbin/$NAME @@ -42,7 +43,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $NAME" + log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR @@ -65,7 +66,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $NAME" + log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? diff --git a/debian/network-manager.lintian-override b/debian/network-manager.lintian-override index 8273764a..ef60f34b 100644 --- a/debian/network-manager.lintian-override +++ b/debian/network-manager.lintian-override @@ -1,5 +1,3 @@ -network-manager: binary-without-manpage NetworkManager -network-manager: binary-without-manpage NetworkManagerDispatcher network-manager: binary-without-manpage nm-applet network-manager: binary-without-manpage nm-vpn-properties diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 302e4bf7..849dec1c 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -6,12 +6,11 @@ case "$1" in if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled fi - - if [ -x /usr/bin/dbus-send ]; then + if [ -x /usr/bin/dbus-send ]; then /usr/bin/dbus-send --system --type=method_call \ --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/25NetworkManagerDispatcher restart + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart fi ;; esac diff --git a/debian/rules b/debian/rules index c3d89853..2df6896e 100755 --- a/debian/rules +++ b/debian/rules @@ -11,17 +11,21 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --without-named \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian - + clean:: rm -f po/*.gmo + rm debian/*.1 binary-install/network-manager:: + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > NetworkManager.1 + install -m 755 debian/network-manager.dbus-event \ debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/25NetworkManagerDispatcher + debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d install -m 644 debian/nm-applet.conf \ |