rev 4548 - in kde-extras/kwlan/trunk/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-09-21 17:10:13 +0000 (Thu, 21 Sep 2006)
New Revision: 4548

Added:
   kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff
Modified:
   kde-extras/kwlan/trunk/debian/changelog
   kde-extras/kwlan/trunk/debian/control
Log:
prepare next kwlan 0.5.4 upload

Modified: kde-extras/kwlan/trunk/debian/changelog
===================================================================
--- kde-extras/kwlan/trunk/debian/changelog	2006-09-21 16:03:35 UTC (rev 4547)
+++ kde-extras/kwlan/trunk/debian/changelog	2006-09-21 17:10:13 UTC (rev 4548)
@@ -1,3 +1,12 @@
+kwlan (0.5.4-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Added conflicts with network-manager, since wpa_supplicant fails to launch
+    when network-manager is running.
+  * add kdepot patch
+
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 21 Sep 2006 18:34:49 +0200
+
 kwlan (0.5.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #378284)

Modified: kde-extras/kwlan/trunk/debian/control
===================================================================
--- kde-extras/kwlan/trunk/debian/control	2006-09-21 16:03:35 UTC (rev 4547)
+++ kde-extras/kwlan/trunk/debian/control	2006-09-21 17:10:13 UTC (rev 4548)
@@ -9,7 +9,7 @@
 Package: kwlan
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, wpasupplicant, sudo, ppp, psmisc
-Conflicts: dhcdbd
+Conflicts: dhcdbd, network-manager
 Description: wpasupplicant frontend for KDE
  Kwlan is a wireless lan manager for KDE. It uses wpasupplicant to connect
  to wireless networks. It allows to configure different network profiles using

Added: kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff	                        (rev 0)
+++ kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff	2006-09-21 17:10:13 UTC (rev 4548)
@@ -0,0 +1,12 @@
+diff -Nur kwlan-0.5.4/admin/cvs.sh kwlan-0.5.4.new/admin/cvs.sh
+--- kwlan-0.5.4/admin/cvs.sh	2006-08-23 22:13:14.000000000 +0200
++++ kwlan-0.5.4.new/admin/cvs.sh	2006-09-21 18:57:47.000000000 +0200
+@@ -560,7 +560,7 @@
+    fi
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+-	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
++	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $kdepotpath" \
+    exit_code=$?
+    if test "$exit_code" != 0; then
+        echo "make exit code: $exit_code"