summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: upload 7.0~bpo9+1 to stretch-backportsdebian/7.0_bpo9+1archive/debian/7.0_bpo9+1Sean Whitton2018-10-10
|
* Merge tag 'debian/7.0' into stretch-bpoSean Whitton2018-10-10
|\ | | | | | | | | | | | | | | | | dgit release 7.0 for unstable (sid) [dgit] [dgit distro=debian] # gpg: Signature made Thu 04 Oct 2018 12:36:14 PM MST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
| * changelog: changes for 7.0, and finalisedebian/7.0archive/debian/7.0Ian Jackson2018-10-04
| | | | | | | | | | | | Based on output from gbp-dch. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * make i18nIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: Provide `i18n-update' target in toplevel MakefileIan Jackson2018-10-04
| | | | | | | | | | | | With a convenience alias `i18n'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po: Rename `all-po' target to `pofiles'Ian Jackson2018-10-04
| | | | | | | | | | | | I think this is more conventional. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po4a: Fix reference to nonexistent translated-always targetIan Jackson2018-10-04
| | | | | | | | | | | | | | This -always suffix was replaced with the use of .PHONY during development (and the result squashed), but this one was missed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: merges: Make warnings of lossage less overblownIan Jackson2018-10-04
| | | | | | | | | | | | | | | | In particular, everyone's gdr (if it's new enough) should cope with the generated merged-breakwaters commits. And there are at least a couple of tests now, so the risks of total craziness are lower. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-makepatches7: Test dgit with missing git-debrebaseIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Do not sometimes crash in quilt-fixup if git-debrebase missingIan Jackson2018-10-04
| | | | | | | | | | | | Closes:#910221. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-makepatches7: Fix test for broken git-debrebaseIan Jackson2018-10-04
| | | | | | | | | | | | | | | | | | | | | | dgit should treat git-debrebase not existing the same way as it exiting 7 (which in fact, is the same way it treats it succeeding). We are going to fix that. But first we need to make this test case not expect dgit to break in this situation. To test dgit with an actually *broken* git-debrebase, we specify `false' instead. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * po4a: dummy test case git-debrebase_5.en_US.po: Abolish againIan Jackson2018-10-04
| | | | | | | | | | | | | | Though this was a useful test, and having this in the git history is useful, these files are, now, a distraction. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * po4a: dummy test case git-debrebase_5.en_US.po: Add a stringIan Jackson2018-10-04
| | | | | | | | | | | | | | | | | | | | | | Change just one string for testing. I have verified that when the resulting package is installed, LC_MESSAGES=en_US.UTF-8 man 5 git-debrebase produces a manpage saying `reorganized' where previously it said `reorganised', as expected. Ie the translation machinery works. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * po4a: dummy test case git-debrebase_5.en_US.po: CreateIan Jackson2018-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the result of following the instructions in po4a/README on how to start a translation. For economy I have committed only this one new .po file, even though po4a generated loads and normally a translator would therefore send a PR with one file per document. This is part of testing that the machinery works. It is not practical to make this a proper test case, but I can at least leave records in the git history of how to do things. This change results in that one manpage actually being generated and installed, although it is very similar to the untranslated one. I have verified that unless the translated manpages line in debian/git-debrebase.install is uncommented, the package build now fails, which is reassuring, because it means that when we get a real translation we can't forget to actually ship it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * po4a: Makefile: Honour PO4A and use i18n-common.makeIan Jackson2018-10-04
| | | | | | | | | | | | No functional change unless PO4A is in the environment. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po4a: debian/rules: Install translated documentsIan Jackson2018-10-04
| | | | | | | | | | | | | | | | | | XXX I have tested this by creating a git-debrebase_5.en_US.po containing one translation, forcing -k0 (in list-documents), uncommenting the two .install file entries, installing the resulting package, and asking for Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * po4a: Run po4a to generate .pot files and commit the resultIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po4a: Add a symlink to po/READMEIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po4a: Add a test that po4a.cfg is up to dateIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po4a: Add the translated output to the global .gitignoreIan Jackson2018-10-04
| | | | | | | | | | | | Since that is where it ends up (for path convenience reasons). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po4a: Run `make po4a.cfg' and commit the resultIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po4a: Introduce machineryIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: Update po/README to discuss document translationIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: po/Makefile: Remove some obsolete comment (nfc)Ian Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: Break out i18n-common.make (nfc)Ian Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * packaging: Use dh_missing --fail-missingIan Jackson2018-10-04
| | | | | | | | | | | | | | This will spot if `make install' or similar installs anything that we forgot to put anywhere. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Test that the binary packages can be builtIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: git-debrebase: mark final batch of messages (5)Ian Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: git-debrebase: mark some messages (4)Ian Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: i18n-diff-auditor: Handle printf => print f_Ian Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n, packaging: Add missing build-dependency on xgettextIan Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: git-debrebase: mark some messages (3)Ian Jackson2018-10-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: anchor: Print the anchor, not the breakwater tip (!)Ian Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: git-debrebase: mark some messages (2)Ian Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: i18n-diff-auditor: Handle commentsIan Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: new-upstream: Drop `sleep 2' (!)Ian Jackson2018-10-02
| | | | | | | | | | | | This is leftover debugging code. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Refactor fail_unprocessable message constructionIan Jackson2018-10-02
| | | | | | | | | | | | | | | | Clearer and easier to mark up for translation. No functional change (verified by grepping the test logs). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: git-debrebase: mark some messages (1)Ian Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Replace `git-debrebase:' with `$us:' in bad usage msgIan Jackson2018-10-02
| | | | | | | | | | | | | | This is a different pattern as it is in a translated message, so we change __ to f_. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Replace several `git-debrebase:' with `$us:'Ian Jackson2018-10-02
| | | | | | | | | | | | | | | | | | In ""-strings in as-yet-untranslated messages. This is more proper and more generic and also slightly shorter (although more complex). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Improve two error messagesIan Jackson2018-10-02
| | | | | | | | | | | | | | | | | | Print a proper message for failure to opendir the bpd and for failure to chdir to the toplevel. Doing this now makes the translation markup auditable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: git-debrebase: Change a lot of die to confessIan Jackson2018-10-02
| | | | | | | | | | | | | | | | | | | | | | These are internal errors or unexpected syscall failures. Printing a stack trace is reasonably helpful there. (Also, some of them are in the experimental merge resolution code.) Audited with i18n-diff-auditor; reviewed one questionable change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: reflog_cache_lookup: Replace `confess' with `die' after execIan Jackson2018-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With `confess' after `exec', perl complains Statement unlikely to be reached at /usr/share/perl5/Debian/Dgit.pm line 770. (Maybe you meant system() when you said exec()?) The error message's suggestion is not right here - what is wrong is that confess is not really appropriate in the child in this way. Replace it with die, using a better error string. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: start 7.0~pre2~Ian Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Finalise 7.0~pre1debian/7.0_pre1archive/debian/7.0_pre1Ian Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Bump to 7.0~pre1, document changes, send to experimentalIan Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: make -C po clean allIan Jackson2018-10-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: Update README to reflect current situationIan Jackson2018-10-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * i18n: Dgit.pm: mark final batch of messages (2)Ian Jackson2018-10-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: parsecontrol: Improve error message for failed openIan Jackson2018-10-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>