[Pkg-utopia-commits] r521 - packages/unstable/networkmanager/debian
Riccardo Setti
giskard-guest at costa.debian.org
Thu Jan 26 18:50:00 UTC 2006
Author: giskard-guest
Date: 2006-01-26 18:49:59 +0000 (Thu, 26 Jan 2006)
New Revision: 521
Modified:
packages/unstable/networkmanager/debian/changelog
packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event
packages/unstable/networkmanager/debian/network-manager.dbus-event
packages/unstable/networkmanager/debian/network-manager.lintian-override
packages/unstable/networkmanager/debian/network-manager.postinst
packages/unstable/networkmanager/debian/rules
Log:
Modified: packages/unstable/networkmanager/debian/changelog
===================================================================
--- packages/unstable/networkmanager/debian/changelog 2006-01-23 16:50:56 UTC (rev 520)
+++ packages/unstable/networkmanager/debian/changelog 2006-01-26 18:49:59 UTC (rev 521)
@@ -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 at autistici.org> Wed, 25 Jan 2006 22:54:01 +0100
+
network-manager (0.5.1-1) experimental; urgency=low
* Inital upload to Debian (Closes #)
Modified: packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event
===================================================================
--- packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event 2006-01-23 16:50:56 UTC (rev 520)
+++ packages/unstable/networkmanager/debian/network-manager-dispatcher.dbus-event 2006-01-26 18:49:59 UTC (rev 521)
@@ -5,7 +5,8 @@
# connections to the best available connection.
# This file should be placed in /etc/init.d.
#
-# Authors: Jan Gerber <j at bootlab.org>
+# Authors: Christian Bjälevik <nafallo at magicalforest.se>
+# Jan Gerber <j at bootlab.org>
# Mark Roach <mrroach at okmaybe.com>
# Thom May <thom at 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 @@
# 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 @@
# 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 $?
Modified: packages/unstable/networkmanager/debian/network-manager.dbus-event
===================================================================
--- packages/unstable/networkmanager/debian/network-manager.dbus-event 2006-01-23 16:50:56 UTC (rev 520)
+++ packages/unstable/networkmanager/debian/network-manager.dbus-event 2006-01-26 18:49:59 UTC (rev 521)
@@ -5,7 +5,8 @@
# connections to the best available connection.
# This file should be placed in /etc/init.d.
#
-# Authors: Jan Gerber <j at bootlab.org>
+# Authors: Christian Bjälevik <nafallo at magicalforest.se>
+# Jan Gerber <j at bootlab.org>
# Mark Roach <mrroach at okmaybe.com>
# Thom May <thom at 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 @@
# 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 @@
# 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 $?
Modified: packages/unstable/networkmanager/debian/network-manager.lintian-override
===================================================================
--- packages/unstable/networkmanager/debian/network-manager.lintian-override 2006-01-23 16:50:56 UTC (rev 520)
+++ packages/unstable/networkmanager/debian/network-manager.lintian-override 2006-01-26 18:49:59 UTC (rev 521)
@@ -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
Modified: packages/unstable/networkmanager/debian/network-manager.postinst
===================================================================
--- packages/unstable/networkmanager/debian/network-manager.postinst 2006-01-23 16:50:56 UTC (rev 520)
+++ packages/unstable/networkmanager/debian/network-manager.postinst 2006-01-26 18:49:59 UTC (rev 521)
@@ -6,12 +6,11 @@
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
Modified: packages/unstable/networkmanager/debian/rules
===================================================================
--- packages/unstable/networkmanager/debian/rules 2006-01-23 16:50:56 UTC (rev 520)
+++ packages/unstable/networkmanager/debian/rules 2006-01-26 18:49:59 UTC (rev 521)
@@ -11,17 +11,21 @@
--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 \
More information about the Pkg-utopia-commits
mailing list