[Pkg-utopia-commits] r559 - in
packages/experimental/networkmanager/debian: . patches
Michael Biebl
mbiebl-guest at costa.debian.org
Wed Feb 8 20:12:01 UTC 2006
Author: mbiebl-guest
Date: 2006-02-08 20:12:00 +0000 (Wed, 08 Feb 2006)
New Revision: 559
Added:
packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch
packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch
Removed:
packages/experimental/networkmanager/debian/dirs
packages/experimental/networkmanager/debian/network-manager.dbus-conf
packages/experimental/networkmanager/debian/nm-applet.conf
Modified:
packages/experimental/networkmanager/debian/network-manager-dev.install
packages/experimental/networkmanager/debian/network-manager-gnome.install
packages/experimental/networkmanager/debian/network-manager.dirs
packages/experimental/networkmanager/debian/network-manager.install
packages/experimental/networkmanager/debian/rules
Log:
- 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
Deleted: packages/experimental/networkmanager/debian/dirs
===================================================================
--- packages/experimental/networkmanager/debian/dirs 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/dirs 2006-02-08 20:12:00 UTC (rev 559)
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
Modified: packages/experimental/networkmanager/debian/network-manager-dev.install
===================================================================
--- packages/experimental/networkmanager/debian/network-manager-dev.install 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/network-manager-dev.install 2006-02-08 20:12:00 UTC (rev 559)
@@ -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
Modified: packages/experimental/networkmanager/debian/network-manager-gnome.install
===================================================================
--- packages/experimental/networkmanager/debian/network-manager-gnome.install 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/network-manager-gnome.install 2006-02-08 20:12:00 UTC (rev 559)
@@ -2,5 +2,7 @@
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
Deleted: packages/experimental/networkmanager/debian/network-manager.dbus-conf
===================================================================
--- packages/experimental/networkmanager/debian/network-manager.dbus-conf 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/network-manager.dbus-conf 2006-02-08 20:12:00 UTC (rev 559)
@@ -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>
-
Modified: packages/experimental/networkmanager/debian/network-manager.dirs
===================================================================
--- packages/experimental/networkmanager/debian/network-manager.dirs 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/network-manager.dirs 2006-02-08 20:12:00 UTC (rev 559)
@@ -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
Modified: packages/experimental/networkmanager/debian/network-manager.install
===================================================================
--- packages/experimental/networkmanager/debian/network-manager.install 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/network-manager.install 2006-02-08 20:12:00 UTC (rev 559)
@@ -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
Deleted: packages/experimental/networkmanager/debian/nm-applet.conf
===================================================================
--- packages/experimental/networkmanager/debian/nm-applet.conf 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/nm-applet.conf 2006-02-08 20:12:00 UTC (rev 559)
@@ -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>
-
Added: packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch
===================================================================
--- packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/patches/dbus_access_network_manager.patch 2006-02-08 20:12:00 UTC (rev 559)
@@ -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>
Added: packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch
===================================================================
--- packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/patches/dbus_access_nm_applet.patch 2006-02-08 20:12:00 UTC (rev 559)
@@ -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"/>
Modified: packages/experimental/networkmanager/debian/rules
===================================================================
--- packages/experimental/networkmanager/debian/rules 2006-02-08 19:54:26 UTC (rev 558)
+++ packages/experimental/networkmanager/debian/rules 2006-02-08 20:12:00 UTC (rev 559)
@@ -6,8 +6,8 @@
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 @@
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
-
More information about the Pkg-utopia-commits
mailing list