* 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

1 files changed, 2 insertions, 1 deletions

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)