X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=debian%2Ftg2quilt.mk;h=70ad40288e163f7ff71ddbe9db02e9e4ca4de4a2;hp=5a041b9f79a8fd63d340ec7a8ecf6a2d606b01dc;hb=e076b1866e4ffb05c3c0bd9bcd52f4898941cadf;hpb=76821ee6e206d8ec4ce5a4f899b4b864ea32a2d2

diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk
index 5a041b9..70ad402 100644
--- a/debian/tg2quilt.mk
+++ b/debian/tg2quilt.mk
@@ -10,6 +10,10 @@
 #   include /usr/share/quilt/quilt.make
 #   -include /usr/share/topgit/tg2quilt.mk
 #
+# The leading dash is necessary for make not to die when the file is not
+# installed. TopGit is not a build dependency (and does not need to be), and
+# if the package is not installed, debian/rules can still be used normally.
+#
 # The snippet exports the following targets. These targets only perform the
 # describe behaviour when invoked from a TopGit repository (`tg summary -t`
 # returns a non-empty set); used outside, they simply output informational
@@ -45,7 +49,7 @@
 # that tg-export is automatically invoked before quilt gets a chance to patch
 # or unpatch the tree.
 #
-# The PATCHES_DIR variable can be set before including the file to override
+# The QUILT_PATCH_DIR variable can be set before including the file to override
 # the default debian/patches location.
 #
 # More information, particularly for people working on TopGit-using packages,
@@ -64,7 +68,15 @@ else
 
 # We are in a TopGit branch, so let the fun begin.
 
-PATCHES_DIR ?= $(QUILT_PATCH_DIR)
+ifdef PATCHES_DIR
+	DUMMY := $(warning W: The $$PATCHES_DIR variable is deprecated, please use $$QUILT_PATCH_DIR instead.)
+	DUMMY := $(warning W: Sleeping for 10 seconds so you can read this!)
+	DUMMY := $(shell sleep 10)
+	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.
@@ -83,13 +95,13 @@ tg-export: __TG_COMMA := ,
 tg-export: __TG_EMPTY :=
 tg-export: __TG_SPACE := $(__TG_EMPTY) $(__TG_EMPTY)
 
-ifeq ($(wildcard $(PATCHES_DIR)/series),)
+ifeq ($(wildcard $(QUILT_PATCH_DIR)/series),)
   # The series file does not exist, so we proceed normally
 
   # tg-export will not work if the target dir already exists, so try to remove
   # it by calling tg-rmdir
   tg-export: tg-rmdir
-	tg export -b $(subst $(__TG_SPACE),$(__TG_COMMA),$(TG_BRANCHES)) --quilt $(PATCHES_DIR)
+	tg export -b $(subst $(__TG_SPACE),$(__TG_COMMA),$(TG_BRANCHES)) --quilt $(QUILT_PATCH_DIR)
 else
   # The series file already exists, so assume there is nothing to do.
   tg-export:
@@ -98,26 +110,28 @@ else
 	@echo "I: (you can ignore this message during a \`tg-clean\` run.)" >&2
 endif
 
-ifeq ($(wildcard $(PATCHES_DIR)),)
+ifeq ($(wildcard $(QUILT_PATCH_DIR)),)
   # No patch directory, so nothing to do:
   tg-rmdir:
 	@true
 
 else
   # There is a patch directory, let's try to clean it out:
-  tg-rmdir: __TG_FILES := $(shell find $(PATCHES_DIR) -type f -a -not -path \*/series \
+  tg-rmdir: __TG_FILES := $(shell find $(QUILT_PATCH_DIR) -type f -a -not -path \*/series \
                                     | xargs grep -l '^tg:')
   tg-rmdir:
 	# remove all files whose contents matches /^tg:/
-	test -n "$(__TG_FILES)" && rm $(__TG_FILES) || :
-        # remove the series file
-	test -f $(PATCHES_DIR)/series && rm $(PATCHES_DIR)/series || :
+	rm -f $(__TG_FILES)
+	# remove the series file
+	rm -f $(QUILT_PATCH_DIR)/series
+	# remove dpkg v3 file
+	rm -f $(QUILT_PATCH_DIR)/.dpkg-source-applied
 	# try to remove directories
-	find $(PATCHES_DIR) -type d | tac | xargs rmdir 2>/dev/null || :
+	find $(QUILT_PATCH_DIR) -depth -type d -empty -execdir rmdir {} +
 	# fail if the directory could not be removed and still exists
-	@test ! -d $(PATCHES_DIR) || { \
-	  echo "E: $(PATCHES_DIR) contains non-TopGit-generated files:" >&2; \
-	  find $(PATCHES_DIR) -type f -printf 'E:   %P\n' >&2; \
+	@test ! -d $(QUILT_PATCH_DIR) || { \
+	  echo "E: $(QUILT_PATCH_DIR) contains non-TopGit-generated files:" >&2; \
+	  find $(QUILT_PATCH_DIR) -type f -printf 'E:   %P\n' >&2; \
 	  false; \
 	}
 endif
@@ -127,7 +141,7 @@ tg-clean: clean
 	$(MAKE) --no-print-directory -f debian/rules tg-rmdir
 
 tg-forceclean: clean
-	test -d $(PATCHES_DIR) && rm -r $(PATCHES_DIR) || :
+	test -d $(QUILT_PATCH_DIR) && rm -r $(QUILT_PATCH_DIR) || :
 
 tg-cleanexport: tg-rmdir
 	$(MAKE) --no-print-directory -f debian/rules tg-export