[Pkg-utopia-commits] r2901 - in /packages/unstable/knetworkmanager: ./ debian/ debian/patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Feb 24 22:55:01 UTC 2009 

Author: biebl
Date: Tue Feb 24 22:55:01 2009
New Revision: 2901

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2901
Log:
Merged revisions 2640-2653,2681,2728-2731,2762-2765 via svnmerge from 
svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/knetworkmanager

........
  r2640 | biebl | 2008-12-16 01:22:49 +0100 (Di, 16 Dez 2008) | 1 line
  
  SVN snapshot of the upcoming 0.7 release (for NM 0.7).
........
  r2641 | biebl | 2008-12-16 01:45:28 +0100 (Di, 16 Dez 2008) | 3 lines
  
  * debian/rules
    - Do not copy ltmain.sh and libtool.m4 anymore, as this will fail with
      libtool 2.x.
........
  r2642 | biebl | 2008-12-16 01:47:07 +0100 (Di, 16 Dez 2008) | 1 line
  
  Switch patch management system to quilt.
........
  r2643 | biebl | 2008-12-16 01:52:58 +0100 (Di, 16 Dez 2008) | 2 lines
  
  * debian/patches/04-dbus_access.patch
    - Refresh and update.
........
  r2644 | biebl | 2008-12-16 01:55:41 +0100 (Di, 16 Dez 2008) | 2 lines
  
  * debian/patches/01-vpn_plugin_include_path.patch
    - Fix the include path for the vpn plugins.
........
  r2645 | biebl | 2008-12-16 02:19:42 +0100 (Di, 16 Dez 2008) | 3 lines
  
    - Install autostart desktop file into /usr/share/autostart/.
    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
      Closes: #487303
........
  r2646 | biebl | 2008-12-16 02:26:11 +0100 (Di, 16 Dez 2008) | 3 lines
  
    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
........
  r2647 | biebl | 2008-12-16 02:28:12 +0100 (Di, 16 Dez 2008) | 1 line
  
  Bump Depends on network-manager to (>= 0.7.0).
........
  r2648 | biebl | 2008-12-16 02:30:21 +0100 (Di, 16 Dez 2008) | 2 lines
  
  Bump Standards-Version to 3.8.0. Add README.source as recommended by the
  new policy.
........
  r2649 | biebl | 2008-12-16 02:37:28 +0100 (Di, 16 Dez 2008) | 5 lines
  
  Remove --with-pptp configure flag.
  
  knm currently has no support for pptp vpn connections, so this configure flags
  is unnecessary.
........
  r2650 | biebl | 2008-12-16 03:27:47 +0100 (Di, 16 Dez 2008) | 6 lines
  
  Drop this patch again.
  
  Create the tarball from a svn co from
  svn://anonsvn.kde.org/home/kde/branches/work/knetworkmanager
  which makes this patch obsolete.
........
  r2651 | biebl | 2008-12-16 03:30:54 +0100 (Di, 16 Dez 2008) | 2 lines
  
  Refresh the patch to apply cleanly.
........
  r2652 | biebl | 2008-12-16 04:17:58 +0100 (Di, 16 Dez 2008) | 4 lines
  
  Revert r2641, instead add support for both libtool 1.x and 2.x
  
  This is, to shrink the list of dependencies considerably.
........
  r2653 | biebl | 2008-12-16 04:18:36 +0100 (Di, 16 Dez 2008) | 1 line
  
  Upload to experimental
........
  r2681 | biebl | 2008-12-18 02:14:32 +0100 (Do, 18 Dez 2008) | 2 lines
  
  * debian/rules
    - Stop moving icons around, fixed upstream.
........
  r2728 | biebl | 2009-01-11 06:00:10 +0100 (So, 11 Jan 2009) | 1 line
  
  Updated SVN snapshot (r908338).
........
  r2729 | biebl | 2009-01-11 06:36:43 +0100 (So, 11 Jan 2009) | 3 lines
  
  * debian/patches/01-configure_package_name.patch
    - Make sure we set the correct PACKAGE name when generating the build
      system so the translations are installed properly.
........
  r2730 | biebl | 2009-01-11 06:40:24 +0100 (So, 11 Jan 2009) | 2 lines
  
  * debian/network-manager-kde.lintian-overrides
    - Updated for the latest lintian changes.
........
  r2731 | biebl | 2009-01-11 06:52:32 +0100 (So, 11 Jan 2009) | 1 line
  
  Upload to experimental
........
  r2762 | biebl | 2009-02-05 05:18:49 +0100 (Do, 05 Feb 2009) | 3 lines
  
  * debian/patches/04-dbus_access.patch
    - Update D-Bus configuration file for NetworkManager 0.7 and the newer,
      stricter default policy of the D-Bus system bus. Closes: #511526
........
  r2763 | biebl | 2009-02-05 05:19:35 +0100 (Do, 05 Feb 2009) | 1 line
  
  Upload to experimental
........
  r2764 | biebl | 2009-02-05 21:49:11 +0100 (Do, 05 Feb 2009) | 2 lines
  
  Fix the D-Bus policy file. This time for real.
........
  r2765 | biebl | 2009-02-05 21:53:58 +0100 (Do, 05 Feb 2009) | 2 lines
  
  And this time even with the correct bug #, argh
........

Added:
    packages/unstable/knetworkmanager/debian/README.source
      - copied unchanged from r2765, packages/experimental/knetworkmanager/debian/README.source
    packages/unstable/knetworkmanager/debian/patches/01-configure_package_name.patch
      - copied unchanged from r2765, packages/experimental/knetworkmanager/debian/patches/01-configure_package_name.patch
    packages/unstable/knetworkmanager/debian/patches/series
      - copied unchanged from r2765, packages/experimental/knetworkmanager/debian/patches/series
Removed:
    packages/unstable/knetworkmanager/debian/patches/07-indicate_manual_config.patch
Modified:
    packages/unstable/knetworkmanager/   (props changed)
    packages/unstable/knetworkmanager/debian/changelog
    packages/unstable/knetworkmanager/debian/control
    packages/unstable/knetworkmanager/debian/network-manager-kde.lintian-overrides
    packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch
    packages/unstable/knetworkmanager/debian/rules

Propchange: packages/unstable/knetworkmanager/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 24 22:55:01 2009
@@ -1,1 +1,1 @@
-/packages/experimental/knetworkmanager:1-2639
+/packages/experimental/knetworkmanager:1-2900

Modified: packages/unstable/knetworkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/changelog?rev=2901&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/changelog (original)
+++ packages/unstable/knetworkmanager/debian/changelog Tue Feb 24 22:55:01 2009
@@ -1,3 +1,56 @@
+knetworkmanager (1:0.7~~svn908338-3) UNRELEASED; urgency=low
+
+  * Merge experimental branch into unstable. Remaining changes:
+    - Remove 07-indicate_manual_config.patch, obsolete. 
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 24 Feb 2009 23:51:03 +0100
+
+knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
+
+  * debian/patches/04-dbus_access.patch
+    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
+    - Remove bare send_interface directives to avoid non-deterministic allow
+      messages with no interface. Closes: #510757
+    - Do not allow unpriviledged processes to ask for a users' connections.
+    - Allow introspection by default.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
+
+knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
+
+  * Updated SVN snapshot (r908338).
+  * debian/rules
+    - Stop moving icons around, fixed upstream.
+  * debian/patches/01-configure_package_name.patch
+    - Make sure we set the correct PACKAGE name when generating the build
+      system so the translations are installed properly.
+  * debian/network-manager-kde.lintian-overrides
+    - Updated for the latest lintian changes.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
+
+knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
+
+  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
+  * debian/control
+    - Add Build-Depends on pkg-config.
+    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
+    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
+    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
+    - Bump Depends on network-manager to (>= 0.7.0).
+    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
+      new policy.
+  * debian/rules
+    - Install autostart desktop file into /usr/share/autostart/.
+    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
+      Closes: #487303
+    - Add support for both libtool 1.x and 2.x.
+  * Switch patch management system to quilt.
+  * debian/patches/04-dbus_access.patch
+    - Refresh and update.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
+
 knetworkmanager (1:0.2.2-2) unstable; urgency=low
 
   * debian/patches/07-indicate_manual_config.patch

Modified: packages/unstable/knetworkmanager/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/control?rev=2901&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/control (original)
+++ packages/unstable/knetworkmanager/debian/control Tue Feb 24 22:55:01 2009
@@ -2,16 +2,16 @@
 Section: kde
 Priority: optional
 Maintainer: Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), pkg-config, automake1.9, autoconf, libtool, kdelibs4-dev (>= 4:3.4.3-2), libnm-util-dev (>= 0.6.2), network-manager-dev (>= 0.6.2), libhal-dev, libdbus-qt-1-dev (>= 0.33), libiw-dev, libnl-dev (>= 1.1)
+Build-Depends: cdbs, debhelper (>= 6.0.7), pkg-config, automake, autoconf, libtool, kdelibs4-dev (>= 4:3.4.3-2), libnm-util-dev (>= 0.7.0), libnm-glib-dev (>= 0.7.0), network-manager-dev (>= 0.7.0), libhal-dev, libdbus-1-qt3-dev (>= 0.8.1), libiw-dev, libnl-dev (>= 1.1), quilt
 Build-Conflicts: autoconf2.13
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/knetworkmanager
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager
 Homepage: http://opensuse.org/Projects/KNetworkManager
 
 Package: network-manager-kde
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.6.2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
 Recommends: kwalletmanager, network-manager-vpnc, network-manager-openvpn
 Provides: knetworkmanager
 Description: KDE systray applet for controlling NetworkManager

Modified: packages/unstable/knetworkmanager/debian/network-manager-kde.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/network-manager-kde.lintian-overrides?rev=2901&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/network-manager-kde.lintian-overrides (original)
+++ packages/unstable/knetworkmanager/debian/network-manager-kde.lintian-overrides Tue Feb 24 22:55:01 2009
@@ -1,5 +1,2 @@
-network-manager-kde: no-shlibs-control-file usr/lib/libkdeinit_knetworkmanager.so
-network-manager-kde: shlib-missing-in-control-file libkdeinit_knetworkmanager.so for usr/lib/libkdeinit_knetworkmanager.so
 network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: postinst-must-call-ldconfig usr/lib/libkdeinit_knetworkmanager.so
-network-manager-kde: postrm-should-call-ldconfig usr/lib/libkdeinit_knetworkmanager.so
+network-manager-kde: shlib-without-versioned-soname usr/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so

Modified: packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch?rev=2901&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch (original)
+++ packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch Tue Feb 24 22:55:01 2009
@@ -1,17 +1,64 @@
-Index: knetworkmanager.conf
+Index: knetworkmanager-0.7~~svn908338/knetworkmanager-0.7/knetworkmanager.conf
 ===================================================================
---- knetworkmanager/knetworkmanager.conf	(Revision 679008)
-+++ knetworkmanager/knetworkmanager.conf	(Arbeitskopie)
-@@ -14,6 +14,12 @@
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+--- knetworkmanager-0.7~~svn908338.orig/knetworkmanager-0.7/knetworkmanager.conf	2007-12-12 19:31:03.000000000 +0100
++++ knetworkmanager-0.7~~svn908338/knetworkmanager-0.7/knetworkmanager.conf	2009-02-05 21:39:13.000000000 +0100
+@@ -3,42 +3,35 @@
+  "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"/>
+-
+ 		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ 
+-		<allow send_destination="org.freedesktop.NetworkManagerSettings"/>
+-		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
+-
++		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
  	</policy>
+ 	<policy at_console="true">
+-		<allow own="org.freedesktop.NetworkManagerInfo"/>
++		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ 
+-		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
+-		<allow send_interface="org.freedesktop.NetworkManagerInfo"/>
++		<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 group="netdev">
-+		<allow own="org.freedesktop.NetworkManagerInfo"/>
+ 		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ 
+-		<allow send_destination="org.freedesktop.NetworkManagerSettings"/>
+-		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
+-
++		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
+ 
++		<!-- Only root can get secrets -->
++		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
++		       send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
+ 	</policy>
+ 	<policy context="default">
+-		<deny own="org.freedesktop.NetworkManagerInfo"/>
+-
+-		<deny send_destination="org.freedesktop.NetworkManagerInfo"/>
+-		<deny send_interface="org.freedesktop.NetworkManagerInfo"/>
+-
+-		<deny own="org.freedesktop.NetworkManagerUserSettings"/>
+-
+-		<deny send_destination="org.freedesktop.NetworkManagerSettings"/>
+-		<deny send_interface="org.freedesktop.NetworkManagerSettings"/>
+-
++		<deny send_destination="org.freedesktop.NetworkManagerUserSettings"/>
+ 
++		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
++		       send_interface="org.freedesktop.DBus.Introspectable"/>
+ 	</policy>
 +
-+		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-+                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
-+	</policy>
- 	<policy context="default">
- 		<deny own="org.freedesktop.NetworkManagerInfo"/>
++	<limit name="max_replies_per_connection">512</limit>
+ </busconfig>
  

Modified: packages/unstable/knetworkmanager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/rules?rev=2901&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/rules (original)
+++ packages/unstable/knetworkmanager/debian/rules Tue Feb 24 22:55:01 2009
@@ -2,7 +2,7 @@
   
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
 
@@ -11,11 +11,19 @@
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
-		
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+		cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+		cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
+
+binary-install/network-manager-kde::
+	# Install autostart file
+	install -D -m 644 knetworkmanager-0.7/src/knetworkmanager.desktop \
+		debian/network-manager-kde/usr/share/autostart/knetworkmanager.desktop
 
 clean::
 	find . -name Makefile.in | xargs rm -f

More information about the Pkg-utopia-commits mailing list