[Pkg-utopia-commits] r2879 - in /packages/unstable/network-manager-applet: ./ debian/ debian/patches/

Sun Feb 22 01:02:26 UTC 2009

Author: biebl
Date: Sun Feb 22 01:02:26 2009
New Revision: 2879

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2879
Log:
Merged revisions 2307,2319,2324,2326,2337,2416-2417,2425,2430,2461-2463,2465,2509,2511,2516,2654-2658,2767,2788-2790 via svnmerge from 
svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/network-manager-applet

........
  r2307 | sjoerd | 2008-06-18 16:13:15 +0200 (Mi, 18 Jun 2008) | 1 line
  
  Merge mbiebls nm applet 0.7 snapshot
........
  r2319 | biebl | 2008-06-18 23:53:16 +0200 (Mi, 18 Jun 2008) | 3 lines
  
  Update to r759
  nm-vpn-properties has been removed, so we no longer need the man page.
........
  r2324 | biebl | 2008-06-19 01:37:26 +0200 (Do, 19 Jun 2008) | 3 lines
  
  libnm-glib-vpn has been split into a separate package, so add a 
  Build-Dep on libnm-glib-vpn-dev (>= 0.7).
........
  r2326 | biebl | 2008-06-19 17:57:53 +0200 (Do, 19 Jun 2008) | 7 lines
  
  - Drop Build-Depends on libgnome2-dev and libgnomeui-dev, they are no longer
    required.
  - Bump Build-Depends:
    + libdbus-glib1-dev to (>= 0.72)
    + libgtk2.0-dev to (>= 2.10)
    + libnotify-dev to (>= 0.4.3)
........
  r2337 | biebl | 2008-06-24 20:48:29 +0200 (Di, 24 Jun 2008) | 1 line
  
  debian/copyright: Revised for the latest changes.
........
  r2416 | biebl | 2008-08-22 22:34:57 +0200 (Fr, 22 Aug 2008) | 2 lines
  
  Set libexecdir to /usr/lib/NetworkManager, so we can find the VPN plugins.
........
  r2417 | biebl | 2008-08-22 22:43:14 +0200 (Fr, 22 Aug 2008) | 1 line
  
  Upgrade to r863
........
  r2425 | smcv | 2008-09-30 19:18:32 +0200 (Di, 30 Sep 2008) | 1 line
  
  Update to a newer svn snapshot. Tarball at http://alioth.debian.org/~smcv/network-manager-applet_0.7.0~svn876.orig.tar.gz
........
  r2430 | sjoerd | 2008-10-03 00:56:04 +0200 (Fr, 03 Okt 2008) | 1 line
  
  New svn snapshot
........
  r2461 | sjoerd | 2008-10-18 21:39:16 +0200 (Sa, 18 Okt 2008) | 1 line
  
  new svn snapshot
........
  r2462 | sjoerd | 2008-10-18 22:21:37 +0200 (Sa, 18 Okt 2008) | 3 lines
  
  * debian/patches/02-nm-api-udate.patch
    - Added. cope with a small NM 0.7 api change
  * debian/control: Build-Depend on nm-glib dev packages with new api
........
  r2463 | sjoerd | 2008-10-18 22:22:41 +0200 (Sa, 18 Okt 2008) | 1 line
  
  fix typo in build-depends
........
  r2465 | sjoerd | 2008-10-18 22:40:25 +0200 (Sa, 18 Okt 2008) | 1 line
  
  Target experimental
........
  r2509 | sjoerd | 2008-11-29 23:04:37 +0100 (Sa, 29 Nov 2008) | 1 line
  
  start preparing network-manager-applet 0.7
........
  r2511 | sjoerd | 2008-11-29 23:18:21 +0100 (Sa, 29 Nov 2008) | 2 lines
  
  * debian/patches/02-nm-api-update.patch:
    - Removed. Fixed upstream
........
  r2516 | sjoerd | 2008-12-01 13:44:41 +0100 (Mo, 01 Dez 2008) | 1 line
  
  debian/control: Tighten build-depends on nm related libraries
........
  r2654 | biebl | 2008-12-16 06:20:04 +0100 (Di, 16 Dez 2008) | 4 lines
  
  Improve the 0.7.0~svn953-1 changelog
  
  Document all changes that were done between 0.6.6-2 and 0.7.0~svn953-1
........
  r2655 | biebl | 2008-12-16 06:22:13 +0100 (Di, 16 Dez 2008) | 3 lines
  
  * debian/copyright
    - More updates to the copyright file. The polkit-helper bits are licensed
      under the LGPL.
........
  r2656 | biebl | 2008-12-16 06:27:48 +0100 (Di, 16 Dez 2008) | 2 lines
  
  * debian/control
    - Add network-manager-pptp-gnome to Suggests.
........
  r2657 | biebl | 2008-12-16 06:45:26 +0100 (Di, 16 Dez 2008) | 2 lines
  
  Add list of bugs that are closed by this update.
........
  r2658 | biebl | 2008-12-16 06:50:22 +0100 (Di, 16 Dez 2008) | 1 line
  
  Upload to experimental
........
  r2767 | biebl | 2009-02-06 00:29:19 +0100 (Fr, 06 Feb 2009) | 5 lines
  
  * debian/patches/01-dbus_access_nm_applet.patch
    - Remove bare send_interface directives to avoid non-deterministic allow
      messages with no interface. (Closes: #510728)
    - Do not allow unpriviledged processes to ask for a users' connections.
    - Allow introspection by default.
........
  r2788 | biebl | 2009-02-14 16:08:09 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  * debian/control
    - Wrap build dependencies.
........
  r2789 | biebl | 2009-02-14 16:09:36 +0100 (Sa, 14 Feb 2009) | 1 line
  
  Bump to debhelper v7 compat mode
........
  r2790 | biebl | 2009-02-14 16:16:48 +0100 (Sa, 14 Feb 2009) | 1 line
  
  Upload to experimental
........

Added:
    packages/unstable/network-manager-applet/debian/patches/series
      - copied unchanged from r2790, packages/experimental/network-manager-applet/debian/patches/series
Removed:
    packages/unstable/network-manager-applet/debian/patches/02-hal_deprecated_keys.patch
    packages/unstable/network-manager-applet/debian/patches/03-nm_editor_category.patch
Modified:
    packages/unstable/network-manager-applet/   (props changed)
    packages/unstable/network-manager-applet/debian/changelog
    packages/unstable/network-manager-applet/debian/compat
    packages/unstable/network-manager-applet/debian/control
    packages/unstable/network-manager-applet/debian/copyright
    packages/unstable/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch
    packages/unstable/network-manager-applet/debian/rules

Propchange: packages/unstable/network-manager-applet/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Feb 22 01:02:26 2009
@@ -1,1 +1,1 @@
-/packages/experimental/network-manager-applet:1-2306
+/packages/experimental/network-manager-applet:1-2878

Modified: packages/unstable/network-manager-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/changelog?rev=2879&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/changelog (original)
+++ packages/unstable/network-manager-applet/debian/changelog Sun Feb 22 01:02:26 2009
@@ -1,3 +1,72 @@
+network-manager-applet (0.7.0-2) experimental; urgency=low
+
+  * debian/patches/01-dbus_access_nm_applet.patch
+    - Remove bare send_interface directives to avoid non-deterministic allow
+      messages with no interface. (Closes: #510728)
+    - Do not allow unpriviledged processes to ask for a users' connections.
+    - Allow introspection by default.
+  * debian/control
+    - Wrap build dependencies.
+    - Bump build dependency on debhelper to (>= 7).
+  * debian/compat
+    - Bump to debhelper v7 compat mode.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 14 Feb 2009 16:16:35 +0100
+
+network-manager-applet (0.7.0-1) experimental; urgency=low
+
+  * New upstream release.
+    - Notification popups can be disabled. (Closes: #446963)
+    - Notification applet correctly handles panel restarts. (Closes:# 458332)
+    - The nm-editor tool has been replaced by nm-connection-editor.
+      (Closes: #494148, #482107, #485651)
+    - Show the correct configuration for WPA Enterprise setups in
+      nm-connection-editor (Closes: #480039)  
+
+  [ Sjoerd Simons ]
+  * debian/patches/02-nm-api-update.patch:
+    - Removed. Fixed upstream
+  * debian/control: Tighten build-depends on nm related libraries
+
+  [ Michael Biebl ]
+  * debian/copyright
+    - More updates to the copyright file. The polkit-helper bits are licensed
+      under the LGPL.
+  * debian/control
+    - Add network-manager-pptp-gnome to Suggests.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 16 Dec 2008 06:50:06 +0100
+
+network-manager-applet (0.7.0~svn953-1) experimental; urgency=low
+
+  [ Michael Biebl ]
+  * Switch to quilt patch management system.
+  * debian/rules
+    - Set libexecdir to /usr/lib/NetworkManager, so nm-applet and
+      nm-connection-editor automatically find the VPN GUI plugins.
+  * debian/control:
+    - Bump Standards-Version to 3.8.0. No further changes.
+    - Demote Recommends on VPN plugins to Suggests.
+    - Bump Depends on network-manager to (>= 0.7).
+    - Add Build-Depends on libpolkit-gnome-dev.
+    - Add Recommends on policykit-gnome. This package is required if you want
+      to manage system connections.
+  * debian/patches/01-dbus_access_nm_applet.patch: Updated
+  * Removed obsolete patches:
+    - debian/patches/02-hal_deprecated_keys.patch
+    - debian/patches/03-nm_editor_category.patch
+  * debian/copyright: Revised for the latest changes.
+
+  [ Simon McVittie ]
+  * Newer svn snapshot
+
+  [ Sjoerd Simons ]
+  * debian/patches/02-nm-api-udate.patch
+    - Added. cope with a small NM 0.7 api change
+  * debian/control: Build-Depend on nm-glib dev packages with new api
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 18 Oct 2008 21:40:05 +0100
+
 network-manager-applet (0.6.6-4) unstable; urgency=low
 
   * debian/patches/08-manual_means_always_online.patch

Modified: packages/unstable/network-manager-applet/debian/compat
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/compat?rev=2879&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/compat (original)
+++ packages/unstable/network-manager-applet/debian/compat Sun Feb 22 01:02:26 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/unstable/network-manager-applet/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/control?rev=2879&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/control (original)
+++ packages/unstable/network-manager-applet/debian/control Sun Feb 22 01:02:26 2009
@@ -3,8 +3,26 @@
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config, intltool, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnome2-dev, libgnomeui-dev, libgnome-keyring-dev, libglade2-dev, libgtk2.0-dev, libglib2.0-dev (>= 2.10), libgconf2-dev, libnotify-dev (>= 0.3.0), libnm-util-dev (>= 0.6.6), network-manager-dev (>= 0.6.6), docbook-to-man
-Standards-Version: 3.7.3
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ autotools-dev,
+ intltool,
+ quilt,
+ libdbus-glib-1-dev (>= 0.72),
+ libiw-dev(>= 27+28pre9),
+ libgnome-keyring-dev,
+ libglade2-dev,
+ libgtk2.0-dev (>= 2.10),
+ libglib2.0-dev (>= 2.10),
+ libgconf2-dev,
+ libnotify-dev (>= 0.4.3),
+ libnm-util-dev (>= 0.7.0),
+ libnm-glib-dev (>= 0.7.0),
+ libnm-glib-vpn-dev (>= 0.7.0),
+ network-manager-dev (>= 0.7.0),
+ docbook-to-man,
+ libpolkit-gnome-dev
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/network-manager-applet
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet
 Homepage: http://www.gnome.org/projects/NetworkManager/
@@ -12,9 +30,9 @@
 Package: network-manager-gnome
 Architecture: any
 Section: gnome
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.6.5)
-Recommends: notification-daemon, libpam-keyring, network-manager-openvpn-gnome, network-manager-vpnc-gnome
-Provides: nm-applet
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7)
+Recommends: notification-daemon, libpam-keyring, policykit-gnome
+Suggests: network-manager-openvpn-gnome, network-manager-vpnc-gnome, network-manager-pptp-gnome
 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

Modified: packages/unstable/network-manager-applet/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/copyright?rev=2879&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/copyright (original)
+++ packages/unstable/network-manager-applet/debian/copyright Sun Feb 22 01:02:26 2009
@@ -6,17 +6,17 @@
 Upstream author:
     Dan Williams <dcbw at redhat.com>
 
+
+All files if not specified otherwise are licensed under the following terms:
+
 Copyright:
-    Copyright 2004-2006 Red Hat, Inc.
-    Copyright 2005-2006 Novell, Inc.
-    Copyright 2006 Thiago Jung Bauermann <thiago.bauermann at gmail.com>
-    Copyright 1999, 2000 Eazel, Inc.
-    Copyright 2002 Anders Carlsson <andersca at gnu.org>
-    Copyright 2006 Thiago Jung Bauermann <thiago.bauermann at gmail.com>
-    Copyright 2001, 2002 Free Software Foundation
+
+    Copyright (C) 2004 - 2008 Red Hat, Inc.
+    Copyright (C) 2005 - 2008 Novell, Inc.
+    Copyright (C) 2003 - 2005 Jouni Malinen <jkmaline at cc.hut.fi>
+    Copyright (C) 2001, 2002 Free Software Foundation
 
 License:
-All files if not specified otherwise are licensed under the GPL v2 or later:
 
     This package is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,7 +36,14 @@
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
 
-eggtrayicon.c, eggtrayicon.h:
+
+src/polkit-helper/*.[ch]:
+
+Copyright:
+
+    Copyright (C) 2007 David Zeuthen, <david at fubar.dk>
+
+License:
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -54,6 +61,3 @@
 
 On Debian systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-menu-items.c:
-    This also uses code from eel-vfs-extentions available under the LGPL

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=2879&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 Sun Feb 22 01:02:26 2009
@@ -1,17 +1,45 @@
-Index: nm-applet.conf
+Index: network-manager-applet-0.7.0/nm-applet.conf
 ===================================================================
---- nm-applet.conf	(Revision 52)
-+++ nm-applet.conf	(Arbeitskopie)
-@@ -14,6 +14,12 @@
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+--- 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"/>
+ 
+ 		<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.NetworkManagerInfo"/>
++		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ 
+ 		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
+-		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
 +
-+		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-+                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+ 		<!-- 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 own="org.freedesktop.NetworkManagerInfo"/>
++	<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/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet/debian/rules?rev=2879&op=diff
==============================================================================
--- packages/unstable/network-manager-applet/debian/rules (original)
+++ packages/unstable/network-manager-applet/debian/rules Sun Feb 22 01:02:26 2009
@@ -2,15 +2,18 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_INSTALL_DOCS_ALL := CONTRIBUTING
 
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
 
-build/network-manager-gnome::
-	/usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
 
 clean::
 	rm -f debian/*.1
 
+
+build/network-manager-gnome::
+	/usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1


