[Pkg-kde-commits] rev 2188 - trunk/packages/koffice/debian

[Isaac Clerencia]

Author: isaac
Date: 2005-11-11 12:04:15 +0000 (Fri, 11 Nov 2005)
New Revision: 2188

Modified:
   trunk/packages/koffice/debian/changelog
   trunk/packages/koffice/debian/rules
Log:
Update changelog
Modify debian/rules to try both -p0 and -p1 when patching


Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog	2005-11-11 11:28:54 UTC (rev 2187)
+++ trunk/packages/koffice/debian/changelog	2005-11-11 12:04:15 UTC (rev 2188)
@@ -2,12 +2,14 @@
 
   +++ Changes by Isaac Clerencia:
 
+  * Branch pull, fixes FTBFS, closes: #337478
+  * Modify debian/rules to try to patch with -p0 and -p1
   * Include libkdchart.so and libkdchart.la in kchart package,
     closes: #334363
   * Fix Krita description in debian/control
   * Update copyright (new maintainers, new Krita developer)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 Nov 2005 11:22:00 +0100
 
 koffice (1:1.4.2-2) unstable; urgency=low
 

Modified: trunk/packages/koffice/debian/rules
===================================================================
--- trunk/packages/koffice/debian/rules	2005-11-11 11:28:54 UTC (rev 2187)
+++ trunk/packages/koffice/debian/rules	2005-11-11 12:04:15 UTC (rev 2188)
@@ -69,7 +69,11 @@
 		for patch in $(CURDIR)/debian/patches/*.diff ;\
 		do \
 			echo APPLYING PATCH\: $${patch##*/};\
-			patch -p1 < $$patch ;\
+			if cat $$patch | patch -p1 --dry-run >/dev/null 2>&1; then \
+				cat $$patch | patch -p1; \
+			else \
+				cat $$patch | patch -p0; \
+			fi; \
 		done ;\
 		touch patch-stamp ;\
 	fi
@@ -114,8 +118,12 @@
 	if test -f patch-stamp; then \
 		for patch in $(CURDIR)/debian/patches/*.diff ;\
 		do \
-			echo REMOVING PATCH\: $${patch##*/};\
-			patch -p1 -R < $$patch ;\
+			echo REMOVING PATCH\: $${patch##*/}; \
+			if cat $$patch | patch -p1 -R --dry-run > /dev/null 2>&1; then \
+				cat $$patch | patch -p1 -R; \
+			else \
+				cat $$patch | patch -p0 -R; \
+			fi; \
 		done ;\
 		rm -f patch-stamp ;\
 	fi