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

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-09-29 17:22:55 +0000 (Fri, 29 Sep 2006)
New Revision: 1045

Removed:
   packages/unstable/knetworkmanager/debian/patches/02-dialup.patch
Modified:
   packages/unstable/knetworkmanager/debian/changelog
   packages/unstable/knetworkmanager/debian/control
Log:
Drop the support for the pppconfig utility. It can't generate proper entries for /etc/network/interfaces yet. We'll have to wait for a better, graphical config utility.


Modified: packages/unstable/knetworkmanager/debian/changelog
===================================================================
--- packages/unstable/knetworkmanager/debian/changelog	2006-09-29 17:17:06 UTC (rev 1044)
+++ packages/unstable/knetworkmanager/debian/changelog	2006-09-29 17:22:55 UTC (rev 1045)
@@ -10,8 +10,11 @@
     - Removed, fixed upstream.
   * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
     proper admin/ directory.
+  * debian/patches/02-dialup.patch
+    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
+      generate entries for /etc/network/interfaces yet. 
 
- -- Michael Biebl <biebl at teco.edu>  Thu, 28 Sep 2006 03:32:48 +0200
+ -- Michael Biebl <biebl at teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
 
 knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
 

Modified: packages/unstable/knetworkmanager/debian/control
===================================================================
--- packages/unstable/knetworkmanager/debian/control	2006-09-29 17:17:06 UTC (rev 1044)
+++ packages/unstable/knetworkmanager/debian/control	2006-09-29 17:22:55 UTC (rev 1045)
@@ -8,7 +8,7 @@
 Package: network-manager-kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.6.2)
-Recommends: kwalletmanager, pppconfig
+Recommends: kwalletmanager
 Provides: knetworkmanager
 Description: KDE systray applet for controlling NetworkManager
  systray applet for controlling network connections managed by 

Deleted: packages/unstable/knetworkmanager/debian/patches/02-dialup.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/02-dialup.patch	2006-09-29 17:17:06 UTC (rev 1044)
+++ packages/unstable/knetworkmanager/debian/patches/02-dialup.patch	2006-09-29 17:22:55 UTC (rev 1045)
@@ -1,29 +0,0 @@
---- knetworkmanager/src/knetworkmanager-tray.cpp.orig	2006-09-29 15:28:27.000000000 +0200
-+++ knetworkmanager/src/knetworkmanager-tray.cpp	2006-09-29 15:29:51.000000000 +0200
-@@ -46,6 +46,7 @@
- #include <klocale.h>
- #include <kstdguiitem.h>
- #include <khelpmenu.h>
-+#include <kmessagebox.h>
- 
- #include <kiconloader.h>
- 
-@@ -264,11 +265,13 @@
- void
- Tray::configureDialUp ()
- {
--#ifdef KNETWORKMANAGER_DIALUP_CONFIG
--	KProcess* dialupConfig = new KProcess ();
--	*dialupConfig << KNETWORKMANAGER_DIALUP_CONFIG;
--	dialupConfig->start ();
--#endif
-+	if ( QFile::exists ("/usr/sbin/pppconfig") ) {
-+		KProcess* config = new KProcess ();
-+		*config << "kdesu" << "--nonewdcop" << "x-terminal-emulator -e pppconfig";
-+		config->start ();
-+	} else {
-+		KMessageBox::error (0, "Please install the \"pppconfig\" package");
-+	}
- }
- 
- void