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

Michael Biebl mbiebl-guest at costa.debian.org
Tue Jul 25 21:42:51 UTC 2006 

Author: mbiebl-guest
Date: 2006-07-25 21:42:47 +0000 (Tue, 25 Jul 2006)
New Revision: 892

Removed:
   packages/unstable/knetworkmanager/debian/patches/04-gnome_keyring_daemon.patch
Modified:
   packages/unstable/knetworkmanager/debian/changelog
   packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
   packages/unstable/knetworkmanager/debian/rules
Log:
- Remove obsolete patch.
- Prepare new release.


Modified: packages/unstable/knetworkmanager/debian/changelog
===================================================================
--- packages/unstable/knetworkmanager/debian/changelog	2006-07-25 21:41:49 UTC (rev 891)
+++ packages/unstable/knetworkmanager/debian/changelog	2006-07-25 21:42:47 UTC (rev 892)
@@ -1,3 +1,16 @@
+knetworkmanager (0.09+0.1r560817-1) unstable; urgency=low
+
+  * Updated to svn revision 560817.
+  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
+  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
+    Closes: #379309, #379364
+  * Enabled dial up support. Set pppconfig as configuration utility.
+    Closes: #376071
+  * Reload D-Bus after installation. Closes: #379307
+  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
+
+ -- Michael Biebl <biebl at teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
+
 knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
 
   * Updated to svn revision 550737.

Modified: packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch	2006-07-25 21:41:49 UTC (rev 891)
+++ packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch	2006-07-25 21:42:47 UTC (rev 892)
@@ -1,7 +1,30 @@
-diff -Nur knetworkmanager-0.1~svn-r535302/src/knetworkmanager-tray.cpp knetworkmanager-0.1~svn-r535302.new/src/knetworkmanager-tray.cpp
---- knetworkmanager-0.1~svn-r535302/src/knetworkmanager-tray.cpp	2006-04-29 10:19:15.000000000 +0200
-+++ knetworkmanager-0.1~svn-r535302.new/src/knetworkmanager-tray.cpp	2006-04-29 10:21:32.000000000 +0200
-@@ -883,10 +883,8 @@
+Index: src/knetworkmanager-tray.h
+===================================================================
+--- src/knetworkmanager-tray.h	(Revision 565631)
++++ src/knetworkmanager-tray.h	(Arbeitskopie)
+@@ -58,7 +58,6 @@
+ #include "knetworkmanager-devicestore.h"
+ #include "knetworkmanager-vpn.h"
+ #include "knetworkmanager-state.h"
+-#include "serviceiface_stub.h"
+ 
+ #define NUM_CONNECTING_STAGES 3
+ #define NUM_CONNECTING_FRAMES 11
+@@ -206,9 +205,6 @@
+ 	  QPixmap m_wireless50;
+ 	  QPixmap m_wireless75;
+ 	  QPixmap m_wireless100;
+-	  
+-	  // stub for kded networkstatus dcop interface
+-	  ServiceIface_stub * m_serviceStub;
+ };
+ 
+ #endif /* KNETWORKMANAGER_TRAY_H */
+Index: src/knetworkmanager-tray.cpp
+===================================================================
+--- src/knetworkmanager-tray.cpp	(Revision 565631)
++++ src/knetworkmanager-tray.cpp	(Arbeitskopie)
+@@ -845,10 +845,8 @@
  					pixmap = m_wireless25;
  				else
  					pixmap = m_wireless00;
@@ -12,7 +35,7 @@
  				pixmap = m_wired;
  			}
  
-@@ -898,23 +896,14 @@
+@@ -860,23 +858,14 @@
  			{
  				pixmap = pixmapForStage();
  				m_animated = true;
@@ -33,10 +56,10 @@
 -				m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::NoNetworks );
 -			else
 -				m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Offline );
- 			pixmap = m_disconnected;
- 			m_animated = false;
- 			break;
-@@ -1023,7 +1012,7 @@
+ 			if (_ctx->getState ()->isDialupActive ())
+ 				pixmap = m_dialup;
+ 			else
+@@ -990,7 +979,7 @@
  }
  
  
@@ -45,7 +68,7 @@
  {
  /*	QMovie movie = KGlobal::iconLoader()->loadMovie("nm_detect", KIcon::Panel );
  // 	movie.setSpeed( 3 );
-@@ -1088,16 +1077,6 @@
+@@ -1062,16 +1051,6 @@
  
  	connect ( &m_iconTimer, SIGNAL( timeout() ), SLOT( slotIconTimer() ) );
  	
@@ -62,40 +85,20 @@
  }
  
  Tray::~Tray ()
-diff -Nur knetworkmanager-0.1~svn-r535302/src/knetworkmanager-tray.h knetworkmanager-0.1~svn-r535302.new/src/knetworkmanager-tray.h
---- knetworkmanager-0.1~svn-r535302/src/knetworkmanager-tray.h	2006-04-29 10:11:42.000000000 +0200
-+++ knetworkmanager-0.1~svn-r535302.new/src/knetworkmanager-tray.h	2006-04-29 10:20:26.000000000 +0200
-@@ -58,7 +58,6 @@
- #include "knetworkmanager-devicestore.h"
- #include "knetworkmanager-vpn.h"
- #include "knetworkmanager-state.h"
--#include "serviceiface_stub.h"
- 
- #define NUM_CONNECTING_STAGES 3
- #define NUM_CONNECTING_FRAMES 11
-@@ -206,9 +205,6 @@
- 	  QPixmap m_wireless50;
- 	  QPixmap m_wireless75;
- 	  QPixmap m_wireless100;
--	  
--	  // stub for kded networkstatus dcop interface
--	  ServiceIface_stub * m_serviceStub;
- };
- 
- #endif /* KNETWORKMANAGER_TRAY_H */
-diff -Nur knetworkmanager-0.1~svn-r535302/src/Makefile.am knetworkmanager-0.1~svn-r535302.new/src/Makefile.am
---- knetworkmanager-0.1~svn-r535302/src/Makefile.am	2006-04-29 10:11:42.000000000 +0200
-+++ knetworkmanager-0.1~svn-r535302.new/src/Makefile.am	2006-04-29 10:19:44.000000000 +0200
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am	(Revision 565631)
++++ src/Makefile.am	(Arbeitskopie)
 @@ -36,16 +36,14 @@
  	knetworkmanager-dialup.cpp settings.kcfgc knetworkmanager-encryption.cpp knetworkmanager-tray.cpp \
  	activation.ui cryptowidget.ui networkchoicewidget.ui networklabelwidget.ui \
  	knetworkmanager-ui-networklistview.cpp \
 -	knetworkmanager-vpn.cpp knetworkmanager-vpn_dbus.cpp serviceiface.stub
--
--serviceiface_DIR = /opt/kde3/include
 +	knetworkmanager-vpn.cpp knetworkmanager-vpn_dbus.cpp 
  
+-serviceiface_DIR = /opt/kde3/include
  
+-
  kde_kcfg_DATA = knetworkmanager.kcfg
  
  knetworkmanager_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) \

Deleted: packages/unstable/knetworkmanager/debian/patches/04-gnome_keyring_daemon.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/04-gnome_keyring_daemon.patch	2006-07-25 21:41:49 UTC (rev 891)
+++ packages/unstable/knetworkmanager/debian/patches/04-gnome_keyring_daemon.patch	2006-07-25 21:42:47 UTC (rev 892)
@@ -1,13 +0,0 @@
-Index: src/knetworkmanager-vpn.cpp
-===================================================================
---- src/knetworkmanager-vpn.cpp	(Revision 551355)
-+++ src/knetworkmanager-vpn.cpp	(Arbeitskopie)
-@@ -381,7 +381,7 @@
- 
- 	if (!keyringSocket) {
- 		KProcess* keyringDaemon = new KProcess ();
--		*keyringDaemon << "/opt/gnome/bin/gnome-keyring-daemon";
-+		*keyringDaemon << "/usr/bin/gnome-keyring-daemon";
- 
- 		connect (keyringDaemon, SIGNAL (receivedStdout     (KProcess*, char*, int)),
- 			 this,          SLOT   (receiveKeyringData (KProcess*, char*, int)));

Modified: packages/unstable/knetworkmanager/debian/rules
===================================================================
--- packages/unstable/knetworkmanager/debian/rules	2006-07-25 21:41:49 UTC (rev 891)
+++ packages/unstable/knetworkmanager/debian/rules	2006-07-25 21:42:47 UTC (rev 892)
@@ -11,7 +11,7 @@
 # Update libtool files and regenerate autotools files afterwards.
 # config.(guess|sub) is updated by cdbs automatically.
 debian/stamp-bootstrap:
-	cp -r /usr/share/apps/kapptemplate/admin admin
+#	cp -r /usr/share/apps/kapptemplate/admin admin
         
 	make -f admin/Makefile.common
 	touch debian/stamp-bootstrap
@@ -31,6 +31,6 @@
 	rm -f configure.in
 	rm -f configure.files
 	rm -f subdirs
-	rm -rf admin
+#	rm -rf admin
 	rm -f debian/stamp-bootstrap

More information about the Pkg-utopia-commits mailing list