rev 4915 - in trunk/packages/kdesdk/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-11-16 10:35:14 +0100 (Thu, 16 Nov 2006)
New Revision: 4915

Modified:
   trunk/packages/kdesdk/debian/changelog
   trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff
Log:
Update automake 1.10 support patch as cdbs runs patch with -p1 before -p0

Modified: trunk/packages/kdesdk/debian/changelog
===================================================================
--- trunk/packages/kdesdk/debian/changelog	2006-11-16 08:51:22 UTC (rev 4914)
+++ trunk/packages/kdesdk/debian/changelog	2006-11-16 09:35:14 UTC (rev 4915)
@@ -1,3 +1,10 @@
+kdesdk (4:3.5.5-3) unstable; urgency=low
+
+  * Update automake 1.10 support patch as cdbs runs patch with -p1 before -p0
+    and patch the wrong file. (Closes: #396985)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 16 Nov 2006 10:30:05 +0100
+
 kdesdk (4:3.5.5-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:

Modified: trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff	2006-11-16 08:51:22 UTC (rev 4914)
+++ trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff	2006-11-16 09:35:14 UTC (rev 4915)
@@ -1,11 +1,12 @@
---- kapptemplate/admin/cvs.sh.orig	2006-11-11 00:53:47.000000000 +0100
-+++ kapptemplate/admin/cvs.sh	2006-11-11 00:54:50.000000000 +0100
+diff -Nur kdesdk-3.5.5/kapptemplate/admin/cvs.sh kdesdk-3.5.5.new/kapptemplate/admin/cvs.sh
+--- kdesdk-3.5.5/kapptemplate/admin/cvs.sh	2006-10-02 16:52:39.000000000 +0200
++++ kdesdk-3.5.5.new/kapptemplate/admin/cvs.sh	2006-11-16 10:24:55.000000000 +0100
 @@ -68,7 +68,7 @@
      echo "*** KDE requires automake $required_automake_version"
      exit 1
      ;;
 -  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) 
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;