From: martin f. krafft <madduck@debian.org>
Date: Wed, 19 Nov 2008 16:59:42 +0000 (+0100)
Subject: Provide new tg2quilt target tg-cleanexport to recreate debian/patches.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=76821ee6e206d8ec4ce5a4f899b4b864ea32a2d2;ds=sidebyside

Provide new tg2quilt target tg-cleanexport to recreate debian/patches.
---

diff --git a/debian/HOWTO-tg2quilt b/debian/HOWTO-tg2quilt
index 3defa51..629a565 100644
--- a/debian/HOWTO-tg2quilt
+++ b/debian/HOWTO-tg2quilt
@@ -93,7 +93,7 @@ directory. This can conveniently become the branch from which you build:
 
 1. git checkout build
 2. git merge master
-3. ./debian/rules tg-export
+3. ./debian/rules tg-cleanexport
 4. git add debian/patches
 5. git commit -m'preparing $VERSION'
 6. build, test, upload, tag ('debian/topgit-$VERSION')
diff --git a/debian/changelog b/debian/changelog
index 5d0d954..8ffd0a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+topgit (0.5-2) unstable; urgency=low
+
+  * Provide new tg2quilt target tg-cleanexport, which recreates debian/patches
+    in one step.
+
+ -- martin f. krafft <madduck@debian.org>  Wed, 19 Nov 2008 17:58:45 +0100
+
 topgit (0.5-1) unstable; urgency=low
 
   * New upstream release (closes: #500273, #505266).
diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk
index 32e80e8..5a041b9 100644
--- a/debian/tg2quilt.mk
+++ b/debian/tg2quilt.mk
@@ -34,6 +34,9 @@
 #                  removed. This means that edits to the series file are
 #                  likely to vanish.
 #
+#  tg-cleanexport: recreates the debian/patches directory from scratch, using
+#                  tg-rmdir and tg-export.
+#
 #   tg-forceclean: cleans the source tree, just like the debian/rules clean
 #                  target, and forcefully removes the debian/patches
 #                  directory in doing so. Yes, *force*-fully. WHAM!
@@ -55,7 +58,7 @@
 ifeq ($(shell tg summary -t),)
   # This is not a TopGit branch, so just blubber a bit.
 
-  tg-export tg-clean tg-forceclean tg-rmdir:
+  tg-export tg-clean tg-forceclean tg-rmdir tg-cleanexport:
 	@echo "E: The $@ target only works from a TopGit repository." >&2
 else
 
@@ -126,6 +129,9 @@ tg-clean: clean
 tg-forceclean: clean
 	test -d $(PATCHES_DIR) && rm -r $(PATCHES_DIR) || :
 
+tg-cleanexport: tg-rmdir
+	$(MAKE) --no-print-directory -f debian/rules tg-export
+
 endif
 
 .PHONY: tg-clean tg-export tg-forceclean tg-rmdir