- 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

5 files changed, 5 insertions, 140 deletions

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 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > 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.
-
-  -->
-
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY date        "<date>30 August, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY package     "NetworkManager">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      <email>j@bootlab.org</email>;
-    </address>
-    <author>
-      <firstname>Jan</firstname>
-      <surname>Gerber</surname>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Jan Gerber</holder>
-    </copyright>
-    &date;
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>NetworkManager</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>&package;</refname>
-
-    <refpurpose>Network management framework</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&package;</command>
-      <arg><option>--no-daemon</option></arg>
-      <arg><option>--enable-test-devices</option></arg>
-      <arg><option>--help</option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&package;</command> command.</para>
-
-    <para><command>&package;</command> monitors all network connections and automatically chooses the best connection to use. It is started as a system service by <command>dbus</command>. <command>nm-applet</command> allows you to specify wireless access points which wireless cards in the computer should associate with</para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below. </para>
-
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>--no-daemon</option>
-        </term>
-        <listitem>
-          <para>Don't become a daemon, Messages will be logged to stdout</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--enable-test-devices</option>
-        </term>
-        <listitem>
-          <para>Allow dummy devices to be created via DBUS methods [DEBUG]</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>nm-applet (1), NetworkManagerDispatcher (1), nm-tool (1).</para>
-
-    <para>More Information about NetworkManager can be found at
-      http://www.gnome.org/projects/NetworkManager/ .</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by Jan Gerber <email>j@bootlab.org</email> and by
-	 Riccardo Setti <email>giskard@debian.org</email> for
-      the <productname>Debian/Ubuntu</productname> system.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
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 <biebl@teco.edu>  Tue,  8 Aug 2006 01:51:13 +0200
+ -- Michael Biebl <biebl@teco.edu>  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