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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Jun 22 20:25:11 UTC 2007 

Author: biebl
Date: Fri Jun 22 20:25:11 2007
New Revision: 1565

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1565
Log:
* SVN snapshot of the upcoming 0.2 release which has native VPN plugin
  support.
* debian/control
  - Add XS-Vcs-* fields.
  - Add Recommends: network-manager-vpnc, network-manager-openvpn.
* debian/rules
  - Compile with openvpn and vpnc support.
* Removed patches that were merged upstream:
  - debian/patches/05-no_deserialize.patch
  - debian/patches/06-pretty_notification.patch
  - debian/patches/07-overlay_icon_vpn.patch
  - debian/patches/08-disable_sm.patch
  - debian/patches/09-dbus_bool_t.patch
* debian/patches/02-linux_types.patch
  - Added. Needed to workaround a problem in libnl.
* debian/patches/03-awk_path.patch
  - Added. In Debian awk is installed in /usr/bin.
* debian/patches/04-dbus_access.patch
  - Do not remove the dbus at_console access check but make it an
    alternative to the Debian netdev group policy. Closes: #426467

Added:
    packages/unstable/knetworkmanager/debian/patches/02-linux_types.patch
    packages/unstable/knetworkmanager/debian/patches/03-awk_path.patch
Removed:
    packages/unstable/knetworkmanager/debian/patches/05-no_deserialize.patch
    packages/unstable/knetworkmanager/debian/patches/06-pretty_notification.patch
    packages/unstable/knetworkmanager/debian/patches/07-overlay_icon_vpn.patch
    packages/unstable/knetworkmanager/debian/patches/08-disable_sm.patch
    packages/unstable/knetworkmanager/debian/patches/09-dbus_bool_t.patch
Modified:
    packages/unstable/knetworkmanager/debian/   (props changed)
    packages/unstable/knetworkmanager/debian/changelog
    packages/unstable/knetworkmanager/debian/control
    packages/unstable/knetworkmanager/debian/knetworkmanager.lintian
    packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch
    packages/unstable/knetworkmanager/debian/rules
    packages/unstable/knetworkmanager/debian/watch

Propchange: packages/unstable/knetworkmanager/debian/
------------------------------------------------------------------------------
    svn-bp:tagsUrl = svn+ssh://svn.debian.org/svn/pkg-utopia/tags/knetworkmanager

Modified: packages/unstable/knetworkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/changelog?rev=1565&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/changelog (original)
+++ packages/unstable/knetworkmanager/debian/changelog Fri Jun 22 20:25:11 2007
@@ -1,8 +1,29 @@
-knetworkmanager (1:0.1-5) unstable; urgency=low
+knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
 
-  * Add XS-Vcs-* fields to debian/control.
+  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
+    support.
+  * debian/control
+    - Add XS-Vcs-* fields.
+    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
+  * debian/rules
+    - Compile with openvpn and vpnc support.
 
- -- Michael Biebl <biebl at debian.org>  Sat, 13 Jan 2007 17:45:06 +0100
+  * Removed patches that were merged upstream:
+    - debian/patches/05-no_deserialize.patch
+    - debian/patches/06-pretty_notification.patch
+    - debian/patches/07-overlay_icon_vpn.patch
+    - debian/patches/08-disable_sm.patch
+    - debian/patches/09-dbus_bool_t.patch
+
+  * debian/patches/02-linux_types.patch
+    - Added. Needed to workaround a problem in libnl.
+  * debian/patches/03-awk_path.patch
+    - Added. In Debian awk is installed in /usr/bin.
+  * debian/patches/04-dbus_access.patch
+    - Do not remove the dbus at_console access check but make it an
+      alternative to the Debian netdev group policy. Closes: #426467
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
 
 knetworkmanager (1:0.1-4) unstable; urgency=low
 

Modified: packages/unstable/knetworkmanager/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/control?rev=1565&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/control (original)
+++ packages/unstable/knetworkmanager/debian/control Fri Jun 22 20:25:11 2007
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), 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
+Build-Depends: cdbs, debhelper (>= 5.0.0), 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
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/knetworkmanager
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager
@@ -10,7 +10,7 @@
 Package: network-manager-kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.6.2)
-Recommends: kwalletmanager
+Recommends: kwalletmanager, network-manager-vpnc, network-manager-openvpn
 Provides: knetworkmanager
 Description: KDE systray applet for controlling NetworkManager
  systray applet for controlling network connections managed by 

Modified: packages/unstable/knetworkmanager/debian/knetworkmanager.lintian
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/knetworkmanager.lintian?rev=1565&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/knetworkmanager.lintian (original)
+++ packages/unstable/knetworkmanager/debian/knetworkmanager.lintian Fri Jun 22 20:25:11 2007
@@ -1,4 +1,5 @@
 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

Added: packages/unstable/knetworkmanager/debian/patches/02-linux_types.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/02-linux_types.patch?rev=1565&op=file
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/02-linux_types.patch (added)
+++ packages/unstable/knetworkmanager/debian/patches/02-linux_types.patch Fri Jun 22 20:25:11 2007
@@ -1,0 +1,12 @@
+diff --git a/knetworkmanager/src/knetworkmanager-devicestore.cpp b/knetworkmanager/src/knetworkmanager-devicestore.cpp
+index b83f604..5111ea6 100644
+--- a/knetworkmanager/src/knetworkmanager-devicestore.cpp
++++ b/knetworkmanager/src/knetworkmanager-devicestore.cpp
+@@ -29,6 +29,7 @@
+ 
+ extern "C"
+ {
++#include <linux/types.h>
+ #include <netlink/route/link.h>
+ }
+ 

Added: packages/unstable/knetworkmanager/debian/patches/03-awk_path.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/03-awk_path.patch?rev=1565&op=file
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/03-awk_path.patch (added)
+++ packages/unstable/knetworkmanager/debian/patches/03-awk_path.patch Fri Jun 22 20:25:11 2007
@@ -1,0 +1,13 @@
+Index: knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
+===================================================================
+--- knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp	(Revision 663194)
++++ knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp	(Arbeitskopie)
+@@ -180,7 +180,7 @@
+ 	{
+ 		KProcess* cipherHelper = new KProcess();
+ 		cipherHelper->setUseShell(true, "/bin/sh");
+-		*cipherHelper << QString::fromLatin1("%1 --show-ciphers | /bin/awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn); 
++		*cipherHelper << QString::fromLatin1("%1 --show-ciphers | /usr/bin/awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn); 
+ 		connect (cipherHelper, SIGNAL(receivedStdout(KProcess*, char*, int)), this, SLOT(receiveCipherData(KProcess*, char*, int)));
+ 		kdDebug() << "starting openvpn to get cipher modes" << endl;
+ 		if (!cipherHelper->start(KProcess::Block, KProcess::Stdout))

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=1565&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch (original)
+++ packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch Fri Jun 22 20:25:11 2007
@@ -1,13 +1,17 @@
-Index: knetworkmanager/knetworkmanager.conf
+Index: knetworkmanager.conf
 ===================================================================
---- knetworkmanager/knetworkmanager.conf	(Revision 565631)
+--- knetworkmanager/knetworkmanager.conf	(Revision 679008)
 +++ knetworkmanager/knetworkmanager.conf	(Arbeitskopie)
-@@ -8,7 +8,7 @@
+@@ -14,6 +14,12 @@
  		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
                  <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
  	</policy>
--	<policy at_console="true">
 +	<policy group="netdev">
- 		<allow own="org.freedesktop.NetworkManagerInfo"/>
++		<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"/>
  
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>

Modified: packages/unstable/knetworkmanager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/rules?rev=1565&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/rules (original)
+++ packages/unstable/knetworkmanager/debian/rules Fri Jun 22 20:25:11 2007
@@ -5,6 +5,8 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc
 
 post-patches:: debian/stamp-bootstrap
 

Modified: packages/unstable/knetworkmanager/debian/watch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/watch?rev=1565&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/watch (original)
+++ packages/unstable/knetworkmanager/debian/watch Fri Jun 22 20:25:11 2007
@@ -1,2 +1,2 @@
 version=3
-http://nouse.net/projects/KNetworkManager/0.1/knetworkmanager-(.*).tar.gz
+http://nouse.net/projects/KNetworkManager/0.1/knetworkmanager-(.*)\.tar\.gz

More information about the Pkg-utopia-commits mailing list