rev 3131 - in kde-extras/wlassistant/trunk/debian: . patches

Achim Bohnet ach-guest at costa.debian.org
Thu Feb 16 02:10:09 UTC 2006 

Author: ach-guest
Date: 2006-02-16 02:10:07 +0000 (Thu, 16 Feb 2006)
New Revision: 3131

Added:
   kde-extras/wlassistant/trunk/debian/patches/12_do_not_use_rpath.diff
   kde-extras/wlassistant/trunk/debian/wlassistant.docs
Removed:
   kde-extras/wlassistant/trunk/debian/patches/11_add_waconfig_license_from_cvs.diff
   kde-extras/wlassistant/trunk/debian/patches/20_fix_connection_failed.patch
Modified:
   kde-extras/wlassistant/trunk/debian/TODO
   kde-extras/wlassistant/trunk/debian/changelog
   kde-extras/wlassistant/trunk/debian/control
   kde-extras/wlassistant/trunk/debian/patches/10_proper_xdg_desktop_file.diff
   kde-extras/wlassistant/trunk/debian/rules
Log:
wlassistant: prepare 0.5.5 pkg
  * upstream change from auto* to scons build system. Adapted pkging:
    o debian/rules: don't use cdbs' kde.mk, only debhelper.mk
    o debian/control build-dep: add scons, remove autotools-dev
  * removed patches/11_add_waconfig_license_from_cvs.diff and
    patches/20_fix_connection_failed.patch: included upstream
  * update patches/10_proper_xdg_desktop_file.diff
  * add patches/12_do_not_use_rpath.diff: don't use rpath with
    wlassistant

Modified: kde-extras/wlassistant/trunk/debian/TODO
===================================================================
--- kde-extras/wlassistant/trunk/debian/TODO	2006-02-15 14:35:48 UTC (rev 3130)
+++ kde-extras/wlassistant/trunk/debian/TODO	2006-02-16 02:10:07 UTC (rev 3131)
@@ -13,6 +13,26 @@
   created: 13 Aug 2005
   updated: ..., 7 Oct 2005
 
+-----------------------------------------------------------------------------------
+
+TODO 0.5.5:
+
+o check if known bugs are fixed or still there
+o copyright/license audit
+o check that dhcp handling is save on debian (see stuff written to stdout)
+o ksystraycmd. have a look at it
+	o use it in wlassistant.desktop as upstream did?
+	o use better autostart feature and only start ksystraycmd if wlan
+	  device is available
+
+-----------------------------------------------------------------------------------
+WISH LIST:
+	o use ifup/down, resolv.conf etc instead of wlassistant spec. startup
+          written setup script.  (e.g. According to manpage ifup accepts an interfaces
+          file on command line (- for stdin???)
+
+-----------------------------------------------------------------------------------
+
 KNOWN BUGS:
 
 o Bug #1323263 - Unable to reconnect after disconnection. There is a fix for
@@ -31,12 +51,12 @@
 	[13:03] <allee> Tonio_: and the test www.google.com reachable need to be
 	optional (not every home network in online all the time) :(
 
+FIX is in upstream 0.5.5 release. Need test again:
 o Bug #1366531 - connection failed when switching access point. I put "key"
   before "essid" as the submitter suggested. The change was in netparams.h. Tested
   and it works great in my network. - Stan
 
-
 KNOWN BUGS CVS:
 
-Achim: (16-Jan-2005) channel# was here always -1. Unable to connect.
+FIXED: Achim: (16-Jan-2005) channel# was here always -1. Unable to connect.
 

Modified: kde-extras/wlassistant/trunk/debian/changelog
===================================================================
--- kde-extras/wlassistant/trunk/debian/changelog	2006-02-15 14:35:48 UTC (rev 3130)
+++ kde-extras/wlassistant/trunk/debian/changelog	2006-02-16 02:10:07 UTC (rev 3131)
@@ -1,8 +1,24 @@
-wlassistant (0.5.4a-3) UNRELEASED; urgency=low
+wlassistant (0.5.5-0) UNRELEASED; urgency=low
 
-  * NOT YET RELEASED
+  * NOT RELEASED YET
 
+  * new upstream release
+
   [ Achim Bohnet ]
+  * upstream change from auto* to scons build system. Adapted pkging:
+    o debian/rules: don't use cdbs' kde.mk, only debhelper.mk
+    o debian/control build-dep: add scons, remove autotools-dev
+  * removed patches/11_add_waconfig_license_from_cvs.diff and
+    patches/20_fix_connection_failed.patch: included upstream
+  * update patches/10_proper_xdg_desktop_file.diff
+  * add patches/12_do_not_use_rpath.diff: don't use rpath with
+    wlassistant
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 16 Feb 2006 01:18:39 +0100
+
+wlassistant (0.5.4a-3) UNRELEASED; urgency=low
+
+  [ Achim Bohnet ]
   * patches/10_proper_xdg_desktop_file.diff:  wlassistant.desktop
      + add Categories and install in /usr/share/applications/kde/
      + kdesu instead of sudo:  This works without prior configuration

Modified: kde-extras/wlassistant/trunk/debian/control
===================================================================
--- kde-extras/wlassistant/trunk/debian/control	2006-02-15 14:35:48 UTC (rev 3130)
+++ kde-extras/wlassistant/trunk/debian/control	2006-02-16 02:10:07 UTC (rev 3131)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Stan Vasilyev <stan.vasilyev at csun.edu>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs, kdelibs4-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.0.0), scons, cdbs, kdelibs4-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.6.2
 
 Package: wlassistant

Modified: kde-extras/wlassistant/trunk/debian/patches/10_proper_xdg_desktop_file.diff
===================================================================
--- kde-extras/wlassistant/trunk/debian/patches/10_proper_xdg_desktop_file.diff	2006-02-15 14:35:48 UTC (rev 3130)
+++ kde-extras/wlassistant/trunk/debian/patches/10_proper_xdg_desktop_file.diff	2006-02-16 02:10:07 UTC (rev 3131)
@@ -1,17 +1,17 @@
---- src/wlassistant.desktop.orig	2005-09-02 06:13:47.000000000 +0200
-+++ src/wlassistant.desktop	2006-01-14 15:26:52.000000000 +0100
-@@ -1,9 +1,54 @@
- [Desktop Entry]
- Encoding=UTF-8
+--- src/wlassistant.desktop.orig	2006-02-13 02:21:27.000000000 +0100
++++ src/wlassistant.desktop	2006-02-16 01:49:58.000000000 +0100
+@@ -3,7 +3,54 @@
  Name=Wireless Assistant
-+Name[de]=Funknetzassistent
  Comment[pl]=Program do obsługi sieci bezprzewodowych
  Comment[es]=Aplicación para buscar redes inalámbricas
--Exec=sudo wlassistant
-+Exec=kdesu wlassistant
+-Exec=ksystraycmd sudo wlassistant
++#Exec=ksystraycmd sudo wlassistant
++Exec=ksystraycmd kdesu wlassistant
  Icon=wlassistant
  Type=Application
--
+ Categories=Qt;KDE;Network;
++
++Name[de]=Funknetzassistent
 +GenericName=Wireless LAN Manager
 +GenericName[ar]=إدارة الشبكة المحلية اللاسلكية
 +GenericName[bg]=Безжична мрежа
@@ -56,4 +56,3 @@
 +GenericName[uz]=Симсиз тармоқ бошқарувчиси
 +GenericName[xx]=xxWireless LAN Managerxx
 +GenericName[zh_CN]=无线局域网管理器
-+Categories=Qt;KDE;Network;

Deleted: kde-extras/wlassistant/trunk/debian/patches/11_add_waconfig_license_from_cvs.diff

Added: kde-extras/wlassistant/trunk/debian/patches/12_do_not_use_rpath.diff
===================================================================
--- kde-extras/wlassistant/trunk/debian/patches/12_do_not_use_rpath.diff	2006-02-15 14:35:48 UTC (rev 3130)
+++ kde-extras/wlassistant/trunk/debian/patches/12_do_not_use_rpath.diff	2006-02-16 02:10:07 UTC (rev 3131)
@@ -0,0 +1,11 @@
+--- wlassistant-0.5.5.orig/SConstruct
++++ wlassistant-0.5.5/SConstruct
+@@ -18,7 +18,7 @@
+ 
+ ## Load the builders in config
+ env = Environment(tools=['default', 'generic', 'kde', 'parser'], toolpath=['./', './bksys'])
+-env.KDEuse("environ rpath")
++env.KDEuse("environ")
+ 
+ #env['DUMPCONFIG']=1
+ 

Deleted: kde-extras/wlassistant/trunk/debian/patches/20_fix_connection_failed.patch

Modified: kde-extras/wlassistant/trunk/debian/rules
===================================================================
--- kde-extras/wlassistant/trunk/debian/rules	2006-02-15 14:35:48 UTC (rev 3130)
+++ kde-extras/wlassistant/trunk/debian/rules	2006-02-16 02:10:07 UTC (rev 3131)
@@ -1,14 +1,57 @@
 #!/usr/bin/make -f
 
+#include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/class/kde.mk
+#
+#DEB_INSTALL_MANPAGES_wlassistant = debian/wlassistant.manpage
+#
+#install/wlassistant::
+#	mv $(CURDIR)/debian/wlassistant/usr/share/applnk/Utilities/wlassistant.desktop \
+#	   $(CURDIR)/debian/wlassistant/usr/share/applications/kde/
+#	rmdir $(CURDIR)/debian/wlassistant/usr/share/applnk/Utilities
+#	rmdir $(CURDIR)/debian/wlassistant/usr/share/applnk
+#
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/kde.mk
 
-DEB_INSTALL_MANPAGES_wlassistant = debian/wlassistant.manpage
 
+DEB_SCONS_PREFIX=/usr
+
+CONFIG_STATUS=$(DEB_BUILDDIR)/config.status
+SCONS_CMD=scons
+
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: $(CONFIG_STATUS)
+$(CONFIG_STATUS):
+	$(SCONS_CMD) configure prefix=$(DEB_SCONS_PREFIX)
+	touch $(CONFIG_STATUS)
+
+common-build-arch common-build-indep:: common-build-impl
+common-build-impl::
+	$(SCONS_CMD)
+
+common-install-arch common-install-indep:: common-install-impl
+common-install-impl::
+	DESTDIR=$(DEB_DESTDIR) $(SCONS_CMD) install
+
 install/wlassistant::
 	mv $(CURDIR)/debian/wlassistant/usr/share/applnk/Utilities/wlassistant.desktop \
 	   $(CURDIR)/debian/wlassistant/usr/share/applications/kde/
 	rmdir $(CURDIR)/debian/wlassistant/usr/share/applnk/Utilities
 	rmdir $(CURDIR)/debian/wlassistant/usr/share/applnk
 
+clean::
+	$(SCONS_CMD) -c
+	rm -f $(CONFIG_STATUS)
+	rm -rf cache
+	rm -rf .sconf_temp
+	rm -rf admin
+	rm -rf build/
+	rm -f bksys/*.pyc
+	rm -f generic.cache.py kde.cache.py configure.log
+	rm -f scons/*.pyc scons/signatures.dblite
+
+DEB_INSTALL_MANPAGES_wlassistant = debian/wlassistant.manpage
+

Added: kde-extras/wlassistant/trunk/debian/wlassistant.docs
===================================================================
--- kde-extras/wlassistant/trunk/debian/wlassistant.docs	2006-02-15 14:35:48 UTC (rev 3130)
+++ kde-extras/wlassistant/trunk/debian/wlassistant.docs	2006-02-16 02:10:07 UTC (rev 3131)
@@ -0,0 +1,4 @@
+doc/AUTHORS
+doc/NEWS
+doc/README
+doc/TODO

More information about the pkg-kde-commits mailing list