summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* dgit build: Warn if --build-products-dir is not `..'.Ian Jackson2018-07-29
| | | | | | Closes:#904859. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Improve and correct --build-products-dir description.Ian Jackson2018-07-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit import-dsc --build-products-dir.Ian Jackson2018-07-29
| | | | | | | Add t-buildproductsdir-config to import-nonnative, which will do as a test I think. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Remove // from inside conditionalsIan Jackson2018-07-29
| | | | | | | | | | | This idiom is terse, but quite confusing. Instead, handle the undef case explicitly. While we are editing these: * Change two internal errors from die to confess * Fix a die in git-debrebase which ought to be badusage Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.2Ian Jackson2018-07-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 6.1debian/6.1archive/debian/6.1Sean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: close bug requesting pbuilder supportSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: add stubbed test for pbuilder subcommandSean Whitton2018-07-28
| | | | | | | pbuilder requires root, but we want to be able to test the subcommand outside of autopkgtest too. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* debian: suggest sbuild | pbuilder | cowbuilderSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: new 'pbuilder' and 'cowbuilder' subcommandsSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: fix a reference to parent directorySean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* Update copyright yearsSean Whitton2018-07-27
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.1Ian Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 6.0, and document remaining thingsdebian/6.0archive/debian/6.0Ian Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: categorise, and add a few missing thingsSean Whitton2018-07-26
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: push_source no longer cleans the tree.Ian Jackson2018-07-26
| | | | | | This is no longer needed because we always build in a playtree. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Drop alwayssplit testsIan Jackson2018-07-26
| | | | | | | | | | Since dgit: make $need_split_build_invocation always true this option has had no effect, so these tests are redundant. And change the comment in dgit near the option parsing. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the ↵Ian Jackson2018-07-26
| | | | | | sbuild tests. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: make $need_split_build_invocation always trueSean Whitton2018-07-26
| | | | | | | | | | | | | | | | | dgit will always build the source package. One minor consequence is that dgit will usualliy generate *_multi.changes rather than *_$arch.changes, so we need to update the one test that makes the contrary assumption. Bump the dgit major version number as this is quite a significant change in implementation and also a behavioural change. This change makes a lot of code dead. Removing that is left as a task for the future. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Rename --ignore-dirty to --include-dirtyIan Jackson2018-07-26
| | | | | | Leaving the old name supported as a deprecated alias. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document some recent changesIan Jackson2018-07-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* messages: Be a lot more friendly about NEW in particularIan Jackson2018-07-25
| | | | | | And also add a couple of `please's. Closes:#904448. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* apt-get method: when apt does not update release files, print hintIan Jackson2018-07-23
| | | | | | | | | | | | Unconditionally print hint about noatime. This problem seems to occur quite rarely (noatime is out of fashion nowadays, and I haven't seen any other causes) so it doesn't seem worth fiddling about writing code to determine the mount options. Instead, print a hint and let the user investigate. Closes:#851873. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: unset VISUAL, which interferes.Ian Jackson2018-07-23
| | | | | | Closes:#904308. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.11Ian Jackson2018-07-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.10debian/5.10archive/debian/5.10Ian Jackson2018-07-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* infrastructure: Run git gc --auto before mirroring. Closes:#841414.Ian Jackson2018-07-14
| | | | | | | | | | | | This would not have avoided the trouble reported here https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841414#74 Empirically, I managed to work around the problem by running `git gc' (rather than `git gc --auto') and then rsyncing the result to the mirror. I will request that DSA increase the RAM (or swap) size on the relevant host. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Drop a couple of useless test log output lines.Ian Jackson2018-07-14
| | | | | | | We don't need these (((((((((( )))))))))) now that it's just one line inside them. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: rework for merging experimental tests into masterIan Jackson2018-07-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.9+exp4debian/5.9+exp4archive/debian/5.9+exp4Ian Jackson2018-07-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tar up the artifacts, and name the tarball after the testIan Jackson2018-07-13
| | | | | | | | | | | | | | | Naming the output after the test works around #903696. tarring the whole lot up turns out to make it a lot smaller. Before: $ du -sk ; du -sk --apparent-size 1640 . 853 . After: 236 . 235 . Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: chmod a+r $AUTOPKGTEST explicitly.debian/5.9+exp3archive/debian/5.9+exp3Ian Jackson2018-07-13
|
* test suite: Do not save non-world-readable artifactsdebian/5.9+exp2archive/debian/5.9+exp2Ian Jackson2018-07-13
| | | | | | | | | Save things to $AUTOPKGTEST_ARTIFACTS without preserving access control information. Works around #903680. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.9+exp1debian/5.9+exp1archive/debian/5.9+exp1Ian Jackson2018-07-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Save much stuff to $AUTOPKGTEST_ARTIFACTS.Ian Jackson2018-07-12
| | | | | | | | | We take some care to make this of reasonable size. In particular, we delete raw tarballs (typically, IMPORT) and .git's sample hooks. And, we git gc the git trees. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Use dch -r -D sid '' not dch -r sid.Ian Jackson2018-07-12
| | | | | | | | | | | | | | | | | Bizarrely, dch -r [-D suite] runs $EDITOR but dch -r [-D suite] weevils ignores `weevils' but does not run $EDITOR. This is #903598. Apparently, this is well known, and convention is to pass ''. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903598#8. So use that. Closes:#903441. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.9+exp1Ian Jackson2018-07-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.9debian/5.9archive/debian/5.9Ian Jackson2018-07-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): Document best gitk options. Closes:#901927.Ian Jackson2018-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-downstream-dsc(7): New manpage.Ian Jackson2018-07-09
| | | | | | Closes:#842643,#851194. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document reorganisationsIan Jackson2018-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase convert-from-gbp: Add ffq checkIan Jackson2018-07-09
| | | | | | | | | Check that the result will not count as having diverged. This will usually turn failures to make the ff pseudomerge into -fdiverged. Related to #903132. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase convert-from-gbp: Make it ff of dgit view, if we can.Ian Jackson2018-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | Look for dgit-generated tags so we can usually make the new branch ff of the dgit view. Specifically, we fish the most recent released version out of debian/changelog and look for a DISTRO/VSN tag and a corresponding archive/DISTRO/VSN tag. If this all looks good, we declare ff of archive/. This should avoid the need for dgit push --overwrite in most cases. We do not check the DISTRO name. In principle dgit could find the distro name from the suite name, but that makes the software layering quite complicated. (For example, we would have to provide a way to tell gdr what program to run for dgit, for the benefit of the test suite.) I think the current approach is good enough; there are not likely to be any tag pairs that look like the right kind of thing but are in fact something else entirely, so we're not likely to accidentally trash some wanted changes. Closes:#903132. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.9Ian Jackson2018-07-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.8debian/5.8archive/debian/5.8Ian Jackson2018-07-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Improve grammar if one blocking snag.Ian Jackson2018-07-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase new-upstream: Add a -1 revision if the user didn't supply one.Ian Jackson2018-07-07
| | | | | | Closes:#903127. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: status: Reorganise commit reporting.Ian Jackson2018-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | Replace the references to @_ with a hash. Using a hash is much less confusing than all this numerical indexing. Also, \@_ is wrong because there is only one @_, so by the time it is dereference, the commit being printed is the anchor. This is why in #903131 we see branch is unlaundered found mixed upstream/packaging commit (7badba627162337c7057002f37e9a1a593d07d08) abcc6260 Update to upstream 2.9.7 which appears to sugggest that the anchor is a mixed commit. Actually the mixed commit is 7badba627162 but the subsequent message is based on @_ which has different information in it by then. And, set $kcmsg from the main message, not including the commit information. We are the more sophisticated caller mentioned in the previous commmit. Closes: #903131. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit, git-debrebase: Properly make patches with nasty .gitignores.Ian Jackson2018-07-06
| | | | | | | | | | | | | | | | | | | | | | | Specifically: * When running git status --porcelain, pass --ignored so it lists ignored files, and handle the ! output that it then produces. * Add missing -f to a few git add invocations. I have done some greps ('git.*add', 'git.*status', 'porcelain', etc.) to try to find other missed cases and none turned up. git diff is OK because normally we pass two treeish arguments, in which case the ignores are ignored by git diff. When we are asking it to look at the working tree, we are expecting it to ignore untracked files (whether ignored or not), and diff tracked ones, which is what it does. Closes:#903130. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document dgit(1) build unscramblingIan Jackson2018-07-06
| | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> squash! changelog: Document manpage fix