[Pkg-utopia-commits] r812 - in
packages/unstable/knetworkmanager/debian: . patches
Michael Biebl
mbiebl-guest at costa.debian.org
Fri May 5 17:08:32 UTC 2006
Author: mbiebl-guest
Date: 2006-05-05 17:08:31 +0000 (Fri, 05 May 2006)
New Revision: 812
Added:
packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
Removed:
packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch
Modified:
packages/unstable/knetworkmanager/debian/changelog
packages/unstable/knetworkmanager/debian/control
packages/unstable/knetworkmanager/debian/rules
Log:
- New svn revision
- Removed merged configure_notifications patch.
- Added patch no_network_status to remove a dependency on networkstatus from kdepim.
- Bumped Standards-Version to 3.7.2
Modified: packages/unstable/knetworkmanager/debian/changelog
===================================================================
--- packages/unstable/knetworkmanager/debian/changelog 2006-05-05 16:59:12 UTC (rev 811)
+++ packages/unstable/knetworkmanager/debian/changelog 2006-05-05 17:08:31 UTC (rev 812)
@@ -1,6 +1,18 @@
+knetworkmanager (0.09+0.1r534534-1) unstable; urgency=low
+
+ * Updated to svn revision 534534.
+ * Added 01-no_network_status.patch which removes a (build) dependency on
+ networkstatus.
+ * Removed 03-configure_notifications.patch, merged upstream.
+ * This version does not ship an admin/ directory. Added a build dependency
+ on kapptemplate and modified debian/rules to copy it from kapptemplate.
+ * Bumped Standards-Version to 3.7.2, no further changes required.
+
+ -- Michael Biebl <biebl at teco.edu> Fri, 5 May 2006 02:55:04 +0200
+
knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
- * New upstream release.
+ * Updated to svn revision 527269.
* 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
Modified: packages/unstable/knetworkmanager/debian/control
===================================================================
--- packages/unstable/knetworkmanager/debian/control 2006-05-05 16:59:12 UTC (rev 811)
+++ packages/unstable/knetworkmanager/debian/control 2006-05-05 17:08:31 UTC (rev 812)
@@ -2,8 +2,8 @@
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-qt-1-dev (>= 0.33), libiw-dev
-Standards-Version: 3.6.2
+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-qt-1-dev (>= 0.33), libiw-dev, kapptemplate
+Standards-Version: 3.7.2
Package: network-manager-kde
Architecture: any
Added: packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch 2006-05-05 16:59:12 UTC (rev 811)
+++ packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch 2006-05-05 17:08:31 UTC (rev 812)
@@ -0,0 +1,107 @@
+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 @@
+ pixmap = m_wireless25;
+ else
+ pixmap = m_wireless00;
+- m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Online );
+ }
+ else {
+- m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Online );
+ pixmap = m_wired;
+ }
+
+@@ -898,23 +896,14 @@
+ {
+ pixmap = pixmapForStage();
+ m_animated = true;
+- m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Establishing );
+ }
+ else {
+- if ( _ctx->getDeviceStore()->getDeviceList().isEmpty() )
+- m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::NoNetworks );
+- else
+- m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Offline );
+ pixmap = m_disconnected;
+ }
+ break;
+ case NM_STATE_ASLEEP:
+ case NM_STATE_DISCONNECTED:
+ default:
+- if ( _ctx->getDeviceStore()->getDeviceList().isEmpty() )
+- 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 @@
+ }
+
+
+-Tray::Tray () : KSystemTray (), m_step( 0 ), m_serviceStub( 0 )
++Tray::Tray () : KSystemTray (), m_step( 0 )
+ {
+ /* QMovie movie = KGlobal::iconLoader()->loadMovie("nm_detect", KIcon::Panel );
+ // movie.setSpeed( 3 );
+@@ -1088,16 +1077,6 @@
+
+ connect ( &m_iconTimer, SIGNAL( timeout() ), SLOT( slotIconTimer() ) );
+
+- // hack - talk to kded networkstatus on behalf of NM, as NM doesn't differentiate between
+- // NM_STATE_DISCONNECTED when normally offline and when it has no networks/devices
+- m_serviceStub = new ServiceIface_stub( "kded", "networkstatus" );
+- NetworkStatus::Properties nsp;
+- nsp.internet = true; // we are the internet, we do mount it !
+- nsp.name = KDED_NETWORK_NAME;
+- nsp.onDemandPolicy = NetworkStatus::All;
+- nsp.service = kapp->dcopClient()->appId();
+- nsp.status = NetworkStatus::NoNetworks;
+- m_serviceStub->registerNetwork( KDED_NETWORK_NAME, nsp );
+ }
+
+ 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
+@@ -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
+
+
+ kde_kcfg_DATA = knetworkmanager.kcfg
+
+ knetworkmanager_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) \
+ $(KDE_PLUGIN)
+-knetworkmanager_la_LIBADD = -lnetworkstatus -ldbus-qt-1 $(PACKAGE_LIBS) \
++knetworkmanager_la_LIBADD = -ldbus-qt-1 $(PACKAGE_LIBS) \
+ $(LIB_KDEUI) -lkwalletclient -lkdeui -lkio
+
+ # this is where the desktop file will go
Deleted: packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch 2006-05-05 16:59:12 UTC (rev 811)
+++ packages/unstable/knetworkmanager/debian/patches/03-configure_notifications.patch 2006-05-05 17:08:31 UTC (rev 812)
@@ -1,63 +0,0 @@
-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
Modified: packages/unstable/knetworkmanager/debian/rules
===================================================================
--- packages/unstable/knetworkmanager/debian/rules 2006-05-05 16:59:12 UTC (rev 811)
+++ packages/unstable/knetworkmanager/debian/rules 2006-05-05 17:08:31 UTC (rev 812)
@@ -11,8 +11,7 @@
# Update libtool files and regenerate autotools files afterwards.
# config.(guess|sub) is updated by cdbs automatically.
debian/stamp-bootstrap:
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
- cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
+ cp -r /usr/share/apps/kapptemplate/admin admin
make -f admin/Makefile.common
touch debian/stamp-bootstrap
@@ -32,7 +31,6 @@
rm -f configure.in
rm -f configure.files
rm -f subdirs
- rm -f admin/ltmain.sh
- rm -f admin/libtool.m4.in
+ rm -rf admin
rm -f debian/stamp-bootstrap
More information about the Pkg-utopia-commits
mailing list