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

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-09-20 18:00:36 +0000 (Wed, 20 Sep 2006)
New Revision: 1030

Modified:
   packages/unstable/knetworkmanager/debian/changelog
   packages/unstable/knetworkmanager/debian/knetworkmanager.1
   packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
Log:
Update to svn revision 586773
- Updated no_network_status patch to apply cleanly.
- Fixed man page (removed section about khelpcenter help).


Modified: packages/unstable/knetworkmanager/debian/changelog
===================================================================
--- packages/unstable/knetworkmanager/debian/changelog	2006-09-20 16:01:05 UTC (rev 1029)
+++ packages/unstable/knetworkmanager/debian/changelog	2006-09-20 18:00:36 UTC (rev 1030)
@@ -1,3 +1,11 @@
+knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
+
+  * Updated to svn revision 586773.
+  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
+    page. Closes: #385642
+
+ -- Michael Biebl <biebl at teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
+
 knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
 
   * Updated to svn revision 577960.

Modified: packages/unstable/knetworkmanager/debian/knetworkmanager.1
===================================================================
--- packages/unstable/knetworkmanager/debian/knetworkmanager.1	2006-09-20 16:01:05 UTC (rev 1029)
+++ packages/unstable/knetworkmanager/debian/knetworkmanager.1	2006-09-20 18:00:36 UTC (rev 1030)
@@ -133,12 +133,7 @@
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/knetworkmanager/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/knetworkmanager/'"
-from the command-line.
-.br
+.BR networkmanager (1)
 .SH AUTHORS
 .nf
 Timo Hoenig <thoenig at suse.de>

Modified: packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch	2006-09-20 16:01:05 UTC (rev 1029)
+++ packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch	2006-09-20 18:00:36 UTC (rev 1030)
@@ -1,6 +1,6 @@
 Index: src/knetworkmanager-tray.h
 ===================================================================
---- src/knetworkmanager-tray.h	(Revision 565631)
+--- src/knetworkmanager-tray.h	(Revision 586820)
 +++ src/knetworkmanager-tray.h	(Arbeitskopie)
 @@ -58,7 +58,6 @@
  #include "knetworkmanager-devicestore.h"
@@ -10,10 +10,10 @@
  
  #define NUM_CONNECTING_STAGES 3
  #define NUM_CONNECTING_FRAMES 11
-@@ -206,9 +205,6 @@
- 	  QPixmap m_wireless50;
+@@ -208,9 +207,6 @@
  	  QPixmap m_wireless75;
  	  QPixmap m_wireless100;
+ 	  QPixmap m_background;
 -	  
 -	  // stub for kded networkstatus dcop interface
 -	  ServiceIface_stub * m_serviceStub;
@@ -22,9 +22,9 @@
  #endif /* KNETWORKMANAGER_TRAY_H */
 Index: src/knetworkmanager-tray.cpp
 ===================================================================
---- src/knetworkmanager-tray.cpp	(Revision 565631)
+--- src/knetworkmanager-tray.cpp	(Revision 586820)
 +++ src/knetworkmanager-tray.cpp	(Arbeitskopie)
-@@ -845,10 +845,8 @@
+@@ -869,10 +869,8 @@
  					pixmap = m_wireless25;
  				else
  					pixmap = m_wireless00;
@@ -35,7 +35,7 @@
  				pixmap = m_wired;
  			}
  
-@@ -860,23 +858,14 @@
+@@ -884,23 +882,14 @@
  			{
  				pixmap = pixmapForStage();
  				m_animated = true;
@@ -59,7 +59,7 @@
  			if (_ctx->getState ()->isDialupActive ())
  				pixmap = m_dialup;
  			else
-@@ -990,7 +979,7 @@
+@@ -1014,7 +1003,7 @@
  }
  
  
@@ -68,7 +68,7 @@
  {
  /*	QMovie movie = KGlobal::iconLoader()->loadMovie("nm_detect", KIcon::Panel );
  // 	movie.setSpeed( 3 );
-@@ -1062,16 +1051,6 @@
+@@ -1087,16 +1076,6 @@
  
  	connect ( &m_iconTimer, SIGNAL( timeout() ), SLOT( slotIconTimer() ) );
  	
@@ -87,11 +87,11 @@
  Tray::~Tray ()
 Index: src/Makefile.am
 ===================================================================
---- src/Makefile.am	(Revision 565631)
+--- src/Makefile.am	(Revision 586820)
 +++ 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-synchronizer.cpp 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
 +	knetworkmanager-vpn.cpp knetworkmanager-vpn_dbus.cpp