From 109a7976fe0363e22681d919258b3d9ce4b3bfb3 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 10 Jan 2006 15:31:05 +0000 Subject: first import of dhcbdb and networkmanager git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@440 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 135 +++++++++++++++ debian/NetworkManagerDispatcher.sgml | 97 +++++++++++ debian/README | 10 ++ debian/changelog | 210 +++++++++++++++++++++++ debian/compat | 1 + debian/control | 55 ++++++ debian/copyright | 12 ++ debian/dirs | 2 + debian/docs | 3 + debian/libnm-glib-0-dev.install | 5 + debian/libnm-glib-0.install | 1 + debian/network-manager-dev.install | 3 + debian/network-manager-dispatcher.dbus-event | 79 +++++++++ debian/network-manager.dbus-conf | 24 +++ debian/network-manager.dbus-event | 104 +++++++++++ debian/network-manager.dirs | 5 + debian/network-manager.docs | 1 + debian/network-manager.install | 10 ++ debian/network-manager.postinst | 19 ++ debian/nm-applet.conf | 24 +++ debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch | 11 ++ debian/rules | 26 +++ 22 files changed, 837 insertions(+) create mode 100644 debian/NetworkManager.sgml create mode 100644 debian/NetworkManagerDispatcher.sgml create mode 100644 debian/README create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/dirs create mode 100644 debian/docs create mode 100644 debian/libnm-glib-0-dev.install create mode 100644 debian/libnm-glib-0.install create mode 100644 debian/network-manager-dev.install create mode 100644 debian/network-manager-dispatcher.dbus-event create mode 100644 debian/network-manager.dbus-conf create mode 100644 debian/network-manager.dbus-event create mode 100644 debian/network-manager.dirs create mode 100644 debian/network-manager.docs create mode 100644 debian/network-manager.install create mode 100644 debian/network-manager.postinst create mode 100644 debian/nm-applet.conf create mode 100644 debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch create mode 100755 debian/rules diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml new file mode 100644 index 00000000..cc1fcd92 --- /dev/null +++ b/debian/NetworkManager.sgml @@ -0,0 +1,135 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + 30 August, 2005"> + + + GNU"> + GPL"> +]> + + + +
+ j@bootlab.org; +
+ + Jan + Gerber + + + 2005 + Jan Gerber + + &date; + + + NetworkManager + 1 + + + &package; + + Network management framework + + + + &package; + + + + + + + DESCRIPTION + + This manual page documents briefly the + &package; command. + + &package; monitors all network connections and automatically chooses the best connection to use. It is started as a system service by dbus. nm-applet allows you to specify wireless access points which wireless cards in the computer should associate with + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + + Don't become a daemon, Messages will be logged to stdout + + + + + + + + Allow dummy devices to be created via DBUS methods [DEBUG] + + + + + + + + Show summary of options. + + + + + + SEE ALSO + + nm-applet (1), NetworkManagerDispatcher (1). + + More Information about NetworkManager can be found at + http://people.redhat.com/dcbw/NetworkManager/ . + + + AUTHOR + + This manual page was written by Jan Gerber j@bootlab.org for + the Ubuntu system. + + + + + + diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml new file mode 100644 index 00000000..c6a42105 --- /dev/null +++ b/debian/NetworkManagerDispatcher.sgml @@ -0,0 +1,97 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + 30 August, 2005"> + + + GNU"> + GPL"> +]> + + + +
+ j@bootlab.org; +
+ + Jan + Gerber + + + 2005 + Jan Gerber + + &date; + + + NetworkManagerDispatcher + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; calls scripts in +/etc/NetworkManager/dispatcher.d each time the network is broght up or down by NetworkManager. Arguments to these scripts are network device and up or down. so it will call something like /etc/NetworkManager/dispatcher.d/example eth0 up + + + + SEE ALSO + + NetworkManager (1), nm-applet (1). + + More Information about NetworkManager can be found at + http://people.redhat.com/dcbw/NetworkManager/ . + + + AUTHOR + + This manual page was written by Jan Gerber j@bootlab.org for + the Ubuntu system. + + + + + + diff --git a/debian/README b/debian/README new file mode 100644 index 00000000..768e12b9 --- /dev/null +++ b/debian/README @@ -0,0 +1,10 @@ +NetworkManger has two parts one is run on the system level to +manager connections and gather information. The other is an applet +the user can interact with. Since NetworkManager is not part of +main yet, you have to add nm-applet to your session once. + +(instructions for gnome only) +Go to System -> Preferences -> Sessions +In the Startup Programs tab, click Add +type "nm-applet", click OK. +log out of your gnome session, and log back in again. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..62b11114 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,210 @@ +network-manager (0.5.1-1) experimental; urgency=low + + * Inital upload to Debian (Closes #) + * work based on the ubuntu package + + -- Riccardo Setti Mon, 5 Jan 2006 17:09:29 +0100 + +network-manager (0.5.1-0ubuntu6) dapper; urgency=low + + * Really don't depend on bind9 being installed + + -- Matthew Garrett Mon, 26 Dec 2005 00:40:29 +0000 + +network-manager (0.5.1-0ubuntu5) dapper; urgency=low + + * debian/control: + - Version dep on dhcdbd to (>= 1.10-0ubuntu2). + + -- Christian Bjälevik Wed, 21 Dec 2005 19:08:53 +0100 + +network-manager (0.5.1-0ubuntu4) dapper; urgency=low + + * debian/control: + - Version all accurances of libdbus-glib-1-dev to (>= 0.60). + - Removed not needed Build-Dep on libxdcmp-dev, this is a dep + of libx11-dev now. + * debian/patches/01-STOLEN_FROM_HEAD-dbus-60: + - Add a patch from CVS HEAD to fix FTBFS. + No patchsystem, only applied it. + + -- Christian Bjälevik Wed, 21 Dec 2005 14:22:34 +0100 + +network-manager (0.5.1-0ubuntu3) dapper; urgency=low + + * debian/control: + - Changed versioned dep on wireless-tools to >= 28pre9 + (what upstream says in their .news). + - Removed commented out Conflicts-line. + - Do not depend on bind9 being installed. + - Added libxdmcp-dev as a Build-Dep. + * debian/*.dbus-event: + - Use "$NAME" instead of the incredible long "$DESC: ". + * debian/network-manager.postinst: + - Do not run gtk-update-icon-cache on configure cause + seb128 says it's a bad idea and explained why :-). + * debian/README: + - Fix typo (cann -> can). + * debian/rules: + - Removed named-support (we don't want bind9 for this) + - Added --with-distro=debian. + + -- Christian Bjälevik Thu, 15 Dec 2005 02:04:12 +0100 + +network-manager (0.5.1-0ubuntu2) dapper; urgency=low + + * remove .arch-ids traces + + -- Jan Gerber Sun, 13 Nov 2005 21:19:18 -0500 + +network-manager (0.5.1-0ubuntu1) dapper; urgency=low + + * New upstream version + + -- Jan Gerber Fri, 21 Oct 2005 08:33:25 -0400 + +network-manager (0.5.0-0ubuntu1) breezy; urgency=low + + * New upstream version + * split headers into network-manager-dev + + -- Jan Gerber Tue, 18 Oct 2005 17:43:56 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu5) breezy; urgency=low + + * fix postinst so its possible to install network-manager + in pbuilder + + -- Jan Gerber Tue, 11 Oct 2005 19:23:47 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu4) breezy; urgency=low + + * update postinst to restart dbus on install + + -- Jan Gerber Sat, 29 Aug 2005 13:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu3) breezy; urgency=low + + * this is NetworkManager CVS Tag NM_0_4_1_RELEASE + 3 patches + - make dhcdbd only a runtime dependency + - fix build due to one too many ,s + - fix debian backend to support static IP settings again + (all changes are upstream by now) + + -- Jan Gerber Sat, 27 Aug 2005 23:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu2) breezy; urgency=low + + * restructure build system to creat orig.tar.gz and diff.gz files + + -- Jan Gerber Sat, 27 Aug 2005 14:04:26 +0200 + +network-manager (0.4.1+cvs20050817-0unbuntu1) breezy; urgency=low + + * fix loading static IP settings from /etc/network/interfaces + + -- Jan Gerber Sun, 21 Aug 2005 19:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0) breezy; urgency=low + + * update to NM_0_4_1_RELEASE + + -- Jan Gerber Sun, 21 Aug 2005 15:27:26 +0200 + +network-manager (0.4.1+cvs20050813-0) breezy; urgency=low + + * change back to using BIND + * remove dependency on resolvconf and dnsmasq + + -- Jan Gerber Sat, 13 Aug 2005 19:37:26 +0200 + +network-manager (0.4.1+cvs20050618-3) breezy; urgency=low + + * Run resolvconf instead of messing with BIND. Dependencies + changed too. Unfortunately these changes are not properly + tested :-(. + + -- Ian Jackson Sat, 18 Jun 2005 13:33:26 +0100 + +network-manager (0.4.1+cvs20050618-2) breezy; urgency=low + + * Sort out chown of /var/lib/NetworkManager + + -- Thom May Sat, 18 Jun 2005 13:33:26 +0100 + +network-manager (0.4.1+cvs20050618-1) breezy; urgency=low + + * update from CVS + * Add configure magic to ensure we get the correct path for dhcdbd + (Ubuntu: #11905) + * Ensure /var/lib/NetworkManager is created with the correct permisions + (Ubuntu: #11904) + * Rename dbus event script to correct name and restart dbus in postinst + * Depend on lsb-base and use log_*_msg in event script + + -- Thom May Sat, 18 Jun 2005 11:22:49 +0100 + +network-manager (0.4.1+cvs20050616-1) breezy; urgency=low + + * New upstream. Fix descriptions. + + -- Thom May Thu, 16 Jun 2005 14:47:30 +0100 + +network-manager (0.4.1+cvs20050614-1) unstable; urgency=low + + * New upstream release. Move to 0.4 branch; use dhcdbd. + * Drop network-manager-gnome + * add libnm-glib-0 and libnm-glib-0-dev + + -- Thom May Tue, 14 Jun 2005 12:41:29 +0100 + +network-manager (0.3.1+cvs20041108-1) unstable; urgency=low + + * New upstream release + * Add dpatch + + -- Thom May Mon, 8 Nov 2004 13:49:15 +0000 + +network-manager (0.3.1+cvs20041101-2) unstable; urgency=low + + * Update dependencies, thanks to j@bootlab.org + + -- Thom May Tue, 2 Nov 2004 16:32:45 +0000 + +network-manager (0.3.1+cvs20041101-1) unstable; urgency=low + + * New upstream release + + -- Thom May Mon, 1 Nov 2004 13:08:32 +0000 + +network-manager (0.3.1+cvs20041028-1) unstable; urgency=low + + * New upstream release + + -- Thom May Thu, 28 Oct 2004 13:12:42 +0100 + +network-manager (0.3+cvs20041016-2) unstable; urgency=low + + * fix some minor problems in packaging; clean up for pkg-utopia entry + + -- Thom May Mon, 25 Oct 2004 13:43:07 +0100 + +network-manager (0.3+cvs20041016-1) unstable; urgency=low + + * New upstream release + * Clean up backend for debian + + -- Thom May Sat, 16 Oct 2004 21:32:43 +0100 + +network-manager (0.3-1) unstable; urgency=low + + * New upstream release + + -- Thom May Fri, 15 Oct 2004 13:55:46 +0100 + +network-manager (0.2+cvs20040928-1) unstable; urgency=low + + * Initial Release. + + -- Thom May Sun, 3 Oct 2004 11:54:56 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..3c59cfca --- /dev/null +++ b/debian/control @@ -0,0 +1,55 @@ +Source: network-manager +Section: net +Priority: optional +Maintainer: Riccardo Setti +Build-Depends: debhelper (>= 4.0.0), gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev +Standards-Version: 3.6.2 + +Package: network-manager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6) +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 + 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 provides the userspace daemons and a notification applet to + control the system. + +Package: network-manager-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config +Description: network management framework daemon development + this package provides header files that are needed to + compile VPN Plugins for NetworManager. + +Package: libnm-glib-0 +Architecture: any +Depends: ${shlibs:Depends} +Description: network management framework daemon (GLib 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 provides the shared library that applications can use to query + connection status via NetworkManager. + +Package: libnm-glib-0-dev +Architecture: any +Depends: libglib2.0-dev, libnm-glib-0, libdbus-glib-1-dev (>= 0.60) +Description: network management framework daemon (GLib interface) + 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 provides the interface that applications can use to query + connection status via NetworkManager. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..099ed1c0 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Thom May on +Sun, 3 Oct 2004 11:54:56 +0100. + +It was downloaded from ftp.gnome.org + +Upstream Author: Dan Williams + +Copyright: + +This package is licensed under the GPL. For a description of the GPL, +see /usr/share/common-licenses/GPL on your Debian system. + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 00000000..ca882bbb --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..5502ed8f --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO diff --git a/debian/libnm-glib-0-dev.install b/debian/libnm-glib-0-dev.install new file mode 100644 index 00000000..754ac2e6 --- /dev/null +++ b/debian/libnm-glib-0-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/pkgconfig/libnm_glib.pc +debian/tmp/usr/lib/libnm_glib*.a +debian/tmp/usr/lib/libnm_glib*.la +debian/tmp/usr/lib/libnm_glib*.so +debian/tmp/usr/include/NetworkManager/libnm_glib.h diff --git a/debian/libnm-glib-0.install b/debian/libnm-glib-0.install new file mode 100644 index 00000000..51ab95e3 --- /dev/null +++ b/debian/libnm-glib-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm_glib*.so.* diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install new file mode 100644 index 00000000..9287a6f6 --- /dev/null +++ b/debian/network-manager-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/pkgconfig/NetworkManager.pc +debian/tmp/usr/include/NetworkManager/NetworkManager.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 new file mode 100644 index 00000000..e8f5b94c --- /dev/null +++ b/debian/network-manager-dispatcher.dbus-event @@ -0,0 +1,79 @@ +#! /bin/sh +# +# NetworkManager NetworkManagerDispatcher daemon +# Daemon for automatically switching network +# connections to the best available connection. +# This file should be placed in /etc/init.d. +# +# Authors: Jan Gerber +# Mark Roach +# Thom May +# +# + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="Network connection manager dispatcher daemon" +NAME="NetworkManagerDispatcher" +DAEMON=/usr/sbin/$NAME +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid +SCRIPTNAME=/etc/dbus-1/event.d/25$NAME +USER=root + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +test -f /etc/default/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher + +# +# Function that starts the daemon/service. +# +d_start() { + log_begin_msg "Starting $NAME" + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + 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 +} + +# +# Function that stops the daemon/service. +# +d_stop() { + log_begin_msg "Stopping $NAME" + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --oknodo --user $USER --exec $DAEMON + log_end_msg $? +} + + +case "$1" in + start) + d_start + ;; + stop) + d_stop + ;; + restart|force-reload) + d_stop + sleep 1 + d_start + ;; + *) + log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/network-manager.dbus-conf b/debian/network-manager.dbus-conf new file mode 100644 index 00000000..bdf362ff --- /dev/null +++ b/debian/network-manager.dbus-conf @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event new file mode 100644 index 00000000..25717d6a --- /dev/null +++ b/debian/network-manager.dbus-event @@ -0,0 +1,104 @@ +#! /bin/sh +# +# NetworkManager NetworkManager daemon +# Daemon for automatically switching network +# connections to the best available connection. +# This file should be placed in /etc/init.d. +# +# Authors: Jan Gerber +# Mark Roach +# Thom May +# +# Version: @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl +# + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="Network connection manager daemon" +NAME="NetworkManager" + +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 + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# We need /sbin/ip +[ -x /sbin/ip ] || exit 1 + +. /lib/lsb/init-functions + +test -f /etc/default/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManager && . /etc/default/NetworkManager + +# +# Function that starts the daemon/service. +# +d_start() { + log_begin_msg "Starting $NAME" + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + fi + modprobe capability >/dev/null 2>&1 || true + + test -d /var/lib/NetworkManager || mkdir -p /var/lib/NetworkManager + 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 + + +} + +# +# Function that stops the daemon/service. +# +d_stop() { + log_begin_msg "Stopping $NAME" + 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 $(< $PIDFILE) || true + rm -f $PIDFILE + fi + if [ -e $NAMED_PIDFILE ]; then + kill -9 $(< $NAMED_PIDFILE) || true + rm -f $NAMED_PIDFILE + fi + +} + + +case "$1" in + start) + d_start + ;; + stop) + d_stop + ;; + restart|force-reload) + d_stop + sleep 1 + d_start + ;; + *) + log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs new file mode 100644 index 00000000..86847abc --- /dev/null +++ b/debian/network-manager.dirs @@ -0,0 +1,5 @@ +etc/dbus-1/event.d +etc/dbus-1/system.d +usr/bin +usr/share/locale +var/lib/NetworkManager diff --git a/debian/network-manager.docs b/debian/network-manager.docs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/debian/network-manager.docs @@ -0,0 +1 @@ + diff --git a/debian/network-manager.install b/debian/network-manager.install new file mode 100644 index 00000000..d1771b07 --- /dev/null +++ b/debian/network-manager.install @@ -0,0 +1,10 @@ +debian/tmp/usr/bin/NetworkManager usr/sbin/ +debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ +debian/tmp/usr/bin/nm-vpn-properties +debian/tmp/usr/bin/nm-applet +debian/tmp/usr/share/locale/* +debian/tmp/usr/share/NetworkManager/* +debian/tmp/usr/share/NetworkManagerNotification/* +debian/tmp/usr/share/nm-applet/* +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/gnome-vpn-properties diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst new file mode 100644 index 00000000..302e4bf7 --- /dev/null +++ b/debian/network-manager.postinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +case "$1" in + configure) + 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 + /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 + fi + ;; +esac + +#DEBHELPER# diff --git a/debian/nm-applet.conf b/debian/nm-applet.conf new file mode 100644 index 00000000..69bc7aee --- /dev/null +++ b/debian/nm-applet.conf @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch new file mode 100644 index 00000000..9b6b3aad --- /dev/null +++ b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch @@ -0,0 +1,11 @@ +--- gnome/applet/applet-dbus.c.old 2005-12-21 14:19:38.000000000 +0100 ++++ gnome/applet/applet-dbus.c 2005-12-21 14:20:12.000000000 +0100 +@@ -388,7 +388,7 @@ + } + + dbus_error_init (&error); +- acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error); ++ acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &error); + if (dbus_error_is_set (&error)) + { + nm_warning ("nmwa_dbus_init() could not acquire its service. dbus_bus_acquire_service() says: '%s'", error.message); diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..b8337510 --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --with-dbus-sys=/etc/dbus-1/system.d \ + --libexecdir=/usr/bin \ + --localstatedir=/var/run \ + --without-named \ + --with-dhcdbd=/sbin/dhcdbd \ + --with-distro=debian + +clean:: + + rm -f po/*.gmo + +install_arch:: + + 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 + mkdir -p -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d + install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf + install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + -- cgit 1.3.0-6-gf8a5