Merge commit 'refs/top-bases/debian/locations' into debian/locations

* commit 'refs/top-bases/debian/locations':
  adapt debian/changelog for 0.8-1.1
  do not fail if no quilt patches to pop
  tg-cleanexport is PHONY
  check for applied patches/uncommitted changes before tg-rmdir
  also remove the dpkgv3 patch stamp file
  simplify removal of files in tg-rmdir
  change section to vcs
  debian/changelog: new upstream release fixes #516188

diff --git a/debian/changelog b/debian/changelog
index d902e9d17b80e81fd3c4c3823c80052ba7f4c273..abaf698924016c445ab22c0eabaa6205fdf794c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,40 @@
+topgit (0.8-1.1) unstable; urgency=low
+
+  [ Carsten Hey ]
+  * Non-maintainer upload with permission from the Debian TopGit maintainers.
+  * Don't call pre-commit hook if tg is not installed. (closes: #576221,
+    LP: #564616)
+
+  [ martin f. krafft ]
+  * Deal with single quotes in from/to headers (closes: #552629)
+  * Quote $LESS in case it includes spaces
+  * Simplify removal of files in tg-rmdir
+  * Also remove the dpkgv3 patch stamp file
+  * Check for applied patches/uncommitted changes before tg-rmdir
+  * tg-cleanexport is PHONY
+  * Do not fail if no quilt patches to pop
+
+  [ Michal Sojka ]
+  * Make 'tg patch' work in subdirectories
+
+  [ Thomas Schwinge ]
+  * tg-push: Filter out plain SHA1s from being pushed.
+  * tg-mail: Properly quote argument to --in-reply-to.
+  * tg-delete: Handle the case where the branch has been removed already, but
+    the base is still left.
+
+  [ Uwe Kleine-König ]
+  * change section to vcs
+  * tg mail: document config setting to prevent unintended mass mail sending
+  * tg patch: treat all files as ascii (closes: #521173)
+
+ -- Carsten Hey <carsten@debian.org>  Mon, 26 Apr 2010 10:11:16 +0200
+
 topgit (0.8-1) unstable; urgency=low
 
   [ Uwe Kleine-König ]
   * Update Debian policy version (no changes needed).
-  * New upstream release
+  * New upstream release (closes: #516188)
 
   [ martin f. krafft ]
   * Provide default values for variables used in tg2quilt.mk; thanks Frédéric

diff --git a/debian/control b/debian/control
index dc489412529aff9fd8343961ff6bf84410334cd6..fdb35fec80228a082f84a55896326f2650edbd65 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: topgit
-Section: devel
+Section: vcs
 Priority: optional
 Maintainer: Debian TopGit maintainers <pkg-topgit@teams.debian.net>
 Uploaders: martin f. krafft <madduck@debian.org>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk
index c1cc95a812ad9ad1c287ee5931dc9ffb1b9e7d3e..f83caa6701f95fb6b2a540c24e53ebb877b78a76 100644 (file)
--- a/debian/tg2quilt.mk
+++ b/debian/tg2quilt.mk
@@ -31,7 +31,9 @@
 #                  target, and invokes tg-rmdir
 #
 #        tg-rmdir: tries to remove debian/patches, but only if there are no
-#                  non-TopGit files under the directory.
+#                  non-TopGit files under the directory, the repository has
+#                  no uncommitted changes, and there are not quilt patches
+#                  applied.
 #                    The heuristic is to find files that do not contain a line
 #                  matchines /^tg:/, minus the series file. If any such files
 #                  are found, an error occurs. Otherwise, the directory is
@@ -120,10 +122,23 @@ else
   tg-rmdir: __TG_FILES := $(shell find $(QUILT_PATCH_DIR) -type f -a -not -path \*/series \
                                     | xargs grep -l '^tg:')
   tg-rmdir:
+       QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a 2>/dev/null || :
+       @if quilt applied >/dev/null 2>&1; then \
+         echo "E: there are applied quilt patches." >&2; \
+         echo "E: please unapply (pop) all patches and try again." >&2; \
+         false; \
+       fi
+       @if git status -am. >/dev/null; then \
+         echo "E: there are uncommitted changes in the working directory." >&2; \
+         echo "E: please commit or revert all changes." >&2; \
+         false; \
+       fi
        # remove all files whose contents matches /^tg:/
-       test -n "$(__TG_FILES)" && rm $(__TG_FILES) || :
-        # remove the series file
-       test -f $(QUILT_PATCH_DIR)/series && rm $(QUILT_PATCH_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 $(QUILT_PATCH_DIR) -depth -type d -empty -execdir rmdir {} +
        # fail if the directory could not be removed and still exists
@@ -146,7 +161,7 @@ tg-cleanexport: tg-rmdir
 
 endif
 
-.PHONY: tg-clean tg-export tg-forceclean tg-rmdir
+.PHONY: tg-clean tg-export tg-forceclean tg-rmdir tg-cleanexport
 
 # vim:ft=make:ts=8:noet
 # -*- Makefile -*-, you silly Emacs! (shamelessly stolen from quilt)