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

Michael Biebl mbiebl-guest at costa.debian.org
Thu Apr 27 06:05:18 UTC 2006 

Author: mbiebl-guest
Date: 2006-04-27 06:05:17 +0000 (Thu, 27 Apr 2006)
New Revision: 795

Added:
   packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch
Removed:
   packages/unstable/knetworkmanager/debian/patches/01-xdg_app.patch
Modified:
   packages/unstable/knetworkmanager/debian/changelog
   packages/unstable/knetworkmanager/debian/control
   packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch
Log:
- Removed xdg_app.patch, merged upstream
- Updated no_dialup.patch
- Added configure_notifications.patch. This adds a shortcut for configuring notifications.
- Added a Provides: knetworkmanager, this way the package is searchable and installable by its upstream name.


Modified: packages/unstable/knetworkmanager/debian/changelog
===================================================================
--- packages/unstable/knetworkmanager/debian/changelog	2006-04-24 13:52:06 UTC (rev 794)
+++ packages/unstable/knetworkmanager/debian/changelog	2006-04-27 06:05:17 UTC (rev 795)
@@ -1,6 +1,19 @@
+knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed 01-xdg_app.patch, merged upstream.
+  * Added 03-configure_notifications.patch, this patch modifies the context
+    menu of the systray applet to provide quick access to the notification
+    settings.
+  * Added a "Provides: knetworkmanager" to make the package installable by its
+    upstream name.
+  * Initial upload. Closes: #351069
+
+ -- Michael Biebl <biebl at teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
+
 knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
 
-  * Initial release. Closes: #351069
+  * Initial release.
 
  -- Michael Biebl <biebl at teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
 

Modified: packages/unstable/knetworkmanager/debian/control
===================================================================
--- packages/unstable/knetworkmanager/debian/control	2006-04-24 13:52:06 UTC (rev 794)
+++ packages/unstable/knetworkmanager/debian/control	2006-04-27 06:05:17 UTC (rev 795)
@@ -9,6 +9,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.6.2)
 Recommends: kwalletmanager
+Provides: knetworkmanager
 Description: KDE systray applet for controlling NetworkManager
  systray applet for controlling network connections managed by 
  NetworkManager. It is mainly written for KDE but also works for 

Deleted: packages/unstable/knetworkmanager/debian/patches/01-xdg_app.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/01-xdg_app.patch	2006-04-24 13:52:06 UTC (rev 794)
+++ packages/unstable/knetworkmanager/debian/patches/01-xdg_app.patch	2006-04-27 06:05:17 UTC (rev 795)
@@ -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;
-

Modified: packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch	2006-04-24 13:52:06 UTC (rev 794)
+++ packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch	2006-04-27 06:05:17 UTC (rev 795)
@@ -1,7 +1,8 @@
-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 @@
+Index: src/knetworkmanager-tray.cpp
+===================================================================
+--- src/knetworkmanager-tray.cpp	(Revision 528045)
++++ src/knetworkmanager-tray.cpp	(Arbeitskopie)
+@@ -567,7 +567,6 @@
  	State*       state      = _ctx->getState ();
  	VPN*         vpn        = _ctx->getVPN ();
  	DeviceList  deviceList = store->getDeviceList ();
@@ -9,7 +10,7 @@
  	VPNList*     vpnList    = vpn->getVPNList ();
  
  	s_status*    stat       = store->getStatus ();
-@@ -570,11 +569,9 @@
+@@ -581,11 +580,9 @@
  	menu->clear ();
  	
  	_vpnMenu->clear ();
@@ -21,7 +22,7 @@
  	_deviceMap.clear ();
  
  	menu->insertTitle (SmallIcon ("knetworkmanager",  QIconSet::Automatic), "KNetworkManager", -1, -1);
-@@ -652,19 +649,6 @@
+@@ -658,19 +655,6 @@
  			contextMenu ()->insertItem (noDeviceFound);
  		}
  
@@ -41,15 +42,26 @@
  		/* show entry for VPN if services are available */
  		if (vpn->isAvailable ()) {
  			bool isActive = vpn->isActive ();
-@@ -1014,7 +998,6 @@
+@@ -1020,7 +1004,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"));
+ 	_vpnMenu     = new KPopupMenu (this->contextMenu (), "vpnconnmenu" );
+-	_dialUpMenu  = new KPopupMenu (this->contextMenu (), "dialupconnmenu" );
+ 	_optionsMenu = new KPopupMenu (this->contextMenu (), "optionsmenu" );
+ 	_helpMenu    = new KPopupMenu (this->contextMenu (), "helpmenu" );
  
-@@ -1069,9 +1052,6 @@
+@@ -1041,10 +1024,6 @@
+ 			 		   SmallIcon ("connect_no",  QIconSet::Automatic), 0,
+ 					   this, SLOT (disconnectVPN ()), actionCollection (), "disconnect_vpn");
+ 
+-	configureDialUpAction = new KAction (i18n ("Configure Dial-Up Connections..."),
+-					     SmallIcon ("configure",  QIconSet::Automatic), 0,
+-					     this, SLOT (configureDialUp ()), actionCollection (), "configure_dialup");
+-
+ 	switchOnAction = new KAction (i18n ("Switch to Online Mode"),
+ 					    SmallIconSet ("ok",  QIconSet::Automatic), 0,
+ 					    this, SLOT (switchState ()), actionCollection (), "switch_on");
+@@ -1075,9 +1054,6 @@
  	connect (this->_vpnMenu, SIGNAL (activated (int)),
  		 this,           SLOT   (vpnItemActivated (int)));
  	

Added: packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch	2006-04-24 13:52:06 UTC (rev 794)
+++ packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch	2006-04-27 06:05:17 UTC (rev 795)
@@ -0,0 +1,63 @@
+Index: src/knetworkmanager-tray.h
+===================================================================
+--- src/knetworkmanager-tray.h	(Revision 531875)
++++ src/knetworkmanager-tray.h	(Arbeitskopie)
+@@ -147,6 +147,7 @@
+ 	  void configureVPN           (void);
+ 	  void disconnectVPN          (void);
+ 	  void configureDialUp        (void);
++	  void configureNotifications (void);
+ 	  void switchState            (void);
+ //	  void updateState            (void);
+ 	  void switchWirelessOn       (void);
+Index: src/knetworkmanager-tray.cpp
+===================================================================
+--- src/knetworkmanager-tray.cpp	(Revision 531875)
++++ src/knetworkmanager-tray.cpp	(Arbeitskopie)
+@@ -38,6 +38,7 @@
+ #include <kdebug.h>
+ #include <kdialogbase.h>
+ #include <knotifyclient.h>
++#include <knotifydialog.h>
+ #include <klocale.h>
+ #include <kstdguiitem.h>
+ #include <khelpmenu.h>
+@@ -227,6 +228,12 @@
+ }
+ 
+ void
++Tray::configureNotifications ()
++{
++	KNotifyDialog::configure(this);
++}
++
++void
+ Tray::switchState ()
+ {
+ 	State* state = _ctx->getState ();
+@@ -717,7 +724,11 @@
+ 		switchOnAction->plug (_optionsMenu);
+ 		switchOffAction->plug (_optionsMenu);
+ 		showNetworksDialogAction->plug (_optionsMenu);
+-
++		_optionsMenu->insertSeparator ();
++		
++		KAction *configureNotificationsAction = KStdAction::configureNotifications(this, SLOT(configureNotifications()), actionCollection());
++		configureNotificationsAction->plug(_optionsMenu);
++		
+ 		menu->insertItem (SmallIcon ("configure",  QIconSet::Automatic), i18n ("Options"), _optionsMenu, -1);
+ 	}
+ 
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am	(Revision 531875)
++++ src/Makefile.am	(Arbeitskopie)
+@@ -51,7 +51,7 @@
+ shellrcdir = $(kde_datadir)/knetworkmanager
+ shellrc_DATA = knetworkmanagerui.rc
+ 
+-EXTRA_DIST = $(shelldesktop_DATA) $(shellrc_DATA)
++EXTRA_DIST = $(shellrc_DATA)
+ 
+ mydatadir    = $(kde_datadir)/knetworkmanager
+ mydata_DATA  = eventsrc

More information about the Pkg-utopia-commits mailing list