[Pkg-utopia-commits] r787 - in packages/experimental/knetworkmanager/debian: . patches

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-04-05 12:45:49 +0000 (Wed, 05 Apr 2006)
New Revision: 787

Added:
   packages/experimental/knetworkmanager/debian/patches/01-xdg_app.patch
   packages/experimental/knetworkmanager/debian/patches/02-no_dialup.patch
Removed:
   packages/experimental/knetworkmanager/debian/patches/xdg_app.patch
Modified:
   packages/experimental/knetworkmanager/debian/control
Log:
- Add build dependency on libiw-dev
- Added no_dialup patch from ubuntu (we have no equivalent to yast for configuring a modem atm)


Modified: packages/experimental/knetworkmanager/debian/control
===================================================================
--- packages/experimental/knetworkmanager/debian/control	2006-04-05 12:24:09 UTC (rev 786)
+++ packages/experimental/knetworkmanager/debian/control	2006-04-05 12:45:49 UTC (rev 787)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Michael Biebl <biebl at teco.edu>
-Build-Depends: cdbs, debhelper (>= 5), 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-1-dev (>= 0.33)
+Build-Depends: cdbs, debhelper (>= 5), 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-1-dev (>= 0.33), libiw-dev
 Standards-Version: 3.6.2
 
 Package: network-manager-kde

Copied: packages/experimental/knetworkmanager/debian/patches/01-xdg_app.patch (from rev 706, packages/experimental/knetworkmanager/debian/patches/xdg_app.patch)

Added: packages/experimental/knetworkmanager/debian/patches/02-no_dialup.patch
===================================================================
--- packages/experimental/knetworkmanager/debian/patches/02-no_dialup.patch	2006-04-05 12:24:09 UTC (rev 786)
+++ packages/experimental/knetworkmanager/debian/patches/02-no_dialup.patch	2006-04-05 12:45:49 UTC (rev 787)
@@ -0,0 +1,61 @@
+diff -Nur knetworkmanager-0.99+0.1r5961/src/knetworkmanager-tray.cpp knetworkmanager-0.99+0.1r5961.new/src/knetworkmanager-tray.cpp
+--- knetworkmanager-0.99+0.1r5961/src/knetworkmanager-tray.cpp	2006-03-27 18:47:02.000000000 +0200
++++ knetworkmanager-0.99+0.1r5961.new/src/knetworkmanager-tray.cpp	2006-03-28 23:29:16.000000000 +0200
+@@ -556,7 +556,6 @@
+ 	State*       state      = _ctx->getState ();
+ 	VPN*         vpn        = _ctx->getVPN ();
+ 	DeviceList  deviceList = store->getDeviceList ();
+-	DialUpList  dialUpList = store->getDialUpList ();
+ 	VPNList*     vpnList    = vpn->getVPNList ();
+ 
+ 	s_status*    stat       = store->getStatus ();
+@@ -570,11 +569,9 @@
+ 	menu->clear ();
+ 	
+ 	_vpnMenu->clear ();
+-	_dialUpMenu->clear ();
+ 	_optionsMenu->clear ();
+ 	
+ 	_vpnMap.clear ();
+-	_dialUpMap.clear ();
+ 	_deviceMap.clear ();
+ 
+ 	menu->insertTitle (SmallIcon ("knetworkmanager",  QIconSet::Automatic), "KNetworkManager", -1, -1);
+@@ -652,19 +649,6 @@
+ 			contextMenu ()->insertItem (noDeviceFound);
+ 		}
+ 
+-		/* always show dialup menu */
+-		if (stat->dialUpConnections) {
+-			/* show existing dialup connections */
+-			for (DialUpList::iterator i = dialUpList.begin (); i != dialUpList.end (); ++i) {
+-				addDialUp (*i);
+-			}
+-			_dialUpMenu->insertSeparator ();
+-		}
+-		KAction* configureDialUpAction = actionCollection ()->action ("configure_dialup");
+-		configureDialUpAction->plug (_dialUpMenu);
+-		/* add menu item to fire up YaST to configure dial connections */
+-		menu->insertItem (SmallIcon ("modem",  QIconSet::Automatic), i18n ("Dial-Up Connections"), _dialUpMenu, -1);
+-
+ 		/* show entry for VPN if services are available */
+ 		if (vpn->isAvailable ()) {
+ 			bool isActive = vpn->isActive ();
+@@ -1014,7 +998,6 @@
+ 	setPixmap (loadIcon ("knm-logo"));
+ 
+ 	_vpnMenu     = new KPopupMenu (this->contextMenu (), i18n ("VPN Connections"));
+-	_dialUpMenu  = new KPopupMenu (this->contextMenu (), i18n ("Dial-Up Connections"));
+ 	_optionsMenu = new KPopupMenu (this->contextMenu (), i18n ("Options"));
+ 	_helpMenu    = new KPopupMenu (this->contextMenu (), i18n ("Help"));
+ 
+@@ -1069,9 +1052,6 @@
+ 	connect (this->_vpnMenu, SIGNAL (activated (int)),
+ 		 this,           SLOT   (vpnItemActivated (int)));
+ 	
+-	connect (this->_dialUpMenu, SIGNAL (activated (int)),
+-		 this,              SLOT   (dialUpItemActivated (int)));
+-
+ 	loadIcons();
+ 
+ 	connect ( &m_iconTimer, SIGNAL( timeout() ), SLOT( slotIconTimer() ) );

Deleted: packages/experimental/knetworkmanager/debian/patches/xdg_app.patch
===================================================================
--- packages/experimental/knetworkmanager/debian/patches/xdg_app.patch	2006-04-05 12:24:09 UTC (rev 786)
+++ packages/experimental/knetworkmanager/debian/patches/xdg_app.patch	2006-04-05 12:45:49 UTC (rev 787)
@@ -1,21 +0,0 @@
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -42,8 +42,7 @@
- knetworkmanager_la_LIBADD = -ldbus-qt-1 $(PACKAGE_LIBS) $(LIB_KDEUI) -lkwalletclient
- 
- # this is where the desktop file will go 
--shelldesktopdir = $(kde_appsdir)/Utilities
--shelldesktop_DATA = knetworkmanager.desktop
-+xdg_apps_DATA = knetworkmanager.desktop
- 
- # this is where the shell's XML-GUI resource file goes
- shellrcdir = $(kde_datadir)/knetworkmanager
---- src/knetworkmanager.desktop
-+++ src/knetworkmanager.desktop
-@@ -10,4 +10,4 @@
- X-KDE-StartupNotify=false
- X-KDE-UniqueApplet=true
- X-KDE-autostart-condition=knetworkmanagerrc:General:Autostart:true
--Categories=System;Applet;
-+Categories=Qt;KDE;Network;Applet;
-