[Pkg-utopia-commits] r1675 - in /packages/unstable/networkmanager/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Aug 26 22:17:40 UTC 2007 

Author: biebl
Date: Sun Aug 26 22:17:40 2007
New Revision: 1675

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1675
Log:
* 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.

Removed:
    packages/unstable/networkmanager/debian/network-manager-gnome.README.Debian
    packages/unstable/networkmanager/debian/network-manager-gnome.install
    packages/unstable/networkmanager/debian/network-manager-gnome.manpages
    packages/unstable/networkmanager/debian/nm-applet.sgml
    packages/unstable/networkmanager/debian/patches/03-dbus_access_nm_applet.patch
    packages/unstable/networkmanager/debian/patches/10-po_fr.patch
    packages/unstable/networkmanager/debian/patches/14-po_de.patch
Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/control
    packages/unstable/networkmanager/debian/network-manager.install
    packages/unstable/networkmanager/debian/rules

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=1675&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Sun Aug 26 22:17:40 2007
@@ -13,8 +13,31 @@
   * Rebased and updated patches for new release
     - debian/patches/11-man_page_sh_name.patch
     - debian/patches/05-debian_backend.patch
-
- -- Michael Biebl <biebl at debian.org>  Sun, 26 Aug 2007 20:46:05 +0200
+  * 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 at debian.org>  Sun, 26 Aug 2007 23:55:17 +0200
 
 network-manager (0.6.4-8) unstable; urgency=low
 

Modified: packages/unstable/networkmanager/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/control?rev=1675&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/control (original)
+++ packages/unstable/networkmanager/debian/control Sun Aug 26 22:17:40 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
 Uploaders: Riccardo Setti <giskard at debian.org>, Michael Biebl <biebl at 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 @@
 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 @@
  .
   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 @@
 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 @@
 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

Modified: packages/unstable/networkmanager/debian/network-manager.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.install?rev=1675&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.install (original)
+++ packages/unstable/networkmanager/debian/network-manager.install Sun Aug 26 22:17:40 2007
@@ -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

Modified: packages/unstable/networkmanager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/rules?rev=1675&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/rules (original)
+++ packages/unstable/networkmanager/debian/rules Sun Aug 26 22:17:40 2007
@@ -14,6 +14,8 @@
 	
 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 @@
 
 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)

More information about the Pkg-utopia-commits mailing list