* New upstream release.

* Added myself to uploaders.
* Reformatted changelog, always indent - bullet points.
* Added dependency on dbus (>= 0.60)
* Fixed a small typo in network-manager.postinst
* Downgraded dependency of wpasupplicant to 0.4.8. Given that the wpasupplicant includes my patch, this should be enough. If not, we will raise this dependency to 0.5.1 again.


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

4 files changed, 33 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index b8daf888..eef4d367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,37 +1,45 @@
+network-manager (0.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added myself to uploaders.
+  * Added a dependency on dbus.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 14 Mar 2006 15:48:41 +0100
+
 network-manager (0.6.0-1) unstable; urgency=low
 
   * New upstream release.
-  - most of the work is taken from the experimental branch of NM.
-    Thanks goes to  Michael Biebl.
-  - Added NetworkManagerDebian.patch which introduce supports for resolvconf
+    - most of the work is taken from the experimental branch of NM.
+      Thanks goes to  Michael Biebl.
+    - Added NetworkManagerDebian.patch which introduce supports for resolvconf
   * switched to debhelper5.
   * added libnl-util0, libnl-util-dev packages.
-  - added debian/libnl-util0.install , debian/libnl-util-dev.install
+    - added debian/libnl-util0.install , debian/libnl-util-dev.install
   * removed debian/dirs as it was useless.
-  * added a Dep on wpasupplicant as it's necessary for all encrypted
-  connections.
+  * added a dependency on wpasupplicant as it's necessary for all encrypted
+    connections.
 
  -- Riccardo Setti <giskard@autistici.org>  Thu,  9 Mar 2006 15:38:01 +0100
 
 network-manager (0.5.1-3) unstable; urgency=low
 
   * improved debian/copyright . I hope this time it will be 
-  good enough to pass the ftp-master check. Thanks to Joerg Jaspert who
-  has pointed me to the problem.
+    good enough to pass the ftp-master check. Thanks to Joerg Jaspert who
+    has pointed me to the problem.
 
  -- Riccardo Setti <giskard@autistici.org>  Sun, 26 Feb 2006 21:57:29 +0100
 
 network-manager (0.5.1-2) unstable; urgency=low
 
   * improved manpages.
-  - added nm-vpn-properties, nm-applet manpages
-  - added debian/network-manager-gnome.manpages
-  - modifyed NetworManager*.sgml for reflect the correct website.
+    - added nm-vpn-properties, nm-applet manpages
+    - added debian/network-manager-gnome.manpages
+    - modifyed NetworManager*.sgml for reflect the correct website.
   * added nm-vpn-properties.desktop, nm-logo.xpm
   * added dbus_access_network_manager and dbus_access_nm_applet patches:
-  - switched to group netdev
-  - updated the dep on dhcdbd
-  - removed debian/network-manager.dbus-conf debian/nm-applet.conf
+    - switched to group netdev
+    - updated the dep on dhcdbd
+    - removed debian/network-manager.dbus-conf debian/nm-applet.conf
   * removed network-manager.doc as it was empty. 
   * uploaded to unstable.
 
@@ -40,12 +48,12 @@ network-manager (0.5.1-2) unstable; urgency=low
 network-manager (0.5.1-1) experimental; urgency=low
 
   * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because
-  first we need to start NetworkManager and then NetworkManagerDispatcher 
+    first we need to start NetworkManager and then NetworkManagerDispatcher 
   * added networkmanger and networkmanaferdispatcher manpages. 
   * Inital upload to Debian (Closes: #270538)
   * work based on the ubuntu package
   * Added 01.patch and 02.patch for fix the problem with recent linux 
-  kernel-headers
+    kernel-headers
  
  -- Riccardo Setti <giskard@autistici.org>  Mon, 5 Jan 2006 17:09:29 +0100
 
diff --git a/debian/control b/debian/control
index e8603e99..97f084d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: network-manager
 Section: net
 Priority: optional
 Maintainer: Riccardo Setti <giskard@autistici.org>
+Uploaders: Michael Biebl <biebl@teco.edu>
 Build-Depends: debhelper (>= 5), 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
 Standards-Version: 3.6.2
 
 Package: network-manager
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.5.1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60)
 Suggests: openvpn, pptpd
 Description: network management framework daemon
  NetworkManager attempts to keep an active network connection available at all
@@ -23,7 +24,7 @@ Package: network-manager-gnome
 Architecture: any
 Section: gnome
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager
-Description: network management framework daemon
+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
@@ -37,7 +38,7 @@ Package: network-manager-dev
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config
-Description: network management framework daemon development
+Description: network management framework daemon (development files)
  this package provides header files that are needed to 
  compile VPN Plugins for NetworManager.
 
@@ -45,7 +46,7 @@ Package: libnm-glib0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: network management framework daemon (GLib shared library)
+Description: network management framework (GLib shared library)
  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
@@ -59,8 +60,8 @@ Description: network management framework daemon (GLib shared library)
 Package: libnm-glib-dev
 Section: libdevel
 Architecture: any
-Depends: libglib2.0-dev, libnm-glib0 (= ${Source-Version}), libdbus-glib-1-dev (>= 0.60)
-Description: network management framework daemon (GLib interface)
+Depends: libnm-glib0 (= ${Source-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
  usage on servers. The point of NetworkManager is to make networking
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index ac127e03..9460b596 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -11,10 +11,10 @@ case "$1" in
 		/etc/dbus-1/event.d/25NetworkManager restart
 	fi
 	
-	if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher"]; then
+	if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then
 		/etc/dbus-1/event.d/26NetworkManagerDispatcher restart
 	fi			 
-	 ;;
+	;;
 esac
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 4425220c..c0ba849a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,19 +8,16 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm"
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 		--with-dbus-sys=/etc/dbus-1/system.d \
-		--without-named \
 		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
 		--with-dhcdbd=/usr/sbin/dhcdbd \
 		--with-distro=debian
 	
 clean::
-	
 	rm -f po/*.gmo
 	rm -f debian/*.1
 
 
 build/network-manager::
-	
 	/usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1
 	/usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1
 	/usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1