Merge tag 'debian/6.6' into stretch-bpo

dgit release 6.6 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Sun 05 Aug 2018 10:43:37 BST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

2 files changed, 60 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 6b485f9..2e04c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,62 @@
+dgit (6.6) unstable; urgency=medium
+
+  * test suite: Fix gdr's calls to dgit when run formally in
+    autopkgtest.  (Affects gdr-import-dgitview.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 Aug 2018 10:42:01 +0100
+
+dgit (6.5) unstable; urgency=medium
+
+  git-debrebase new features:
+  * git-debrebase: Provide new convert-from-dgit-view operation.
+    The output is, unavoidably, not very pretty.  Closes:#905322.
+  * git-debrebase: New subcommand `scrap'.  Closes:#905063.
+
+  git-debrebase error handling improvements:
+  * git-debrebase: Properly reject bare dgit dsc imports
+  * git-debrebase: Improve some error message formatting.
+  * git-debrebase: Check for git-rebase in progress and abort most operations.
+
+  dgit improvements:
+  * dgit: Improve error message for unknown suite, to suggest -d.
+  * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias.
+  * dgit: Provide print-unapplied-treeish subcommand.
+
+  Test suite changes:
+  * test suite: Add t-tstunt-parsechangelog to many gdr tests.
+  * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.
+  * test suite: gdr-import-dgitview: New test for dgit dsc imports.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 04 Aug 2018 17:53:57 +0100
+
+dgit (6.4) unstable; urgency=medium
+
+  * git-debrebase(1): Fix typo "unappled".  Closes:#905064.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 02 Aug 2018 08:24:32 +0100
+
+dgit (6.3) unstable; urgency=medium
+
+  * git-debrebase: breakwater: Fix error message for unprocessable
+    commits.  Closes:#905003.
+  * git-debrebase: new-upstream: Fix error message for new version
+    with bad syntax.
+  * git-debrebase test suite: Test messages about unprocessable commits.
+  * git-debrebase: new-upstream: Fix handling of epochs.
+  * git-debrebase: convert-from-gbp: Use same algorithm for finding
+    upstream commitish as new-upstream.  Closes:#905062.
+  * git-debrebase: Improve error messages for bad options.
+  * git-debrebase: Improve error message for convert-from-gbp
+    upstream discrepancy.  Closes:#905078.
+  * git-debrebase(5): Add ILLEGAL OPERATIONS section.  (Re#905004.)
+  * git-debrebase(1): Warn against plain git rebase.  (Re#905004.)
+  * dgit-maint-debrebase(7): Warn more against plain git rebase.
+    Closes:#905004.
+  * git-debrebase: Implement --help, providing a summary.
+    Closes:#904990.
+
+ -- Ian Jackson <ian@zealot.relativity.greenend.org.uk>  Thu, 02 Aug 2018 03:45:40 +0100
+
 dgit (6.2~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
diff --git a/debian/tests/control b/debian/tests/control
index 8480655..e3274f2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,7 +16,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-makepatches7 gdr-subcommands
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-makepatches7 gdr-subcommands gdr-unprocessable
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime