[Pkg-kde-commits] rev 1014 - branches/kde-3.4.0/cdbs people/chrsmrtn/cdbs-experimental

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-04-21 17:51:50 +0000 (Thu, 21 Apr 2005)
New Revision: 1014

Modified:
   branches/kde-3.4.0/cdbs/kde.mk
   people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk
Log:
Add -N switch to work-around case where patch applied
by the "regular" apply-patches target already (in case
the last attempt wasn't fully cleaned up).



Modified: branches/kde-3.4.0/cdbs/kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/kde.mk	2005-04-21 17:34:16 UTC (rev 1013)
+++ branches/kde-3.4.0/cdbs/kde.mk	2005-04-21 17:51:50 UTC (rev 1014)
@@ -131,7 +131,7 @@
 		cd $(CURDIR)/debian/patches ; \
 		uudecode $$i ; \
 		cd $(CURDIR) ; \
-		patch -p1 < "$${i%%.uu}" ; \
+		patch -N -p1 < "$${i%%.uu}" ; \
 		touch debian/stamp-patch-00_kdewebdev_branch_2005-04-19.diff ; \
 	done
 

Modified: people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk
===================================================================
--- people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk	2005-04-21 17:34:16 UTC (rev 1013)
+++ people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk	2005-04-21 17:51:50 UTC (rev 1014)
@@ -92,7 +92,7 @@
 		cd $(CURDIR)/debian/patches ; \
 		uudecode $$i ; \
 		cd $(CURDIR) ; \
-		patch -p1 < "$${i%%.uu}" ; \
+		patch -N -p1 < "$${i%%.uu}" ; \
 		touch debian/stamp-patch-00_kdewebdev_branch_2005-04-19.diff ; \
 	done