[Pkg-utopia-commits] r223 - packages/networkmanager/trunk/debian

[Thom May]

Author: thom
Date: 2005-06-14 13:58:54 +0000 (Tue, 14 Jun 2005)
New Revision: 223

Added:
   packages/networkmanager/trunk/debian/libnm-glib-0-dev.install
   packages/networkmanager/trunk/debian/libnm-glib-0.install
   packages/networkmanager/trunk/debian/nm-applet.conf
Removed:
   packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf
   packages/networkmanager/trunk/debian/network-manager-gnome.dirs
   packages/networkmanager/trunk/debian/network-manager-gnome.install
Modified:
   packages/networkmanager/trunk/debian/changelog
   packages/networkmanager/trunk/debian/control
   packages/networkmanager/trunk/debian/network-manager.install
   packages/networkmanager/trunk/debian/rules
Log:
reorganise packages somewhat.
remove network-manager-gnome
add libnm-glib-0 and libnm-glib-0-dev


Modified: packages/networkmanager/trunk/debian/changelog
===================================================================
--- packages/networkmanager/trunk/debian/changelog	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/changelog	2005-06-14 13:58:54 UTC (rev 223)
@@ -1,3 +1,11 @@
+network-manager (0.4.1+cvs20050614-1) unstable; urgency=low
+
+  * New upstream release. Move to 0.4 branch; use dhcdbd.
+  * Drop network-manager-gnome
+  * add libnm-glib-0 and libnm-glib-0-dev
+
+ -- Thom May <thom@debian.org>  Tue, 14 Jun 2005 12:41:29 +0100
+
 network-manager (0.3.1+cvs20041108-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/networkmanager/trunk/debian/control
===================================================================
--- packages/networkmanager/trunk/debian/control	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/control	2005-06-14 13:58:54 UTC (rev 223)
@@ -15,8 +15,20 @@
   * discovery of available wireless networks
   * easy switching to new wireless networks
 
-Package: network-manager-gnome
+Package: libnm-glib-0
 Architecture: any
-Depends: ${shlib:Depends}, ${misc:Depends}, network-manager
-Description: Gnome front end for NetworkManager
- Gnome information applet and helper applications for NetworkManager.
+Depends: ${shlibs:Depends}
+Description: network management framework daemon (GLib shared library)
+ NetworkManager - great networking since 2004, powered by dbus and hal
+ .
+ This package provides the shared library that applications can use to query
+ connection status via NetworkManager.
+
+Package: libnm-glib-0-dev
+Architecture: any
+Depends: libglib2.0-dev, libnm-glib-0, libdbus-glib-1-dev
+Description: network management framework daemon (GLib interface)
+ NetworkManager - great networking since 2004, powered by dbus and hal
+ .
+ This package provides the interface that applications can use to query
+ connection status via NetworkManager.

Added: packages/networkmanager/trunk/debian/libnm-glib-0-dev.install
===================================================================
--- packages/networkmanager/trunk/debian/libnm-glib-0-dev.install	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/libnm-glib-0-dev.install	2005-06-14 13:58:54 UTC (rev 223)
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/pkgconfig/libnm_glib.pc
+debian/tmp/usr/lib/libnm_glib*.a
+debian/tmp/usr/lib/libnm_glib*.la
+debian/tmp/usr/lib/libnm_glib*.so
+debian/tmp/usr/include/NetworkManager/libnm_glib.h

Added: packages/networkmanager/trunk/debian/libnm-glib-0.install
===================================================================
--- packages/networkmanager/trunk/debian/libnm-glib-0.install	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/libnm-glib-0.install	2005-06-14 13:58:54 UTC (rev 223)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libnm_glib*.so.*

Deleted: packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf
===================================================================
--- packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf	2005-06-14 13:58:54 UTC (rev 223)
@@ -1,24 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-	<policy user="root">
-		<allow own="org.freedesktop.NetworkManagerInfo"/>
-
-		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
-	</policy>
-	<policy group="plugdev">
-		<allow own="org.freedesktop.NetworkManagerInfo"/>
-
-		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
-	</policy>
-	<policy context="default">
-		<deny own="org.freedesktop.NetworkManagerInfo"/>
-
-		<deny send_destination="org.freedesktop.NetworkManagerInfo"/>
-		<deny send_interface="org.freedesktop.NetworkManagerInfo"/>
-	</policy>
-</busconfig>
-

Deleted: packages/networkmanager/trunk/debian/network-manager-gnome.dirs
===================================================================
--- packages/networkmanager/trunk/debian/network-manager-gnome.dirs	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/network-manager-gnome.dirs	2005-06-14 13:58:54 UTC (rev 223)
@@ -1,4 +0,0 @@
-etc/dbus-1/system.d/
-usr/bin
-usr/lib/network-manager-gnome/
-usr/share/NetworkManagerInfo

Deleted: packages/networkmanager/trunk/debian/network-manager-gnome.install
===================================================================
--- packages/networkmanager/trunk/debian/network-manager-gnome.install	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/network-manager-gnome.install	2005-06-14 13:58:54 UTC (rev 223)
@@ -1,6 +0,0 @@
-debian/tmp/usr/share/pixmaps/NMWirelessApplet/*
-debian/tmp/usr/share/icons/hicolor/
-debian/tmp/usr/share/NetworkManagerNotification/
-debian/tmp/usr/share/NetworkManagerInfo/glade/
-debian/tmp/usr/bin/NetworkManagerInfo
-debian/tmp/usr/bin/NetworkManagerNotification

Modified: packages/networkmanager/trunk/debian/network-manager.install
===================================================================
--- packages/networkmanager/trunk/debian/network-manager.install	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/network-manager.install	2005-06-14 13:58:54 UTC (rev 223)
@@ -1,4 +1,8 @@
 debian/tmp/usr/bin/NetworkManager usr/sbin/
 debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/
+debian/tmp/usr/bin/nm-vpn-properties
+debian/tmp/usr/bin/nm-applet
 debian/tmp/usr/share/locale/*
 debian/tmp/usr/share/NetworkManager/*
+debian/tmp/usr/share/icons/hicolor
+debian/tmp/usr/share/gnome-vpn-properties

Copied: packages/networkmanager/trunk/debian/nm-applet.conf (from rev 221, packages/networkmanager/trunk/debian/network-manager-gnome.dbus-conf)

Modified: packages/networkmanager/trunk/debian/rules
===================================================================
--- packages/networkmanager/trunk/debian/rules	2005-06-13 19:54:17 UTC (rev 222)
+++ packages/networkmanager/trunk/debian/rules	2005-06-14 13:58:54 UTC (rev 223)
@@ -59,6 +59,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+	rm -f po/*.gmo
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
@@ -86,7 +87,7 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	install -m 755 debian/network-manager.dbus-event debian/network-manager/etc/dbus-1/event.d/zz99NetworkManager
-	install -m 644 debian/network-manager-gnome.dbus-conf debian/network-manager-gnome/etc/dbus-1/system.d/NetworkManagerInfo.conf
+	install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf
 	install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf
 
 	dh_install -s