- Do not ship our own DBUS access files. Use the upstream version and replace

  at_console="true" with group="plugdev" (patches/dbus_access*.patch). 
  TODO: Find and use a better group for this!!!
  This makes the diff.gz smaller and better tracks upstream changes.
  Removed the install commands from debian/rules and added the *.conf files to
  the corresponding install files.
- Removed the creation of the /etc/NetworkManager/dispatcher.d directory from 
  debian/rules. This is better handled by network-manager.dirs.
- Removed useless dirs file
- Fixed some *.install files (location of binaries have changed, additional files etc.)
- Removed configure switch --without-named, seems to be unused, added configure
  switch --with-wpa_supplicant



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

10 files changed, 31 insertions, 64 deletions

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bbb..00000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install
index 9287a6f6..97a00409 100644
--- a/debian/network-manager-dev.install
+++ b/debian/network-manager-dev.install
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/NetworkManager.pc
 debian/tmp/usr/include/NetworkManager/NetworkManager.h
+debian/tmp/usr/include/NetworkManager/NetworkManagerVPN.h
 debian/tmp/usr/include/NetworkManager/nm-vpn-ui-interface.h
diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install
index c7b30983..fb749241 100644
--- a/debian/network-manager-gnome.install
+++ b/debian/network-manager-gnome.install
@@ -2,5 +2,7 @@ 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/hicolor
+debian/tmp/usr/share/icons
 debian/tmp/usr/share/gnome-vpn-properties
+debian/tmp/usr/share/autostart
+debian/tmp/etc/dbus-1/system.d/nm-applet.conf
diff --git a/debian/network-manager.dbus-conf b/debian/network-manager.dbus-conf
deleted file mode 100644
index bdf362ff..00000000
--- a/debian/network-manager.dbus-conf
+++ /dev/null
@@ -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.NetworkManager"/>
-
-                <allow send_destination="org.freedesktop.NetworkManager"/>
-                <allow send_interface="org.freedesktop.NetworkManager"/>
-        </policy>
-        <policy group="plugdev">
-                <allow own="org.freedesktop.NetworkManager"/>
-
-                <allow send_destination="org.freedesktop.NetworkManager"/>
-                <allow send_interface="org.freedesktop.NetworkManager"/>
-       </policy>
-        <policy context="default">
-                <deny own="org.freedesktop.NetworkManager"/>
-                <deny send_destination="org.freedesktop.NetworkManager"/>
-                <deny send_interface="org.freedesktop.NetworkManager"/>
-        </policy>
-
-</busconfig>
-
diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs
index 86847abc..19c18e1e 100644
--- a/debian/network-manager.dirs
+++ b/debian/network-manager.dirs
@@ -1,5 +1,4 @@
 etc/dbus-1/event.d
 etc/dbus-1/system.d
-usr/bin
-usr/share/locale
+etc/NetworkManager/dispatcher.d
 var/lib/NetworkManager
diff --git a/debian/network-manager.install b/debian/network-manager.install
index b0c7b38b..0f9b1179 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -1,2 +1,3 @@
-debian/tmp/usr/bin/NetworkManager usr/sbin/
-debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/
+debian/tmp/usr/sbin/NetworkManager 
+debian/tmp/usr/sbin/NetworkManagerDispatcher
+debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
diff --git a/debian/nm-applet.conf b/debian/nm-applet.conf
deleted file mode 100644
index 69bc7aee..00000000
--- a/debian/nm-applet.conf
+++ /dev/null
@@ -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>
-
diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch
new file mode 100644
index 00000000..c164190e
--- /dev/null
+++ b/debian/patches/dbus_access_network_manager.patch
@@ -0,0 +1,11 @@
+--- src/NetworkManager.conf.orig	2006-02-07 04:24:38.000000000 +0100
++++ src/NetworkManager.conf	2006-02-07 04:25:00.000000000 +0100
+@@ -8,7 +8,7 @@
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+                 <allow send_interface="org.freedesktop.NetworkManager"/>
+         </policy>
+-        <policy at_console="true">
++        <policy group="plugdev">
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+                 <allow send_interface="org.freedesktop.NetworkManager"/>
+         </policy>
diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch
new file mode 100644
index 00000000..0f84f7dd
--- /dev/null
+++ b/debian/patches/dbus_access_nm_applet.patch
@@ -0,0 +1,11 @@
+--- 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="plugdev">
+ 		<allow own="org.freedesktop.NetworkManagerInfo"/>
+ 
+ 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
diff --git a/debian/rules b/debian/rules
index 8c8bfe3e..3fe0113d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 		--with-dbus-sys=/etc/dbus-1/system.d \
-		--without-named \
 		--with-dhcdbd=/usr/sbin/dhcdbd \
+		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
 		--with-distro=debian
 	
 clean::
@@ -26,11 +26,3 @@ binary-install/network-manager::
 		debian/network-manager/etc/dbus-1/event.d/25NetworkManager
 	install -m 755 debian/network-manager-dispatcher.dbus-event \
 		debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher
-	install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d
-	install -m 644 debian/network-manager.dbus-conf \
-		debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf
-
-binary-install/network-manager-gnome::	
-	install -m 644 debian/nm-applet.conf \
-		debian/network-manager/etc/dbus-1/system.d/nm-applet.conf
-