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

r1904 - in glibc-package: branches/glibc-2.5/debian branches/glibc-2.5/debian/rules.d trunk/debian trunk/debian/rules.d



Author: aurel32
Date: 2007-01-09 11:10:34 +0100 (Tue, 09 Jan 2007)
New Revision: 1904

Added:
   glibc-package/branches/glibc-2.5/debian/quiltrc
   glibc-package/trunk/debian/quiltrc
Modified:
   glibc-package/branches/glibc-2.5/debian/changelog
   glibc-package/branches/glibc-2.5/debian/rules.d/quilt.mk
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules.d/quilt.mk
Log:
  * debian/quitlrc: new file.
  * debian/rules.d/quilt.mk: use debian/quitlrc instead of default ~/.quiltrc.
    Closes: #406136.



Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog	2007-01-08 23:36:18 UTC (rev 1903)
+++ glibc-package/branches/glibc-2.5/debian/changelog	2007-01-09 10:10:34 UTC (rev 1904)
@@ -265,6 +265,9 @@
     clone06 test).  Closes: #405411.
   * debian/patches/any/cvs-zdump-64-bit.diff: new patch from CVS to fix zdump
     on 64-bit architectures.  Closes: #402776.
+  * debian/quitlrc: new file.
+  * debian/rules.d/quilt.mk: use debian/quitlrc instead of default ~/.quiltrc.
+    Closes: #406136.
 
  -- Aurelien Jarno <aurel32@debian.org>  Tue,  2 Jan 2007 03:13:54 +0100
 

Added: glibc-package/branches/glibc-2.5/debian/quiltrc
===================================================================
--- glibc-package/branches/glibc-2.5/debian/quiltrc	2007-01-08 23:36:18 UTC (rev 1903)
+++ glibc-package/branches/glibc-2.5/debian/quiltrc	2007-01-09 10:10:34 UTC (rev 1904)
@@ -0,0 +1 @@
+QUILT_PATCHES="debian/patches"

Modified: glibc-package/branches/glibc-2.5/debian/rules.d/quilt.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/rules.d/quilt.mk	2007-01-08 23:36:18 UTC (rev 1903)
+++ glibc-package/branches/glibc-2.5/debian/rules.d/quilt.mk	2007-01-09 10:10:34 UTC (rev 1904)
@@ -3,12 +3,16 @@
 # -*- Makefile -*-, you silly Emacs!
 # vim: set ft=make:
 
+DEBQUILTRC = debian/quiltrc
+QUILTOPT   = --quiltrc $(DEBQUILTRC)
+QUILT     = quilt $(QUILTOPT)
+
 patch: $(stamp)patch-stamp
 $(stamp)patch-stamp: $(stamp)unpack quilt
 	@cd $(DEB_SRCDIR); \
-	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 > ${stamp}patch-log 2>&1; then \
+	  if $(QUILT) push -a -v > ${stamp}patch-log 2>&1; then \
 	    echo "successful."; \
 	    mv ${stamp}patch-log $@; \
 	  else \
@@ -42,8 +46,8 @@
 unpatch: quilt
 	@echo -n "Unapplying patches..."
 	@cd $(DEB_SRCDIR); \
-	if quilt top >/dev/null 2>&1; then \
-	  if quilt pop -a -v > $(stamp)unpatch-log 2>&1; then \
+	if $(QUILT) top >/dev/null 2>&1; then \
+	  if $(QUILT) pop -a -v > $(stamp)unpatch-log 2>&1; then \
 	    echo "successful."; \
 	  else \
 	    echo "failed! (check $(stamp)unpatch-log for details)"; \

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-01-08 23:36:18 UTC (rev 1903)
+++ glibc-package/trunk/debian/changelog	2007-01-09 10:10:34 UTC (rev 1904)
@@ -16,6 +16,9 @@
     clone06 test).  Closes: #405411.
   * debian/patches/any/cvs-zdump-64-bit.diff: new patch from CVS to fix zdump
     on 64-bit architectures.  Closes: #402776.
+  * debian/quitlrc: new file.
+  * debian/rules.d/quilt.mk: use debian/quitlrc instead of default ~/.quiltrc.
+    Closes: #406136.
 
  -- Aurelien Jarno <aurel32@debian.org>  Mon,  8 Jan 2007 22:29:37 +0100
 

Added: glibc-package/trunk/debian/quiltrc
===================================================================
--- glibc-package/trunk/debian/quiltrc	2007-01-08 23:36:18 UTC (rev 1903)
+++ glibc-package/trunk/debian/quiltrc	2007-01-09 10:10:34 UTC (rev 1904)
@@ -0,0 +1 @@
+QUILT_PATCHES="debian/patches"

Modified: glibc-package/trunk/debian/rules.d/quilt.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/quilt.mk	2007-01-08 23:36:18 UTC (rev 1903)
+++ glibc-package/trunk/debian/rules.d/quilt.mk	2007-01-09 10:10:34 UTC (rev 1904)
@@ -3,12 +3,16 @@
 # -*- Makefile -*-, you silly Emacs!
 # vim: set ft=make:
 
+DEBQUILTRC = debian/quiltrc
+QUILTOPT   = --quiltrc $(DEBQUILTRC)
+QUILT     = quilt $(QUILTOPT)
+
 patch: $(stamp)patch-stamp
 $(stamp)patch-stamp: $(stamp)unpack quilt
 	@cd $(DEB_SRCDIR); \
-	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 > ${stamp}patch-log 2>&1; then \
+	  if $(QUILT) push -a -v > ${stamp}patch-log 2>&1; then \
 	    echo "successful."; \
 	    mv ${stamp}patch-log $@; \
 	  else \
@@ -42,8 +46,8 @@
 unpatch: quilt
 	@echo -n "Unapplying patches..."
 	@cd $(DEB_SRCDIR); \
-	if quilt top >/dev/null 2>&1; then \
-	  if quilt pop -a -v > $(stamp)unpatch-log 2>&1; then \
+	if $(QUILT) top >/dev/null 2>&1; then \
+	  if $(QUILT) pop -a -v > $(stamp)unpatch-log 2>&1; then \
 	    echo "successful."; \
 	  else \
 	    echo "failed! (check $(stamp)unpatch-log for details)"; \



Reply to: