summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* dgit-nmu-simple(7): Mention --delayedSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-*(7): Sort out Makefile, .gitignore and changelogIan Jackson2016-10-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-sponsorship(7): About deleting tagSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-gbp(7): Note that patches-unappliedSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship(7): Add import-dsc for NEW packageSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-gbp(7): Mention --overwriteSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship(7): Mention gbp-cloneSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-gbp(7): New manpageSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-user(7): Use `apt install ./foo.deb`Sean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-user(7): Add "... without a .pc directory"Sean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-user(7): Explain "binary package"Sean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-nmu-simple(7): Cannot yet use DELAYEDSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* local-pod-man: Wrapper script to make previewing pod manpages easyIan Jackson2016-10-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-nmu-simple(7): Fix missing quotesIan Jackson2016-10-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-nmu-simple(7): Sample `dch` commandsSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-nmu-simple(7): Maintainer's *git* workflowSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship(7): Demote to subsectionSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship(7): Correct sponsee/sponsorSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship(7): Mention RFS procedureSean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship(7): "sample dgit push"Sean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship(7): Suggest pristine-tar(1)Sean Whitton2016-10-30
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-sponsorship.7 (wip)Ian Jackson2016-10-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-user(7), dgit-nmu-simple(7): Much workIan Jackson2016-10-30
| | | | | | These are in reasonable shape now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-user(7): More work in progressIan Jackson2016-10-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-user(7): work in progressIan Jackson2016-10-30
| | | | | | | Used one of the existing tutorials as a template, so currently contains many lies (including the AUTHOR). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.9~Ian Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.8archive/debian/2.8Ian Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* build modes handling: Check for stray .changes on all split brain build entriesIan Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* build changes handling: Break out midbuild_checkchangesIan Jackson2016-10-25
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: build-mode-*: Check that right .changes comes out.Ian Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* build changes handling: Run mergechanges when needed in non-sbuild build modesIan Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* build changes handling: Introduce postbuild_mergechangesIan Jackson2016-10-25
| | | | | | | | | | | | | | | Affects only the `sbuild' subcommand. Mostly code motion. Other changes include: * Provide in_parent, and use it. * "sbuild" changed to "build" in the msg_if_onlyone failure message * Unapply patches before merging changelogs * Reorganise so that it is possible to use this code when there is only one output changes file. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: bm-*: turn bm-report-source into bm-report-testIan Jackson2016-10-25
| | | | | | No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd git-apply fallback: defend against debian/patches/series being an ↵Ian Jackson2016-10-25
| | | | | | unusual object, in case dpkg-source doesn't. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 2.8~Ian Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.7archive/debian/2.7Ian Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Provide absurd-gitapply testIan Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: Allow --force to enable/disableIan Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Ignore unknown force options (with a warning)Ian Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Provide --force-dsc-changes-mismatchIan Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Provide --force-unsupported-source-formatIan Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: Docuemnt absurdity in changelogIan Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: Use absurd `git apply' emulation if gbp pq import failsIan Jackson2016-10-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gbp import can fail due to git apply not understanding patches. This is #841867 (against dgit). The underlying problem is #841866 (in gbp pq) which exposes things like #841865 and #829067 (in git). I imagine there are other lurking incompatibilities between git-apply and dpkg-source. We could in principle reimplement the gbp patch metadata extraction. But that would be quite tiresome and have its own compatibility problems. The real problem is just `git apply'. (Indeed gbp already tries git apply without, and then with, a whitespace fix option.) We work around the trouble by providing our own implementation of `git apply'. Specifically: We try to do things the sane way (just running gbp pq import) first. If that works, great. If it doesn't, we put /usr/share/dgit/absurd on the PATH. That contains only a sh script called `git'. This sh script figures out whether the caller is trying to invoke `git apply'. If not, it runs the real git. If the caller wanted git-apply, the absurd git script emulates it using dpkg-source --before-build. Conveniently, we know that the series file will not be touched by patches. So we can write just the patch we care about into the series file, and run --before-build, which applies just that one patch. The results are committed (minus the .pc), and for the next patch, dpkg-source sees again a tree with simply a single patch to apply. We try ordinary gbp pq first because our absurd approach is very slow on a big tree. Also we would like to maximise our chances of the import working. If git and/or gbp ever work better by themselves, all of this craziness will simply not happen. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Build system substitutions, for absurditiesIan Jackson2016-10-24
| | | | | | | | | | * Introduce absurddir, which is where the absurdities will go * Substitute the absurddir into the dgit script during make all * Install the substituted scripts rather than the originals in make install * Provide a default in dgit, based on $0 * Clean the substitutions up in make clean Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Break out failedcmd_waitstatusIan Jackson2016-10-24
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Provide --force-unrepresentable.Ian Jackson2016-10-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: --force-*: Provide frameworkIan Jackson2016-10-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Some more info about --deliberately.Ian Jackson2016-10-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Reorder the options, moving more important ones earlier.Ian Jackson2016-10-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.7~Ian Jackson2016-10-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>