Bug#526392: [PATCH] Provide default values for tg2quilt.mk variables

tg2quilt.mk currently requires that $(QUILT_PATCH_DIR) and
$(QUILT_STAMPFN) be set explicitly, either via quilt.make or manually.

This makes $(QUILT_PATCH_DIR) default to debian/patches, which is the
location used by most packages, now made semi-official with the 3.0
(quilt) source format.

As for $(QUILT_STAMPFN), it is set to "patch" by default, which is
probably the safest and blandest value, being the recommended target
name per Policy.

Signed-off-by: martin f. krafft <madduck@debian.org>

diff --git a/debian/changelog b/debian/changelog
index 127b604634c355fcb000ed401f324d99078f61d3..a6dac498e0afdb969b675e1897d6a151ba226394 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 topgit (0.7-2) unstable; urgency=low
 
+  [ Uwe Kleine-König ]
   * Update Debian policy version (no changes needed).
 
+  [ martin f. krafft ]
+  * Provide default values for variables used in tg2quilt.mk; thanks Frédéric
+    Brière (closes: #526392).
+
  -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de>  Mon, 16 Mar 2009 08:52:08 +0100
 
 topgit (0.7-1) unstable; urgency=low

diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk
index 4ec27e27e12028fcd1a14aba4e951b0659e5b2fb..c1cc95a812ad9ad1c287ee5931dc9ffb1b9e7d3e 100644 (file)
--- a/debian/tg2quilt.mk
+++ b/debian/tg2quilt.mk
@@ -75,6 +75,9 @@ ifdef PATCHES_DIR
        QUILT_PATCH_DIR := $(PATCHES_DIR)
 endif
 
+QUILT_PATCH_DIR ?= debian/patches
+QUILT_STAMPFN ?= patch
+
 # Hook tg-export into quilt's make(1) snippet such that it gets executed
 # before quilt patches or unpatches.
 $(QUILT_STAMPFN): tg-export