rev 4544 - in kde-extras/klibido/trunk/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-09-21 13:03:50 +0000 (Thu, 21 Sep 2006)
New Revision: 4544

Added:
   kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff
   kde-extras/klibido/trunk/debian/patches/13_kdepot.diff
Modified:
   kde-extras/klibido/trunk/debian/changelog
Log:
merge patches from ubuntu

Modified: kde-extras/klibido/trunk/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog	2006-09-20 22:30:18 UTC (rev 4543)
+++ kde-extras/klibido/trunk/debian/changelog	2006-09-21 13:03:50 UTC (rev 4544)
@@ -1,9 +1,14 @@
 klibido (0.2.5-3) UNRELEASED; urgency=low
 
+  [ Fathi Boudra ]
+  * merged patches from ubuntu:
+    * fix desktop file
+    * add kdepot
+
   [ Gonéri Le Bouder ]
   * remove myself from uploader
 
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Wed, 24 May 2006 13:32:49 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 21 Sep 2006 15:02:08 +0200
 
 klibido (0.2.5-2) unstable; urgency=low
 
@@ -14,6 +19,7 @@
 
 klibido (0.2.5-1) unstable; urgency=low
 
+  [ Fathi Boudra ]
   * New upstream release (closes: #360580)
   * Added dirs, docs, watch files
   * Converted to cdbs

Added: kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff	                        (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/12_fix_desktop_file.diff	2006-09-21 13:03:50 UTC (rev 4544)
@@ -0,0 +1,16 @@
+diff -Nur in/src/klibido.desktop in.new/src/klibido.desktop
+--- in/src/klibido.desktop	2004-09-02 01:34:50.000000000 +0200
++++ in.new/src/klibido.desktop	2006-07-12 00:44:54.000000000 +0200
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=klibido
+-Name[xx]=xxklibidoxx
++Name=Klibido
+ Exec=klibido
+ Icon=klibido
+ Type=Application
+ Comment=KDE nntp (usenet) binaries grabber
+ Categories=Qt;KDE;Network
++GenericName=Usenet Binaries Downloader
+ 

Added: kde-extras/klibido/trunk/debian/patches/13_kdepot.diff
===================================================================
--- kde-extras/klibido/trunk/debian/patches/13_kdepot.diff	                        (rev 0)
+++ kde-extras/klibido/trunk/debian/patches/13_kdepot.diff	2006-09-21 13:03:50 UTC (rev 4544)
@@ -0,0 +1,21 @@
+diff -Nur klibido-0.2.5/admin/cvs.sh klibido-0.2.5.new/admin/cvs.sh
+--- klibido-0.2.5/admin/cvs.sh	2005-03-01 01:58:57.000000000 +0100
++++ klibido-0.2.5.new/admin/cvs.sh	2006-07-17 11:46:34.000000000 +0200
+@@ -500,6 +500,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
+@@ -518,7 +520,7 @@
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if|else|endif)\s/); 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
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
+-	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
++	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $kdepotpath" \
+ 	messages 
+    exit_code=$?
+    if test "$exit_code" != 0; then