[Pkg-utopia-commits] r1044 - in
packages/unstable/knetworkmanager/debian: . patches
Michael Biebl
mbiebl-guest at costa.debian.org
Fri Sep 29 17:17:06 UTC 2006
Author: mbiebl-guest
Date: 2006-09-29 17:17:06 +0000 (Fri, 29 Sep 2006)
New Revision: 1044
Removed:
packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
packages/unstable/knetworkmanager/debian/patches/03-configure.patch
Modified:
packages/unstable/knetworkmanager/debian/changelog
packages/unstable/knetworkmanager/debian/control
packages/unstable/knetworkmanager/debian/patches/02-dialup.patch
packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch
packages/unstable/knetworkmanager/debian/rules
packages/unstable/knetworkmanager/debian/watch
Log:
* Update to 0.1 release. Use an epoch to fix my broken versioning scheme.
* Drop 03-configure.patch and 01-no_network_status.patch. Both issues are fixed upstream now.
* Update watch file.
* Remove build-dep on kapptemplate. The upstream tarball now ships a usable admin/ directory.
Modified: packages/unstable/knetworkmanager/debian/changelog
===================================================================
--- packages/unstable/knetworkmanager/debian/changelog 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/changelog 2006-09-29 17:17:06 UTC (rev 1044)
@@ -1,3 +1,18 @@
+knetworkmanager (1:0.1-1) unstable; urgency=low
+
+ * Finally the 0.1 release. Woohoo!
+ - Use an epoch to fix the versioning scheme I managed to mess up.
+ - Fixes a crash when removing network objects for a non existent network
+ interface. Closes: #390052
+ * debian/patches/01-no_network_status.patch
+ - Removed, fixed upstream.
+ * debian/patches/03-configure.patch
+ - Removed, fixed upstream.
+ * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
+ proper admin/ directory.
+
+ -- Michael Biebl <biebl at teco.edu> Thu, 28 Sep 2006 03:32:48 +0200
+
knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
* Updated to svn revision 586773.
Modified: packages/unstable/knetworkmanager/debian/control
===================================================================
--- packages/unstable/knetworkmanager/debian/control 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/control 2006-09-29 17:17:06 UTC (rev 1044)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Michael Biebl <biebl at teco.edu>
-Build-Depends: cdbs, debhelper (>= 5.0.0), 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
+Build-Depends: cdbs, debhelper (>= 5.0.0), 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.7.2
Package: network-manager-kde
Deleted: packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/patches/01-no_network_status.patch 2006-09-29 17:17:06 UTC (rev 1044)
@@ -1,110 +0,0 @@
-Index: src/knetworkmanager-tray.h
-===================================================================
---- src/knetworkmanager-tray.h (Revision 586820)
-+++ 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
-@@ -208,9 +207,6 @@
- QPixmap m_wireless75;
- QPixmap m_wireless100;
- QPixmap m_background;
--
-- // stub for kded networkstatus dcop interface
-- ServiceIface_stub * m_serviceStub;
- };
-
- #endif /* KNETWORKMANAGER_TRAY_H */
-Index: src/knetworkmanager-tray.cpp
-===================================================================
---- src/knetworkmanager-tray.cpp (Revision 586820)
-+++ src/knetworkmanager-tray.cpp (Arbeitskopie)
-@@ -869,10 +869,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;
- }
-
-@@ -884,23 +882,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 );
- if (_ctx->getState ()->isDialupActive ())
- pixmap = m_dialup;
- else
-@@ -1014,7 +1003,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 );
-@@ -1087,16 +1076,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 ()
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am (Revision 586820)
-+++ src/Makefile.am (Arbeitskopie)
-@@ -36,16 +36,14 @@
- 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
-
--serviceiface_DIR = /opt/kde3/include
-
--
- 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
Modified: packages/unstable/knetworkmanager/debian/patches/02-dialup.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/02-dialup.patch 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/patches/02-dialup.patch 2006-09-29 17:17:06 UTC (rev 1044)
@@ -1,8 +1,6 @@
-Index: src/knetworkmanager-tray.cpp
-===================================================================
---- src/knetworkmanager-tray.cpp (Revision 565631)
-+++ src/knetworkmanager-tray.cpp (Arbeitskopie)
-@@ -45,6 +45,7 @@
+--- knetworkmanager/src/knetworkmanager-tray.cpp.orig 2006-09-29 15:28:27.000000000 +0200
++++ knetworkmanager/src/knetworkmanager-tray.cpp 2006-09-29 15:29:51.000000000 +0200
+@@ -46,6 +46,7 @@
#include <klocale.h>
#include <kstdguiitem.h>
#include <khelpmenu.h>
@@ -10,15 +8,15 @@
#include <kiconloader.h>
-@@ -235,11 +236,13 @@
+@@ -264,11 +265,13 @@
void
Tray::configureDialUp ()
{
-- KProcess* yast2 = new KProcess ();
--
-- *yast2 << "kdesu" << "--nonewdcop" << "/sbin/yast2" << "modem";
--
-- yast2->start ();
+-#ifdef KNETWORKMANAGER_DIALUP_CONFIG
+- KProcess* dialupConfig = new KProcess ();
+- *dialupConfig << KNETWORKMANAGER_DIALUP_CONFIG;
+- dialupConfig->start ();
+-#endif
+ if ( QFile::exists ("/usr/sbin/pppconfig") ) {
+ KProcess* config = new KProcess ();
+ *config << "kdesu" << "--nonewdcop" << "x-terminal-emulator -e pppconfig";
Deleted: packages/unstable/knetworkmanager/debian/patches/03-configure.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/03-configure.patch 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/patches/03-configure.patch 2006-09-29 17:17:06 UTC (rev 1044)
@@ -1,36 +0,0 @@
-Index: configure.in.in
-===================================================================
---- configure.in.in (Revision 543869)
-+++ configure.in.in (Arbeitskopie)
-@@ -1,5 +1,7 @@
--dnl AM_INIT_AUTOMAKE(knetworkmanager, 0.1, thoenig at suse.de)
-+#MIN_CONFIG(3.2.0)
-
-+AM_INIT_AUTOMAKE(knetworkmanager, 0.1, thoenig at suse.de)
-+
- AC_C_BIGENDIAN
- AC_CHECK_KDEMAXPATHLEN
-
-@@ -11,9 +13,7 @@
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
- pkg_modules="dbus-1 >= 0.33, hal, libnm-util"
-- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules], [], [
-- DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
-- ])
-+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-
- AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [D-BUS system.d directory]))
- if ! test -z "$with_dbus_sys" ; then
-@@ -36,10 +36,7 @@
- CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-- AC_CHECK_HEADER([dbus/connection.h],,[
-- AC_MSG_WARN([You need D-BUS/Qt3 bindings])
-- DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
-- ])
-+ AC_CHECK_HEADER([dbus/connection.h],,[AC_MSG_ERROR([You need D-BUS/Qt3 bindings])])
- CPPFLAGS=$safe_CPPFLAGS
- AC_LANG_RESTORE
-
Modified: packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch 2006-09-29 17:17:06 UTC (rev 1044)
@@ -1,7 +1,7 @@
-Index: knetworkmanager.conf
+Index: knetworkmanager/knetworkmanager.conf
===================================================================
---- knetworkmanager.conf (Revision 565631)
-+++ knetworkmanager.conf (Arbeitskopie)
+--- knetworkmanager/knetworkmanager.conf (Revision 565631)
++++ knetworkmanager/knetworkmanager.conf (Arbeitskopie)
@@ -8,7 +8,7 @@
<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
<allow send_interface="org.freedesktop.NetworkManagerInfo"/>
Modified: packages/unstable/knetworkmanager/debian/rules
===================================================================
--- packages/unstable/knetworkmanager/debian/rules 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/rules 2006-09-29 17:17:06 UTC (rev 1044)
@@ -11,9 +11,10 @@
# 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
-
- make -f admin/Makefile.common
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
install/network-manager-kde::
@@ -31,6 +32,7 @@
rm -f configure.in
rm -f configure.files
rm -f subdirs
- rm -rf admin
+ rm -f admin/ltmain.sh
+ rm -f admin/libtool.m4.in
rm -f debian/stamp-bootstrap
Modified: packages/unstable/knetworkmanager/debian/watch
===================================================================
--- packages/unstable/knetworkmanager/debian/watch 2006-09-29 11:40:35 UTC (rev 1043)
+++ packages/unstable/knetworkmanager/debian/watch 2006-09-29 17:17:06 UTC (rev 1044)
@@ -1,4 +1,2 @@
version=3
-opts="uversionmangle=s/^/0.09+/" \
-http://ftp.opensuse.org/pub/opensuse/distribution/SL-OSS-factory/inst-source/suse/src/NetworkManager-kde-(.*)-[\d]*.src.rpm
-
+http://nouse.net/projects/KNetworkManager/0.1/knetworkmanager-(.*).tar.gz
More information about the Pkg-utopia-commits
mailing list