[Pkg-utopia-commits] r2899 - in /packages/unstable/network-manager-applet/debian: changelog patches/01-dbus_access_nm_applet.patch patches/04-autostart.patch patches/05-fix_bashisms.patch patches/06-po_fr.patch patches/07-po_pl.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Feb 24 22:25:04 UTC 2009 

Author: biebl
Date: Tue Feb 24 22:25:04 2009
New Revision: 2899

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2899
Log:
* Merge experimental branch into unstable. Remaining changes:
  - Update 01-dbus_access_nm_applet.patch, changes have been merged upstream
    and we only keep the "netdev" group related diff.
  - Update 04-autostart.patch, do not start nm-applet in KDE.
  - Remove 05-fix_bashisms.patch, obsolete.
  - Remove 06-po_fr.patch, obsolete.
  - Remove 07-po_pl.patch, merged upstream.

Removed:
    packages/unstable/network-manager-applet/debian/patches/05-fix_bashisms.patch
    packages/unstable/network-manager-applet/debian/patches/06-po_fr.patch
    packages/unstable/network-manager-applet/debian/patches/07-po_pl.patch
Modified:
    packages/unstable/network-manager-applet/debian/changelog
    packages/unstable/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch
    packages/unstable/network-manager-applet/debian/patches/04-autostart.patch
    packages/unstable/network-manager-applet/debian/patches/series

Modified: packages/unstable/network-manager-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/changelog?rev=2899&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/changelog (original)
+++ packages/unstable/network-manager-applet/debian/changelog Tue Feb 24 22:25:04 2009
@@ -1,7 +1,13 @@
 network-manager-applet (0.7.0.97-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Merge experimental branch into unstable.
+  * Merge experimental branch into unstable. Remaining changes:
+    - Update 01-dbus_access_nm_applet.patch, changes have been merged upstream
+      and we only keep the "netdev" group related diff.
+    - Update 04-autostart.patch, do not start nm-applet in KDE.
+    - Remove 05-fix_bashisms.patch, obsolete.
+    - Remove 06-po_fr.patch, obsolete.
+    - Remove 07-po_pl.patch, merged upstream.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 22 Feb 2009 02:03:21 +0100
 

Modified: packages/unstable/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch?rev=2899&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch (original)
+++ packages/unstable/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch Tue Feb 24 22:25:04 2009
@@ -1,45 +1,20 @@
-Index: network-manager-applet-0.7.0/nm-applet.conf
+Index: network-manager-applet-0.7.0.97/nm-applet.conf
 ===================================================================
---- network-manager-applet-0.7.0.orig/nm-applet.conf	2007-12-12 11:17:44.000000000 +0100
-+++ network-manager-applet-0.7.0/nm-applet.conf	2009-02-06 00:23:03.000000000 +0100
-@@ -6,27 +6,30 @@
- 		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+--- network-manager-applet-0.7.0.97.orig/nm-applet.conf	2009-02-05 21:06:32.000000000 +0100
++++ network-manager-applet-0.7.0.97/nm-applet.conf	2009-02-22 02:09:38.000000000 +0100
+@@ -16,6 +16,15 @@
+                 <deny send_destination="org.freedesktop.NetworkManagerUserSettings"
+                       send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
+         </policy>
++        <policy group="netdev">
++                <allow own="org.freedesktop.NetworkManagerUserSettings"/>
++
++                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
++
++                <!-- Only root can get secrets -->
++                <deny send_destination="org.freedesktop.NetworkManagerUserSettings"
++                      send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
++        </policy>
+         <policy context="default">
+                 <deny send_destination="org.freedesktop.NetworkManagerUserSettings"/>
  
- 		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
--		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
--
--		<!-- Only root can get secrets -->
--		<allow send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
- 	</policy>
- 	<policy at_console="true">
- 		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
- 
- 		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
--		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
- 
- 		<!-- Only root can get secrets -->
--		<deny send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
-+		<deny send_destination="org.freedesktop.NetworkManagerUserSettings"
-+		      send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
- 	</policy>
--	<policy context="default">
--		<deny own="org.freedesktop.NetworkManagerUserSettings"/>
-+	<policy group="netdev">
-+		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
- 
- 		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
--		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
-+
- 		<!-- Only root can get secrets -->
--		<deny send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
-+		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-+		       send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
-+	</policy>
-+	<policy context="default">
-+		<deny send_destination="org.freedesktop.NetworkManagerUserSettings"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-+		       send_interface="org.freedesktop.DBus.Introspectable"/>
- 	</policy>
- 
- 	<limit name="max_replies_per_connection">512</limit>

Modified: packages/unstable/network-manager-applet/debian/patches/04-autostart.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/patches/04-autostart.patch?rev=2899&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/patches/04-autostart.patch (original)
+++ packages/unstable/network-manager-applet/debian/patches/04-autostart.patch Tue Feb 24 22:25:04 2009
@@ -1,12 +1,11 @@
-Index: network-manager-applet-0.6.6/nm-applet.desktop
+Index: network-manager-applet-0.7.0.97/nm-applet.desktop.in
 ===================================================================
---- network-manager-applet-0.6.6.orig/nm-applet.desktop	2008-11-28 12:54:30.000000000 +0100
-+++ network-manager-applet-0.6.6/nm-applet.desktop	2008-11-28 12:55:00.000000000 +0100
-@@ -7,7 +7,7 @@
+--- network-manager-applet-0.7.0.97.orig/nm-applet.desktop.in	2009-02-22 02:19:09.000000000 +0100
++++ network-manager-applet-0.7.0.97/nm-applet.desktop.in	2009-02-22 02:19:13.000000000 +0100
+@@ -5,6 +5,7 @@
+ Exec=nm-applet --sm-disable
  Terminal=false
  Type=Application
- Categories=
--OnlyShowIn=GNOME;
 +NotShowIn=KDE;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=NetworkManager

Modified: packages/unstable/network-manager-applet/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/patches/series?rev=2899&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/patches/series (original)
+++ packages/unstable/network-manager-applet/debian/patches/series Tue Feb 24 22:25:04 2009
@@ -1,1 +1,2 @@
 01-dbus_access_nm_applet.patch
+04-autostart.patch

More information about the Pkg-utopia-commits mailing list