diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
commit | ae8f33be945323e02e670a97c8ac6d42a0e1be40 (patch) | |
tree | 2bbf98c464b32b8ede618bf93929741246b81b5f /debian | |
parent | 4a142fe137c1bed5a0cb5d14c41adcb3355458c4 (diff) | |
parent | 7166dbc963a9c01ce62a0564bb7b905156adb560 (diff) |
Merge tag 'debian/5.8' into stretch-bpo
dgit release 5.8 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 08 Jul 2018 11:43:29 BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 100 | ||||
-rw-r--r-- | debian/tests/control | 32 |
2 files changed, 120 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 9b64e20..837bab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,103 @@ +dgit (5.8) unstable; urgency=medium + + Bugfixes: + * dgit, git-debrebase: Properly make patches even if an awkward + .gitignore ignores the things in debian/patches. Closes:#903130. + * git-debrebase status: Fix commit reporting. Closes:903131. + * git-debrebase new-upstream: Add a -1 revision if the user + didn't supply one. Closes:#903127. + * git-debrebase: Improve grammar if one blocking snag. + * dgit(1): Unscramble push[-source] descriptions. Closes:#903116. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 08 Jul 2018 11:42:41 +0100 + +dgit (5.7) unstable; urgency=medium + + New feature: + * dgit checkout: new subcommand. Closes:#878443. + * dgit: Check that entirely-new uploads to Debian are not + source-only-uploads, as those are REJECTed. Closes:#801435. + + Bugfixes: + * dgit(7): Mention git-debrebase and gbp pq alongside git-dpm, + in the comment about handling patch stacks. + * dgit update-vcs-git: Honour --package properly. + * test suite: Always pass LC_COLLATE=C to sort(1). Closes:#903006. + * test suite: Fix trustingpolicy-replay & dput-ng. Closes:#903007. + * test suite: Test dput-ng compatibility. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 05 Jul 2018 15:02:21 +0100 + +dgit (5.6) unstable; urgency=medium + + * Merge the experimental branch containing the fianl + version of the test suite gnupg workarounds. Empirically, + - The tests now pass (most of the time, at least) in + current Debian unstable, whereas 5.5's fail utterly. + - There is still occasional lossage. So when running tests + in a loop (eg to test ever commit), it is still good to set + DGIT_TEST_RETRY_COUNT=3 (say). + + * test suite: Test that manpages format with only expected warnings. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 01 Jul 2018 00:41:20 +0100 + +dgit (5.5+exp9) experimental; urgency=medium + + * test suite: Explicitly start/stop the gnupg agent, around + each call to gnupg. Apropos of #902316 (and #868550). + + * Separate changelog entries for the following test attempts + in experimental have been elided: + dgit (5.5+exp8) experimental; urgency=medium + dgit (5.5+exp7) experimental; urgency=medium + dgit (5.5+exp6) experimental; urgency=medium + dgit (5.5+exp5) experimental; urgency=medium + dgit (5.5+exp4) experimental; urgency=medium + dgit (5.5+exp3) experimental; urgency=medium + dgit (5.5+exp2) experimental; urgency=medium + dgit (5.4+exp1) experimental; urgency=medium + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sat, 30 Jun 2018 19:03:00 +0100 + +dgit (5.5) unstable; urgency=medium + + * Add missing comma in debian/control. Closes:#902578. + * dgit(1): Fix a wrong reference to \fp, which should be \fP. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 28 Jun 2018 13:25:21 +0100 + +dgit (5.4) unstable; urgency=medium + + Improvements: + * dgit(1): Better description of --overwrite. Somewhat + apropos of discussion in #902534. + + Bugfixes: + * test suite: gdr-viagit, gdr-newupstream: Do not spuriously + fail if gnupg not serendipitously installed. Closes:#902559. + * Fix bug ref to #865444 in previous changelog entry. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Wed, 27 Jun 2018 23:13:42 +0100 + +dgit (5.3) unstable; urgency=medium + + Bugfixes: + * dgit: Do not introduce duplicate origs in .changes files, + eg if the .changes already has that orig. Closes:#869146. + * Honour GIT_REFLOG_ACTION everywhere. Closes:#901935. + * git-debrebase new-upstream: Provide better reflog entries + by setting GIT_REFLOG_ACTION. Closes:#901925. + + Improvements: + * Better message formatting when --overwrite may be needed, + and a note about first dgit push in dgit(1). Closes:891031. + * dgit(7): Add discussion of quilt fixup error messages, + and add cross-references to dgit(1) and the actual error. + Somewhat apropos of #865444. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Wed, 27 Jun 2018 14:00:31 +0100 + dgit (5.2~bpo9+1) stretch-backports; urgency=medium * Rebuild for stretch-backports. diff --git a/debian/tests/control b/debian/tests/control index 378cf4c..dfd73bb 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,24 +1,24 @@ Tests: build-modes-gbp Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-buildpackage Tests: clone-reprepro downstream-gitless Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, reprepro +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, reprepro Tests: dpkgsourceignores-docs Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc Restrictions: x-dgit-intree-only Tests: defdistro-dsd-clone-drs dsd-clone-drs Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin +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-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime Tests: gdr-newupstream gdr-viagit Tests-Directory: tests/tests @@ -26,33 +26,41 @@ Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime Tests: gitattributes Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bsdgames, man-db, git-man +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, bsdgames, man-db, git-man Tests: hint-testsuite-triggers Tests-Directory: tests/tests Depends: gnupg, patch, diffutils Restrictions: hint-testsuite-triggers +Tests: manpages-format +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, man-db, make, groff, git-debrebase + Tests: defdistro-mirror mirror mirror-debnewgit mirror-private Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, rsync +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, rsync Tests: build-modes-sbuild quilt-gbp-build-modes-sbuild Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, sbuild +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, sbuild Restrictions: x-dgit-schroot-build Tests: sbuild-gitish Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, sbuild, man-db +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, sbuild, man-db Restrictions: x-dgit-schroot-build Tests: spelling Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc Restrictions: x-dgit-git-only -Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt +Tests: trustingpolicy-replay +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, dput-ng + +Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates test-list-uptodate unrepresentable version-opt Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc |