Accepted dgit 6.11~bpo9+1 (source) into stretch-backports
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 03 Sep 2018 21:28:42 -0700
Source: dgit
Binary: dgit git-debrebase dgit-infrastructure
Architecture: source
Version: 6.11~bpo9+1
Distribution: stretch-backports
Urgency: medium
Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
Changed-By: Sean Whitton <spwhitton@spwhitton.name>
Description:
dgit - git interoperability with the Debian archive
dgit-infrastructure - dgit server backend infrastructure
git-debrebase - rebasing git workflow tool for Debian packaging
Closes: 904966 904997 905005 905279 905573 905888 905975 905995 906196 906197 906199 906641 906784 906786 906787 906908 907190 907198 907202 907206 907208
Changes:
dgit (6.11~bpo9+1) stretch-backports; urgency=medium
.
* Rebuild for stretch-backports.
.
dgit (6.11) unstable; urgency=medium
.
* dgit-maint-debrebase(7): move and improve the section
"Inspecting the history". [Sean Whitton]
* Makefile: Adjust scope of dgit(7) pod rule.
* local-pod-man: developer script, obsoleteed by `make %.view': drop it.
.
dgit (6.10) unstable; urgency=medium
.
git-debrebase bugfixes:
* Patches in subdirectories: fix malfunctions. Closes:#907202,#907206.
* new-upstream changelog entry: Use debchange. Closes:#905888.
* Empty patch queues: Fix some malfunctions and infelicities.
* convert-to-gbp: Actually base the result on the breakwater, not HEAD.
.
dgit bugfixes:
* *build*: Cope with new-style --build= specifications
* Pass --no-source to sbuild (always). Closes:#904966.
* build: Squash $buildproductsdir. Closes:#906786.
.
dgit improvements for git-debrebase compatibility:
* Do not try split brain git-debrebase make-patches. Closes:#906908.
* Do not abandon quilt fixup at git-debrebase split commits.
* Check for git-debrebase with a history walker, not debrebase-last.
This can avoids using dpkg-source --commit. Closes:#907208.
.
git-debrebase improvements:
* convert-from-*: snag on discarding comments in series. Closes:#907198.
* forget-was-ever-debrebase: New subcommand.
* Make all commit message annotations have a COMMIT-TYPE.
.
git-debrebase documentation:
* dgit-maint-debrebase(7): Add runes for inspecting. Closes:#907190.
* git-debrebase(5): Warn against renaming branch while unstitched
* git-debrebase(5): Document new understanding of debrebase-last
.
test suite behavioural changes for ad-hoc runs:
* run-all: Without --progressive, rm and recreate tests/tmp
* run-all: Honour DGIT_TESTS_TMPDIR
* run-all: Understand `:' specially
.
test suite:
* Tests for the bugfixes and improvements.
* lib-gdr: Be more defensive about unexpected states/args
* lib-gdr: Check that we made patches with git-debrebase
* Honour DGIT_TEST_RUN_PFX env var.
* Test dgit calling git-debrebase on new debianisation.
* gdr-new-upstream: Check changelog is exactly right.
* debchange: Widespread better handling of the time seen by dch.
Freeze time. Work around faketime TZ bug (#907264).
* test-list-uptodate: Drop imports and dependencies
* git-debrebase: gdr-merge-conflicts: Call git merge --no-edit
* build-modes-*: Provide stunt dpkg-deb to pass -Znone, for speed.
* build-products-dir: Check nothing in ../
* Work if $tmp is on a different filesystem.
* Internal changes and refactoring to support other changes.
.
dgit (6.9) unstable; urgency=medium
.
* dgit: do not crash on push of a new gdr package. Closes:#906784.
* dgit: Remove unsubstituted $changesfile from message Closes:906787.
* dgit-maint-debrebase(7): improve "Converting an existing package",
and refer to "ILLEGAL OPERATIONS" in git-debrebase(5).
Closes:#905573. [ Sean Whitton ]
* test suite: Update debian/tests/control following dependency fix.
.
dgit (6.8) unstable; urgency=medium
.
* test suite: Fix dependencies of new gdr-merge-conflicts test.
.
dgit (6.7) unstable; urgency=medium
.
git-debrebase, bugfixes:
* make-patches: Do not bail if there aren't any.
* scrap: works properly when it does only rebase --abort.
* On rebase: always save ffq-prev even if we were both stitched and
laundered. Closes:#905975.
.
git-debrebase, improvements:
* Speed: improve laundry performance by a factor of ~55:1,
and analysis performance by factor of ~4.2:1. Closes:#905995.
* prepush: this is now a silent no-op if the branch is
unstitched. This is more friendly.
* convert-from-*: Snag on patches in d/patches which are not in series,
because they will be deleted. Closes:#904997.
* Highly experimental merge resolution support, enabled only with
special command line option.
* Lots of internal changes to support merge, and other work.
* convert-from-*: Check whether ffq-prev or debrebase-last indicate that
we are already in gdr format.
* convert-from-*: leave debrebase-last refs to hint to everyone that
this is now a gdr branch.
.
git-debrebase, improved messages:
* Improve ffq head recording message.
* Better (less copious by default) debug output.
* convert-from-gbp: Improve messages. Closes:#906641.
* Provide hints for unprocessable commits, depending on the apparent
branch ffq state, including possible suggestion to use convert-from-*.
Closes:#905005. Closes:#905279.
.
dgit, improved messages:
* Mention bad origs as possible cause of quilt fixup failure,
in both dgit(7) and in error messages. No longer suggest
--quilt=smash or dpkg-source --commit in the error message.
Closes:906196.
* Do not suggest --quilt modes if quilt fixup "stopped at"
a commit made by git-debrebase. Closes:#906197.
* Mention gitattributes as a potential problem in quilt linearisation
failure, when appropriate. Closes:#906199.
.
dgit, documentation:
* dgit(1): Encourage --overwrite rather than --overwrite=version.
* Document that we do not suppress attributes which affect git-archive.
This is related to #906199.
.
test suite:
* test suite: Set DEBFULLNAME
* test suite: unset GIT_EDITOR, so it works if user has that set.
.
Packaging:
* changelog: Add close note for #905400 to changelog entry for 6.5.
Checksums-Sha1:
7707f17ad1a496382e34c60c9db7be0d8cb84616 2030 dgit_6.11~bpo9+1.dsc
102dcb0bc71f373f5c6610d6a9d8ac0d0c6e96fe 507756 dgit_6.11~bpo9+1.tar.gz
Checksums-Sha256:
375163b88faa159dc3dcd986d3db1807100714bec83f97e726b1068c67c6da16 2030 dgit_6.11~bpo9+1.dsc
1267e61b2278fc5f646630e28b11b7c0b43eb2fce3d807364a70761f4971dd62 507756 dgit_6.11~bpo9+1.tar.gz
Files:
59c938b840ceb0368fb4821174593c7a 2030 devel optional dgit_6.11~bpo9+1.dsc
23fa2abd082af3d00663cba2c283c4f6 507756 devel optional dgit_6.11~bpo9+1.tar.gz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAluOFagACgkQaVt65L8G
YkDfDxAAkfzmSTragzclPquDGVIGOS9doCv5ik4dQzWyrmF/3Kv9qyTOkyeHl8Vy
cU9xgBKEOjkgUd/8lm/0Q09zFvMPTq9PO4Hx2c5P8A/Xfokx6HvSzB+C80Wfz203
AOBYNLbgNPMR50iN/XuNadqVLXyJwtCJ8YfW6McDFbz6AwCi/HQKsjup6flQ/dm5
XcXWlaLtzrysa1McvEDfQ7YSM264NZe+N+asfHuSpSF+Ds4UPZBRRkrLf7gMIpij
q1kkjV+IH/caDc76vHOB6KW+ykmvLWobozUmJvKj0y+HJ+dke0woFE6vdPOHNo9E
pAxlw5GCA54oH7uoUZu20uXtQUfHNoWpFGQ62LdV6Q0WvvdyC3v98rLzKrKFrNlW
XrnMPdSd4V9KVY/ct8wLUBJ4JytFPaQ3pukQtJ3xbNRbB3Vsv1Nn0cKjRdpDf4x5
Z+4LncUcvTkhnFR0ORf+PwLpBWv/a61RNaDiuzuo/i6y4BNedA1Nnbnb9t45vSRA
+fRmYuuYUoBpTEh3Mq+ElHSbPa2EJ54ue9Pj3VZztoKS+2LZr3lMk2wYptIYaW40
RqM91QBiiIENuUkM+CQt/39i0U7wpvQQjwLHm/Lx2OIIuHh7VR3lbwnSshm3eOoh
q1ewlA6AJv5g/AIuG4uRQD/RzFrAXz7MoCRYSS1X4tWyeaLTqVg=
=0ZZt
-----END PGP SIGNATURE-----
Reply to: