rev 4961 - in kde-extras/kftpgrabber/trunk/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-11-21 17:23:59 +0100 (Tue, 21 Nov 2006)
New Revision: 4961

Added:
   kde-extras/kftpgrabber/trunk/debian/patches/10_kdepot.diff
Modified:
   kde-extras/kftpgrabber/trunk/debian/changelog
Log:
add kdepot patch to kftpgrabber

Modified: kde-extras/kftpgrabber/trunk/debian/changelog
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/changelog	2006-11-21 16:17:35 UTC (rev 4960)
+++ kde-extras/kftpgrabber/trunk/debian/changelog	2006-11-21 16:23:59 UTC (rev 4961)
@@ -2,8 +2,9 @@
 
   * NOT RELEASED YET
   * Add debian/rules get-orig-source target for http://buildserver.net
+  * Merge kdepot patch from kubuntu
 
- -- Mark Purcell <msp at debian.org>  Thu, 16 Nov 2006 18:33:04 +0000
+ -- Fathi Boudra <fboudra at free.fr>  Tue, 21 Nov 2006 17:23:19 +0100
 
 kftpgrabber (0.8.0~beta2-1) unstable; urgency=low
 

Added: kde-extras/kftpgrabber/trunk/debian/patches/10_kdepot.diff
===================================================================
--- kde-extras/kftpgrabber/trunk/debian/patches/10_kdepot.diff	2006-11-21 16:17:35 UTC (rev 4960)
+++ kde-extras/kftpgrabber/trunk/debian/patches/10_kdepot.diff	2006-11-21 16:23:59 UTC (rev 4961)
@@ -0,0 +1,20 @@
+diff -Nur kftpgrabber-0.8.0~beta2/admin/cvs.sh kftpgrabber-0.8.0~beta2.new/admin/cvs.sh
+--- kftpgrabber-0.8.0~beta2/admin/cvs.sh	2006-11-07 20:50:48.000000000 +0100
++++ kftpgrabber-0.8.0~beta2.new/admin/cvs.sh	2006-11-16 05:34:51.000000000 +0100
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,7 +556,6 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+    if ! test -f $kdepotpath; then
+ 	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+    fi