[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1802 - in tzdata/trunk/debian: . patches



Author: barbier
Date: 2006-09-19 20:49:58 +0000 (Tue, 19 Sep 2006)
New Revision: 1802

Added:
   tzdata/trunk/debian/patches/quiltrc
Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/rules
Log:
* New upstream release. 
* debian/rules: Use debian/patches/quiltrc for quilt global settings.


Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog	2006-09-07 17:27:59 UTC (rev 1801)
+++ tzdata/trunk/debian/changelog	2006-09-19 20:49:58 UTC (rev 1802)
@@ -1,3 +1,11 @@
+tzdata (2006l-1) unstable; urgency=low
+
+  [ Denis Barbier ]
+  * New upstream release. 
+  * debian/rules: Use debian/patches/quiltrc for quilt global settings.
+
+ -- Denis Barbier <barbier@debian.org>  Tue, 19 Sep 2006 22:26:27 +0200
+
 tzdata (2006k-1) unstable; urgency=low
 
   [ Aurelien Jarno ]

Added: tzdata/trunk/debian/patches/quiltrc
===================================================================
--- tzdata/trunk/debian/patches/quiltrc	                        (rev 0)
+++ tzdata/trunk/debian/patches/quiltrc	2006-09-19 20:49:58 UTC (rev 1802)
@@ -0,0 +1,2 @@
+QUILT_PATCHES="debian/patches"
+QUILT_NO_DIFF_TIMESTAMPS=0

Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules	2006-09-07 17:27:59 UTC (rev 1801)
+++ tzdata/trunk/debian/rules	2006-09-19 20:49:58 UTC (rev 1802)
@@ -21,6 +21,8 @@
              backward \
              systemv 
 
+QUILT := quilt --quiltrc debian/patches/quiltrc
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -32,11 +34,10 @@
 	done
 	
 	# Apply patches
-	ln -sf $(CURDIR)/debian/patches $(TZSOURCE)
 	@cd $(TZSOURCE); \
-	if quilt next >/dev/null 2>&1; then \
+	if $(QUILT) next >/dev/null 2>&1; then \
 	  echo -n "Applying patches..."; \
-	  if quilt push -a -v > $(CURDIR)/patch-log 2>&1; then \
+	  if $(QUILT) push -a -v > $(CURDIR)/patch-log 2>&1; then \
 	    echo "successful."; \
 	  else \
 	    echo "failed! (check $(CURDIR)/patch-log for details)"; \



Reply to: