From f3a1d93e05aa808118adf13ee9c6861f26eddd81 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= Date: Thu, 30 Apr 2009 17:34:49 -0400 Subject: [PATCH] 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 --- debian/changelog | 5 +++++ debian/tg2quilt.mk | 3 +++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 127b604..a6dac49 100644 --- 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 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 4ec27e2..c1cc95a 100644 --- 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 -- 2.30.2