Merge branch 'master' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into...

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 4cb6d32e6446caf0b2db31e34d8f066efcaf6b2d,be670ab293e56238cf1663a3abefa8a63557630d..f881d74a0c4ed9ba3dfdea93f12c505e9571de77
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,70 +1,78 @@@
+ dgit (0.13) unstable; urgency=low
+ 
+   * Reuse already-downloaded .orig files after checking their hashes.
+     Closes: #720526.  (This introduces a dependency on the Digest::SHA.)
+   * Do not always pointlessly fetch the .dsc twice.  (That code was
+     erroneously duplicated during editing, apparently.)
+   * Remove DGET_UNPACK from the environment in case the user has set it.
+   * Remove scary warning from Description.
+ 
+  --
+ 
+ dgit (0.12) unstable; urgency=low
+ 
+   * Cope with packages with epoch.  Closes: #720897.
+   * Improve error message for non-fast-forward push.  Closes: #720896.
+   * New --ignore-dirty option to skip noncritical check.  Closes: #720895.
+   * New --no-quilt-fixup option to suppress quilt fixup.  RTFM.
+   * Add Closes line for #720595 to changelog entry for 0.11.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 26 Aug 2013 16:50:39 +0100
+ 
+ dgit (0.11) unstable; urgency=low
+ 
+   * Location of dgit-repos is now git.debian.org:/git/dgit-repos/repos.
+     Closes: #720525.  The rename on the server side will break older
+     versions of dgit.
+   * Fix bug which would make quilt patch fixup fail if git status
+     produced "M" lines.
+   * Autogenerated quilt patch fixup patch Description contains several
+     recent git commits, rather than implying that the patch corresponds
+     exactly to the top git commit.
+   * Use "ftp.debian.org" not "http.debian.net" as the default Debian
+     archive.  (http.debian.net tends to defeat certain kinds of cacheing,
+     and can also have more skew.)
+   * dgit build uses dpkg-buildpackage; there is a dgit git-build
+     for using git-buildpackage.  Closes: #720595.
+   * Better error message for use of UNRELEASED suite.  Closes: #720523.
+   * Do not canonicalise suite more than once.  Related to: #720526.
+   * Fix a badly open-coded copy of check_not_dirty.  Closes: #720524.
+   * Fix some bugs in building (eg build-source would fail to do the quilt
+     fixup; the --clean check in build was wrong).
+   * Add missing dependency on realpath.
+   * git-build (git-buildpackage wrapper) does not bother canonicalising
+     the suite if --git-ignore-branch is used.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 25 Aug 2013 17:00:43 +0100
+ 
+ dgit (0.10) unstable; urgency=low
+ 
+   * Create .pc/applied-patches - do not empty it (!)
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 25 Aug 2013 00:51:50 +0100
+ 
+ dgit (0.9) unstable; urgency=low
+ 
+   * New cleaning arrangements.
+   * More comprehensive workaround for `3.0 (quilt)'.
+   * In push, double-check the .changes against the changelog.
+   * Better error when source package contains .git.  Closes: #720555.
+   * Change our .dsc field name to `Dgit'.  Relevant to #720201.
+   * Fix bug handling our synthetic merges when we see them in
+     the remote suite branch.
+   * `3.0 (quilt)' fixup creates .pc/applied-patches since modern
+     dpkg-source creates it even though old ones didn't always.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 24 Aug 2013 18:49:02 +0100
+ 
 +dgit (0.8+nmu1) experimental; urgency=low
 +
 +  * Non-maintainer upload.
 +    (This is a test NMU with no changes, to verify #720522 has been fixed
 +    and NMUing in general works.)
 +
 + -- Joey Hess <joeyh@debian.org>  Fri, 23 Aug 2013 11:55:35 -0400
 +
  dgit (0.8) unstable; urgency=low
  
    * Fix comparison of archive's .dsc's hash and git branch head