X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=18bee7f3a4436c9e005bb38559e1a9add6d3f86e;hp=b76e2e1c084f1a65ab01542f068dec96c0098535;hb=c3cea8116aebb9dc7d83504bc810520e6f231fdf;hpb=c2a1ff9bcb0420ce47b6d4663aa0b403feabf0a4 diff --git a/debian/changelog b/debian/changelog index b76e2e1c..18bee7f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,168 +1,348 @@ -dgit (9.0~) unstable; urgency=medium - - [ Ian Jackson ] - * changelog: start 8.6 - * dgit: rpush: Work in splitting quilt modes, again - * test suite: rpush-quilt: New test to check rpush with splitting - * dgit: Drop "dgit view: changes are required..." message - * dgit: split brain reorg: Always _needed in split brain quilt modss - * dgit: Move quiltify_splitbrain_needed into its one call site - * dgit: Separate out build_check_quilt_splitbrain - * dgit: dopush pseudomerge, break apart from quilt fixup - * dgit: quilt fixup: Move split brain branch creation out a bit - * dgit: rename unpack_playtree_mk_cd_work (from _mkwork) - * dgit: unpack_playtree_need_cd_work: Make idempotent - * dgit: quilt_need_fake_dsc: Make idempotent - * dgit: gdr linear quilt fixup: Do it in a playtree - * dgit: Move quilt_need_fake_dsc into the places that require it - * dgit: Write down quilt mode split brain plans in a comment - * dgit: split brain reorg: Check quilt cache iff $do_split_brain (1) - * dgit: split brain reorg: Check quilt cache iff $do_split_brain (2) - * dgit: Reject split brain quilt modes with single-debian-patch - * dgit: split brain reorg: Change an internal error die to confess - * dgit: split brain reorg: Move some split brain code further out. - * dgit: Add a comment about a bug we are about to eliminate. - * dgit: split brain reorg: Move do_split_brain setting - * dgit: Fix check for --include-dirty --quilt= - * dgit: split brain reorg: debug print quilt mode in XXX - * dgit: split brain reorg: Check $split_brain against $do_split_brain - * dgit: split brain reorg: Rename $made_split_brain - * dgit: split brain reorg: Slight internal error check improvements - * dgit: clean mode: Correctly reject bad modes from config - * dgit: Split out default_from_access_cfg - * dgit: When propagating pseudomerge error, strip leading \n - * dgit: Move git chedckout master out of quiltify - * dgit: quiltify: Go back to dgit-view if appropriate - * dgit: Fix --dgit-view-save option - * dgit: Do split brain cache and saving in build_maybe_quilt_fixup - * test suite: t-{unapplied,dpm}-pushed-good: set $suite - * test suite: break out t-splitbrain-rm-1-patch - * test suite: Drop all testing of old tag formats, and compatibility - * dgit: tag format: Add missing $protovsn comment re tagformat param - * dgit: Drop support for old tag format - * dgit: Tidying up after tag format: drop ..._can_splitbrain - * dgit: Drop $protovsn < 4; part of tidying up after tag format - * dgit: Introduce $protovsn 5; part of tidying up after tag format - * infra: Drop support for old tag name on server side - * dgit: Tidying up after tag format: Collapse $dodep14tag test - * dgit(1): Correct --always-dep14tag - * dgit(1): Tidying up after tag format: Drop qualifications - * Dgit.pm: Tidying up after tag format: Drop debiantag_old - * dgit: Tidying up after tag format: Drop debiantag - * dgit(1): Tidying up after tag format: Drop splitbrain conditional - * dgit: Introduce do_split_brain() - * dgit: Put !! inside do_split_brain() - * dgit: Crash if we forgot to set $do_split_brain - * dgit: Break out determine_whether_split_brain - * dgit: Move determine_whether_split_brain further up the file - * dgit: Reject dgit pull in split brain mode - * dgit: In code, rename splitbrain quilt modes to splitting - * dgit: Support split view in non-splitting quilt modes - * dgit: Reject split view with correct message - * test suite; New test forcesplit-overwrite - * test suite: forcesplit-overwrite: Check -pushed-good - * test suite: forcesplit-overwrite: Break out "try" - * test suite: forcesplit-overwrite: Test without --overwrite - * test suite: forcesplit-overwrite: Test with bare --overwrite - * test suite: new test forcesplit-linear - * docs: Document --split-view and change terminology (Closes: #926640) - * Dgit.pm: Move upstream_commitish_search from git-debrebase - * Dgit.pm: Move resolve_upstream_version from git-debrebase - * Dgit.pm: Move read-tree wrappers from git-debrebase - * Rename various *make_commit* to *hash_commit* - * Dgit.pm: Move make_commit (git-commit-tree wrapper) from gdr - * Dgit.pm: Move hash_commit from dgit - * git-debrebase: Replace one open-coded hash-object with hash_commit - * dgit: Make $format available in build_or_push_prep_modes - * dgit: Introduce $uhead and $uhead_whatshort - * Dgit.pm: resolve_upstream_version: Return a message too - * test suite: Add DEBORIG pseudo-dependency - * dgit: baredebian: Introduce --upstream-commitish - * dgit: baredebian: New quilt mode - * i18n: Add translator notes about ASCII art changes display - * test suite: baredebian setup, and a skeleton to run it - * test suite: baredebian-push: Actually test --quilt=baredebian - * dgit: baredebian: Note upstream version and commitish source - * dgit: baredebian: Provide $quilt_upstream_commitish_message - * dgit: baredebian: Note upstream commitish source in prose - * test suite: baredebian-push: Check that history is roughly right - * dgit: baredebian: Reject --clean=git - * test suite: baredebian-push: Test rejection of -wgf - * dgit(1): document --quilt=bareebian (Closes: #903392) - * dgit(1): split view: Talk about `your local git clone' - * test suite: t-setup-done: Arrange to save all DGIT_TEST_REAL_* - * test suite: baredebian-push: Add missing dependency DEBORIG - * test suite: lib: Add missing dependencies for git-deborig - * test suite: baredebian: Add missing dependency quil - * test suite: baredebian: break out lib-baredebian, baredebian-test - * dgit: Break out $quilt_options_re - * Dgit.pm: read_tree_*: Treat '' as meaning 'delete this' - * dgit: Break out import_tarball_tartrees - * dgit: Break out import_tarball_commits - * dgit: import_tarball_tartrees: Honour Path in dfis - * dgit: import_tarball_tartrees: Handle @dfi==1 case in caller - * dgit: import_tarball_tartrees: Provide OrigPart - * dgit: return $r1authline from import_tarball_commits - * test suite: lib-baredebian: Introduce $quiltmode - * test suite: baredebian: move setting of $quiltmode to lib - * test suite: lib-baredebian: Split up big function - * test suite: lib-baredebian: Break out $uv everywhere - * test suite: lib-baredebian: Break out $uvtag - * dgit: New quilt mode "baredebian+tarball" - * test suite: lib-baredebian: Tolerate uvtag not being set - * test suite: baredebian-tarball: New test - * test suite: baredebian: Break out baredebian-tarball-mode - * test suite: lib-baredebian: Machinery for multiple origs - * test suite: baredebian-multitar: New test - * test suite: lib-baredebian: Provide `origbase' - * test suite: baredebian-multitar: Check tarball import structure - * dgit(1): baredebian: Fix an editing error - * dgit(1): baredebian: Add caveat about not checking edits - * dgit(1): baredebian+tarball: Document new quilt mode (Closes: #931253) - * dgit: Do not translate import commit messages - - [ Sean Whitton ] - * dgit(1): expand on description of behaviour of --include-dirty - - [ Ian Jackson ] - * dgit(1): In --include-dirty caveat, use semantic newlines - * dgit(1): In --include-dirty caveat, mention --clean=dpkg-source - * dgit(1): In --include-dirty caveat, say "especially --clean=git" - (Closes: #930922) - * test suite: enumerate-tests: Break out allsedderies - * test suite: enumerate-tests: Drop duplicate dependencies - * test suite: enumerate-tests: include deps of t-import-* - * test suite: baredebian-*: Drop explicit list of implied deps - * test suite: baredebian: Break out baredebian-test-minimum - * dgit: baredebian: Honour baredebian+git alias for baredebian - * test suite: baredebian-plusgit: New test for baredebian+git - * dgit(1): baredebian+git: Document this alias - - [ Niko Tyni ] - * git-debrebase: fix convert-from-dgit-view argv handling (Closes: #930214) - * git-debrebase(1): typo fix (Closes: #930215) - - [ Sean Whitton ] - * dgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filter - (Closes: #930956) - - [ Ian Jackson ] - * dgit-maint-debrebase(7): Minor wording change apropos of #930956 - - [ Sean Whitton ] - * dgit-maint-{merge,debrebase}(7): Using untagged upstream commits - (Closes: #930964) - - [ Ian Jackson ] - * dgit-repos-policy-debian: Add a tiny bit of debugging output - * test suite: debpolicy-taintrm: New test (Closes: #929249) - * test suite: debpolicy-taintrm: Drop some xxx's - * changelog: Retarget at buster - * changelog: Document the change so far - * changelog: pseudo-finalise 8.6~ - * changelog: start 9.0 - - -- +dgit (9.13) unstable; urgency=medium + + * gitattributes defuse: work even if .git/info/attributes missing + (Closes: #981344) + * dgit-maint-*(7): Advice for git-debpush users. + Closes:#932520. [Sean Whitton] + * dgit.1: drop remark about sbuild not building arch-independent. + Closes:#952442. [Helmut Grohne] + + -- Ian Jackson Fri, 12 Feb 2021 12:48:15 +0000 + +dgit (9.12) unstable; urgency=medium + + Bugfixes: + * dgit-mirror-ssh-wrap: Cope with yet another new rsync rune. + Closes:#968635. [Sergio Durigan Junior] + + -- Ian Jackson Wed, 19 Aug 2020 17:25:45 +0100 + +dgit (9.11) unstable; urgency=medium + + Bugfixes: + * git-debrebase, git-debpush: fail when looking for upstream tag if + there is more than one candidate. Closes:#961682. [Sean Whitton] + * git-debrebase: Fix error message for wrong use of -i + * git-debrebase: new-upstream: Do not treat late options as version + + Documentation: + * dgit-maint-debrebase(7): Drop some bad advice about the upstream/ tag + case. Closes:#961683. [Sean Whitton] + * git-debrebase(1): Fix new-upstream -i docs + + dgit-infrastructure: + * dgit-mirror-ssh-wrap: Cope with new rsync rune. Closes:#963489. + * dgit-mirror-ssh-wrap: Clarify the error message + + Test suite: + * Cope with buster & eatmydata (ie, work around #963508) + * Provide navigation banner in log when exiting nonzero + * Print pwd in failure trap to help with diagnosis + + -- Ian Jackson Mon, 22 Jun 2020 19:09:17 +0100 + +dgit (9.10) unstable; urgency=medium + + dgit bugfix: + * Work around gbp metadata handling bug which can prevent import + of some anomalous source packages. Closes:#950326. + Report from Peter Green. + + git-debpush bugfix: + * avoid a pipefail problem. Closes:#940588. [Sean Whitton] + + Documentation: + * Terminology: Change "rewind" to "rewrite" where appropriate + * dgit(1): Cover more cases of --overwrite and --deliberately + Closes:#928473. + * dgit(1): Do not talk about `intermediate' uploads. + * d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in + gbp.conf; set `merge' in gbp.conf; import tarball before + committing gbp.conf. Closes:#932954. [Sean Whitton] + + i18n: + * Updated nl.po file. Closes:#945356. [Frans Spiesschaert] + + -- Ian Jackson Mon, 03 Feb 2020 08:41:10 +0000 + +dgit (9.9) unstable; urgency=medium + + Documentation: + * dgit-maint-{merge,debrebase}(7): Suggest a better rune. + (`git fetch --tags upstream') Closes:#939679. [Sean Whitton] + * git-debpush(1) minor improvements. Closes:#935084. [Sean Whitton] + * dgit(1): Fix a typo (found by lintian) + * dgit-maint-bpo(7): Mention occasional need for --new. Closes:#935443. + * git-debrebase: Extend extended description for this .deb. + + Infrastructure: + * New script dgit-mirror-ssh-wrap suitable for use as restricted + command on repos mirror target hosts, and corresponding test. + + Packaging niggles: + * control: Add missing dependency on liburl-perl (dgit and tests) + * control: Drop redundant Priority field for dgit-infrastruture + * control: update Vcs-Git to end in .git + * lintian: Override some checks + * control: Bump Standards-Version to 4.4.0.0. + + -- Ian Jackson Sat, 14 Sep 2019 21:34:13 +0100 + +dgit (9.8) unstable; urgency=medium + + dgit, important bugfixes for bugs introduced in 9.6: + * Once again cope with archive skew. Closes:#935874. + [Initial report from Colin Watson] + * Follow http[s] redirects again. Closes:#939564. + + dgit, useful new behaviours and fixes: + * Use distro-info-data to resolve unknown suites. Closes:#931212. + [Suggestion from Simon McVittie] + * Try to warn about misplacement of dgit options. Closes:#934807. + [Useability report from Félix Sipma] + * Fail early when the archive/ tag already exists, ie when version + needs to be not reused. Closes:#935802. + [Useability report from IOhannes m zmölnig] + * Do not mistakely reject .asc and .sig files with push-source -C. + Closes:#939280. [Report from Simon McVittie] + + docs: + * dgit-maint-{merge,debrebase}(7): Suggest git fetch --all --tags + as it handles tags better. [Sean Whitton] Closes:#939504. + * git-debrebase(5): Tiny typo fix. + * dgit(1): Some semantic linefeeds (no change to rendered output) + + Supporting changes: + * test suite: New test for http mirror and archive skew + * test suite: Test already-tagged check + * test suite: Add --force-reusing-version to many tests as now needed + * Dgit: Minor refactoring of a regexp. + + -- Ian Jackson Fri, 06 Sep 2019 23:42:15 +0100 + +dgit (9.7) unstable; urgency=medium + + dgit general bugfixes: + * Correctly test for presence of git repo on dgit git server. + Fixes behaviour following mixed dgit/non-dgit uploads. Closes:#934126. + (Was badly broken by http fetching rework in dgit 9.6.) + * Fix use on NFS, by closing a file which is going to be deleted. + [Report and fix from Stéphane Glondu] Closes:#933827. + + dgit vcs-git bugfixes: + * Strip [] (used eg by Debian Haskell Team). Closes:#932699. + * update-vcs-git: Cope if url is unchanged. + * update-vcs-git: Strip -b (as it always should have done). + + Test suite: + * New facilities for http testing, including mock webservers. + * New test cases for http, and for bugs fixed in this version. + * Switch to using http git check in three existing tests. + * Improve debian/tests/control generator. + * Limited refactoring to support other changes. + + Other minor changes: + * dgit: Slightly more debugging for check_for_git with http[s] + * changelog: Fix a typo in the entry for 9.6. + * i18n (messages) updated, following message changes. + + -- Ian Jackson Sun, 11 Aug 2019 01:11:01 +0100 + +dgit (9.6) unstable; urgency=medium + + * git-playtree-setup had a spurious set -x so many programs spewed + debugging output. This is now fixed. Closes:#932959. + + dgit: + * Drop support for configuring old, not currently enabled, methods + of TLS key/cert pinning. We are going to revisit this soon. + * Provide a --for-push option (useful in for certain special users). + * Reduce variety in HTTP clients we use. Specifically, use WWW::Curl + for accessing (i) the ftpmaster API, (ii) the http dgit git server + mirror (iii) downloading the .dsc. + + Administrivia: + * Add missing Closes of #932476 to changelog entry for 9.5 + + -- Ian Jackson Thu, 25 Jul 2019 13:12:08 +0100 + +dgit (9.5) unstable; urgency=medium + + git-debpush [Sean Whitton]: + * Support ignoring individual checks with --force=check. Closes:#932459. + * Check upstream source is identical in the upstream tag. Closes:#932476. + * Check that patches are (un)applicable. Closes:#932477. + * Check for an unstitched git-debrebase branch. Closes:#932612. + * Check for explicitly pushing detached HEAD. + + dgit clone [Ian Jackson]: + * No longer create an "origin" remote. Closes:#932694. + + Documentation: + * dgit-maint-bpo(7): new manpage for maintainers of official Debian + backports. Closes:#857490. [Sean Whitton] + * git-debrebase(1): make this manpage a less intimidating entry point. + Closes:#926656. + [Sean Whitton & Ian Jackson; prompted by feedback from Sam Hartman] + + Miscellaneous: + * Correct the description of --force in git-debpush(1) [Sean Whitton]. + * git-debrebase(*): fix some crossreferences [Sean Whitton]. + Closes:#932536. + * Break out git-playtree-setup and rewrite in shell. [Ian Jackson] + * Fix organisation copyright attribution for Matthew Vernon's + contributions. Closes:#932630. + * HACKING: new document for helping people work on the code. [Ian Jackson] + * Update Vcs-Git etc. to point to salsa. + + -- Sean Whitton Mon, 22 Jul 2019 21:38:19 +0100 + +dgit (9.4) unstable; urgency=medium + + dgit: + * Support the Ubuntu Cloud Archive [Matthew Vernon]. Closes:#932322. + + test suite: + * tag-to-upload tests: Tolerate a changed git message. Closes:#932475. + + administrivia: + * debian/copyright: Add some missing credtis + * Update copyright notices in many files + + -- Ian Jackson Sat, 20 Jul 2019 16:26:32 +0100 + +dgit (9.3) unstable; urgency=medium + + dgit and git-debrebase bugfixes: + * No longer crash if .git/logs does not exist when we need it. + * Report the upstream tag, rather than commit id, in tags/commits, + if the user explicitly specifies refs/tags/... + + tag-to-upload, git-debpush [Sean Whitton]: + * Several new checks designed to prevent broken uploads. + - Including: Check that upstream tag is ancestor of branch to be tagged. + Closes:#932096 + * Cope with spaces in user-supplied upstream tag. + + tag-to-upload, server side: + * Fix non-default quilt modes. These were all previously broken. + * Arrange to report the upstream tag in dgit-generated commits/tags. + + dgit archive query improvements [Matthew Vernon]: + * dgit(1): document the presence of the aptget method. Closes:#932321. + + minor supporting changes: + * New tests tagupl-baredebian and tagupl-gbp. + * Tiny addition to debugging output and test suite output. + * Test suite rearrangements. + + -- Ian Jackson Thu, 18 Jul 2019 03:10:25 +0100 + +dgit (9.2) unstable; urgency=medium + + * No change upload to force rebuild on buildd. + + -- Ian Jackson Tue, 09 Jul 2019 22:01:25 +0100 + +dgit (9.1) unstable; urgency=medium + + New tools for a "git-push-to-upload" workflow [Ian Jackson & Sean Whitton]: + * New script in a new binary package: git-debpush. + The new binary package is small, but + + git-debpush needs to be in src:dgit, because its test suite is the + dgit test suite; however, + + git-debpush is functionally and conceptually independent of dgit, + so should not go into bin:dgit; in particular + + git-debpush's dependencies are quite different to the other + binary packages. + * New dgit-infrastructure subcommand, tag2upload, to process tags made + by git-debpush. + Please see git-debpush(1) for a sketch of the workflow. + + dgit: + * Allow the -p option to be used with various push modes. + * Include dgit tag metadata in maintainer view tags. + For consistency with, and use by, git-debpush. + * Include quilt metadata in the archive/ (dgit view) tag. + * rpush protocol: Version 6, which includes split brain information + for maintainer view tags. And, actually use newer version + (was broken in 9.0, which would prefer to select 4 not 5). + * Add some missing blank lines to tag messages. + * Some other refactoring. + + Other documentation: + * dgit(1): fix a reference in the description of --quilt=auto [Sean + Whitton]. + + Translations: + * Do not translate tag subject lines, because these are parsed by + dgit-repos-server. + + Test suite: + * Test cases for new tools for "git-push-to-upload" workflow. + * drs-git-ext: honour DGIT_DRS_MODE. + * Provide a stunt sendmail and a stunt dgit. + * Unset CDPATH in case caller has it set. + * Some other refactoring. + + Administrivia: + * Update d/copyright years to include 2019 [Sean Whitton]. + + -- Ian Jackson Sun, 07 Jul 2019 14:28:27 +0100 + +dgit (9.0) unstable; urgency=medium + + dgit - low-impact incompatible change: + * Drop support for, and testing of, dgit versions which use old tag name + (debian/V; now that is maintainer view and dgit is archive/debian/V). + The new tags came in in dgit 2.0 in October 2016. No version of dgit + without them was in any Debian release. We don't expect there are any + sites using old servers which do not support the new format, or anyone + using a dgit client older than 2.x who cannot upgrade. + + git-debrebase fixes [Niko Tyni]: + * Fix `git-debrebase convert-from-dgit-view ', which + would crash due to an argument parser bug. Closes:#930214. + * git-debrebase(1): typo fix. Closes:#930215. + + dgit - new capabilities: + * Support split view with native packages, and with all quilt modes. + Now we distinguish "split view" (meaning separate dgit branch) from + "splitting quilt modes" (eg --quilt-unapplied). + [Prompted in part by enquiries from Sam Hartman] Closes:#926640. + * Support for bare debian/ directory (aka packaging-only) git branches + Ie, --quilt=baredebian[+tarball]. [Thanks for info from Shengjing + Zhu, and docs and UI contributions/review from Sean Whitton.] + Closes:#903392. Closes:#931253. + + dgit - bugfixes: + * Fix --dgit-view-save option alias, which never worked. + (--save-dgit-view worked, and still does, though.) + * i18n: Do not translate import commit messages. + + dgit - other documentation improvements [Sean Whitton]: + * Expand on description of --include-dirty. New text may help + user avoid unexpected file deletion. Closes:#930922. + * dgit-maint-*(7): Suggest --name-status --diff-filter. Closes:#930956. + * dgit-maint-*(7): Using untagged upstream commits. Closes:#930964. + + dgit - minor consequences of these other changes: + * Actually properly reject invalid quilt modes found in git config. + (Previously they might be accepted and then cause malfunctions.) + * Reject split brain quilt modes with single-debian-patch. + (Previously this would malfunction; now we reject it.) + * i18n: Add translator notes about ASCII art changes display. + * Drop "dgit view: changes are required..." message. + * Some other minor changes to quilt fixup error handling. + * Changes to debugging output related to quilt modes and split view. + * Introduce rpush protocol version 5. Minimum version is now 4. + * Considerable internal rearrangement of quilt fixup code. + * Considerable test suite work including new tests. + + dgit test suite: + * dgit-repos-policy-debian: Test taint removal. Closes:#929249. + + -- Ian Jackson Tue, 02 Jul 2019 16:55:15 +0100 dgit (8.6~) UNRELEASED; urgency=medium