From 4ab5ad85236aa35dfbd2459d274e798c9f49d777 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 15 Aug 2006 21:00:45 +0000 Subject: - We already use the upstream man page for NetworkManagerDispatcher; do the same for the NetworkManager man page. - As the upstream man pages of NetworkManager and NetworkManagerDispatcher reference the nm-tool man page and we already install the nm-tool man page it makes sense to also install the corresponding nm-tool binary ;-) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@954 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 136 ---------------------------------------- debian/changelog | 5 +- debian/network-manager.install | 1 + debian/network-manager.manpages | 2 +- debian/rules | 1 - 5 files changed, 5 insertions(+), 140 deletions(-) delete mode 100644 debian/NetworkManager.sgml (limited to 'debian') diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml deleted file mode 100644 index a7ab53a8..00000000 --- a/debian/NetworkManager.sgml +++ /dev/null @@ -1,136 +0,0 @@ - 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), nm-tool (1). - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Jan Gerber j@bootlab.org and by - Riccardo Setti giskard@debian.org for - the Debian/Ubuntu system. - - - - - - diff --git a/debian/changelog b/debian/changelog index b906784a..77e4bf58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,10 +12,11 @@ network-manager (0.6.4-1) unstable; urgency=low [ Michael Biebl ] * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into a single patch called 05-debian_backend.patch. - * Updated 05-debian_backend.patch to not control mapped interfaces. + * Updated 05-debian_backend.patch to not control mapped interfaces. (Closes: #377498) + * Ship the nm-tool utility. - -- Michael Biebl Tue, 8 Aug 2006 01:51:13 +0200 + -- Michael Biebl Tue, 15 Aug 2006 22:52:30 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/network-manager.install b/debian/network-manager.install index 2fc8ba3f..f0327436 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -2,3 +2,4 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/NetworkManagerDispatcher debian/tmp/usr/lib/network-manager debian/tmp/etc/dbus-1/system.d/NetworkManager.conf +test/nm-tool /usr/bin/ diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 7177493c..153d1ce0 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,3 @@ man/NetworkManagerDispatcher.1 man/nm-tool.1 -debian/NetworkManager.1 +man/NetworkManager.1 diff --git a/debian/rules b/debian/rules index cf7bdef2..57cbedb3 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5