* Upstream has split nm-applet into a separate package. This means we no

  longer build the network-manager-gnome binary package from this source
  package.
  - Removed files that are now part of the new nm-applet source package
    + debian/network-manager-gnome.README.Debian
    + debian/patches/10-po_fr.patch
    + debian/patches/14-po_de.patch
    + debian/patches/03-dbus_access_nm_applet.patch
    + debian/network-manager-gnome.manpages
    + debian/nm-applet.sgml
    + debian/network-manager.install
    + debian/network-manager-gnome.install
  - debian/control
    + Remove the binary package network-manager-gnome.
    + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as
      nm-vpn-properties is now part of the network-manager binary package.
    + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove
      libpanel-applet2-dev.
  - debian/rules
    + Do not build the nm-applet.1 manpage anymore.
    + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary
      workaround until this binary has also been moved into the nm-applet
      source package.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1675 ceb527fc-18e6-0310-9fe2-813c157c29e7

11 files changed, 35 insertions, 210 deletions

diff --git a/debian/changelog b/debian/changelog
index 1199e0c9..121895f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,31 @@ network-manager (0.6.5-1) unstable; urgency=low
   * Rebased and updated patches for new release
     - debian/patches/11-man_page_sh_name.patch
     - debian/patches/05-debian_backend.patch
+  * Upstream has split nm-applet into a separate package. This means we no
+    longer build the network-manager-gnome binary package from this source
+    package.
+    - Removed files that are now part of the new nm-applet source package
+      + debian/network-manager-gnome.README.Debian
+      + debian/patches/10-po_fr.patch
+      + debian/patches/14-po_de.patch
+      + debian/patches/03-dbus_access_nm_applet.patch
+      + debian/network-manager-gnome.manpages
+      + debian/nm-applet.sgml
+      + debian/network-manager.install
+      + debian/network-manager-gnome.install
+    - debian/control
+      + Remove the binary package network-manager-gnome.
+      + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as
+        nm-vpn-properties is now part of the network-manager binary package.
+      + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove
+        libpanel-applet2-dev.
+    - debian/rules
+      + Do not build the nm-applet.1 manpage anymore.
+      + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary
+        workaround until this binary has also been moved into the nm-applet
+        source package.
 
- -- Michael Biebl <biebl@debian.org>  Sun, 26 Aug 2007 20:46:05 +0200
+ -- Michael Biebl <biebl@debian.org>  Sun, 26 Aug 2007 23:55:17 +0200
 
 network-manager (0.6.4-8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 644e505a..07df5c2a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Riccardo Setti <giskard@debian.org>, Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, 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, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man
+Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager
@@ -12,6 +12,8 @@ Package: network-manager
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser
 Recommends: network-manager-gnome | network-manager-kde
+Conflicts: network-manager-gnome (<< 0.6.5-1)
+Replaces: network-manager-gnome (<< 0.6.5-1)
 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
@@ -24,32 +26,10 @@ Description: network management framework daemon
  .
   Homepage: http://www.gnome.org/projects/NetworkManager/
 
-Package: network-manager-gnome
-Architecture: any
-Section: gnome
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}), gnome-icon-theme
-Recommends: notification-daemon, libpam-keyring, network-manager-vpnc, network-manager-openvpn
-Description: network management framework (GNOME frontend)
- 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 contains a systray applet for GNOME's notification area but it
- also works for other desktop environments which provide a systray like KDE
- or XFCE.
- It displays the available networks and allows to easily switch between them.
- For encrypted networks it will prompt the user for the key/passphrase and it
- can optionally store them in the gnome-keyring.
- .
-  Homepage: http://www.gnome.org/projects/NetworkManager/
- 
 Package: network-manager-dev
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config
+Depends: pkg-config
 Description: network management framework (development files)
  this package provides header files that are needed to 
  compile VPN Plugins for NetworkManager.
@@ -76,7 +56,7 @@ Description: network management framework (GLib shared library)
 Package: libnm-glib-dev
 Section: libdevel
 Architecture: any
-Depends: libnm-glib0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+Depends: libnm-glib0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
 Description: network management framework (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
@@ -110,7 +90,7 @@ Description: network management framework (shared library)
 Package: libnm-util-dev
 Section: libdevel
 Architecture: any
-Depends: libnm-util0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+Depends: libnm-util0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
 Description: network management framework (development files)
  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
diff --git a/debian/network-manager-gnome.README.Debian b/debian/network-manager-gnome.README.Debian
deleted file mode 100644
index 0af61464..00000000
--- a/debian/network-manager-gnome.README.Debian
+++ /dev/null
@@ -1,11 +0,0 @@
-network-manager-gnome provides a Notification Area applet called nm-applet for
-conveniently choosing wired and wireless networks in GNOME, KDE and XFCE.
-
-network-manager-gnome (by virtue of the fact it uses network-manager)
-requires users to be in the group 'netdev' for it to work. If users aren't
-in the group 'netdev' then it won't automatically appear, and work, in the
-Notification Area.
-
-network-manager-gnome uses network-manager. Please see the
-network-mananger documentation in 
-/usr/share/doc/network-manager/README.Debian for further information.
diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install
deleted file mode 100644
index d5e110c7..00000000
--- a/debian/network-manager-gnome.install
+++ /dev/null
@@ -1,8 +0,0 @@
-debian/tmp/usr/bin/nm-vpn-properties
-debian/tmp/usr/bin/nm-applet
-debian/tmp/usr/share/locale/*
-debian/tmp/usr/share/nm-applet/*
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/gnome-vpn-properties
-debian/tmp/etc/dbus-1/system.d/nm-applet.conf
-debian/tmp/usr/share/gnome/autostart/nm-applet.desktop etc/xdg/autostart/
diff --git a/debian/network-manager-gnome.manpages b/debian/network-manager-gnome.manpages
deleted file mode 100644
index 15a34e96..00000000
--- a/debian/network-manager-gnome.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/nm-vpn-properties.1
-debian/nm-applet.1
diff --git a/debian/network-manager.install b/debian/network-manager.install
index f0327436..90422942 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -1,5 +1,8 @@
 debian/tmp/usr/sbin/NetworkManager 
 debian/tmp/usr/sbin/NetworkManagerDispatcher
 debian/tmp/usr/lib/network-manager
+debian/tmp/usr/share/locale
 debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
 test/nm-tool /usr/bin/
+debian/tmp/usr/bin/nm-vpn-properties
+debian/tmp/usr/share/gnome-vpn-properties/nm-vpn-properties.glade
diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml
deleted file mode 100644
index f457fd93..00000000
--- a/debian/nm-applet.sgml
+++ /dev/null
@@ -1,100 +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>8 February, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY package     "nm-applet">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      <email>giskard@autistici.org</email>;
-    </address>
-    <author>
-      <firstname>Riccardo</firstname>
-      <surname>Setti</surname>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Riccardo Setti</holder>
-    </copyright>
-    &date;
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>nm-applet</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>&package;</refname>
-
-    <refpurpose>Network management framework</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&package;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&package;</command> is the GNOME front-end for NetworkManager</para>
-         <para>It is a systray applet which will display an icon in GNOME's notification area but it 
-	 also works for other desktop environments which provide a systray like KDE or XFCE.</para>
-	 <para><command>&package;</command> shows a list of available networks and allows you to easily switch between them. For encrypted networks it 
-	 will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to 
-	 type them again.</para>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>NetworkManager (1). nm-vpn-properties (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 Riccardo Setti <email>giskard@autistici.org</email> for
-      the <productname>Debian</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/patches/03-dbus_access_nm_applet.patch b/debian/patches/03-dbus_access_nm_applet.patch
deleted file mode 100644
index 94053ea2..00000000
--- a/debian/patches/03-dbus_access_nm_applet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome/applet/nm-applet.conf.orig	2006-02-07 04:22:39.000000000 +0100
-+++ gnome/applet/nm-applet.conf	2006-02-07 04:23:00.000000000 +0100
-@@ -8,7 +8,7 @@
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
- 	</policy>
--	<policy at_console="true">
-+	<policy group="netdev">
- 		<allow own="org.freedesktop.NetworkManagerInfo"/>
- 
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
diff --git a/debian/patches/10-po_fr.patch b/debian/patches/10-po_fr.patch
deleted file mode 100644
index e2c2b4f6..00000000
--- a/debian/patches/10-po_fr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: po/fr.po
-===================================================================
-RCS file: /cvs/gnome/NetworkManager/po/fr.po,v
-retrieving revision 1.2.6.2
-diff -u -3 -p -r1.2.6.2 fr.po
---- po/fr.po	12 Jun 2006 15:47:57 -0000	1.2.6.2
-+++ po/fr.po	30 Nov 2006 17:29:17 -0000
-@@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea
- 
- #: ../gnome/applet/applet.c:1562
- msgid "Create _New Wireless Network..."
--msgstr "Créer_un nouveau réseau sans fil..."
-+msgstr "Créer _un nouveau réseau sans fil..."
- 
- #: ../gnome/applet/applet.c:1685
- msgid "_VPN Connections"
-@@ -290,17 +290,17 @@ msgstr "NetworkManager n'est pas lancé.
- #. 'Enable Networking' item
- #: ../gnome/applet/applet.c:2170
- msgid "Enable _Networking"
--msgstr "Activer_le réseau"
-+msgstr "Activer _le réseau"
- 
- #. 'Enable Wireless' item
- #: ../gnome/applet/applet.c:2176
- msgid "Enable _Wireless"
--msgstr "Activer la_connexion sans fil"
-+msgstr "Activer la _connexion sans fil"
- 
- #. 'Connection Information' item
- #: ../gnome/applet/applet.c:2182
- msgid "Connection _Information"
--msgstr "Informations sur la_connexion"
-+msgstr "Informations sur la _connexion"
- 
- #. Help item
- #: ../gnome/applet/applet.c:2193
diff --git a/debian/patches/14-po_de.patch b/debian/patches/14-po_de.patch
deleted file mode 100644
index 25ceff26..00000000
--- a/debian/patches/14-po_de.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: po/de.po
-===================================================================
---- po/de.po	(Revision 2227)
-+++ po/de.po	(Arbeitskopie)
-@@ -276,7 +276,7 @@
- #. 'Enable Networking' item
- #: ../gnome/applet/applet.c:2170
- msgid "Enable _Networking"
--msgstr "Netzwerk_aktivieren"
-+msgstr "Netzwerk _aktivieren"
- 
- #. 'Enable Wireless' item
- #: ../gnome/applet/applet.c:2176
diff --git a/debian/rules b/debian/rules
index 55dd9d1d..a4a1c76d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	
 DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 .
 
+DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties
+
 clean::
 	rm -f po/*.gmo
 	rm -f debian/*.1
@@ -21,7 +23,6 @@ clean::
 
 build/network-manager::
 	/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
 	
 binary-install/network-manager::
 	dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS)