chiark / gitweb /
dgit.git
10 months agoi18n: git-debrebase: Change a lot of die to confess
Ian Jackson [Tue, 2 Oct 2018 12:34:36 +0000 (13:34 +0100)]
i18n: git-debrebase: Change a lot of die to confess

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>
10 months agoDgit.pm: reflog_cache_lookup: Replace `confess' with `die' after exec
Ian Jackson [Tue, 2 Oct 2018 12:31:16 +0000 (13:31 +0100)]
Dgit.pm: reflog_cache_lookup: Replace `confess' with `die' after exec

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>
10 months agochangelog: start 7.0~pre2~
Ian Jackson [Tue, 2 Oct 2018 12:23:01 +0000 (13:23 +0100)]
changelog: start 7.0~pre2~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agochangelog: Finalise 7.0~pre1 archive/debian/7.0_pre1 debian/7.0_pre1
Ian Jackson [Tue, 2 Oct 2018 12:20:41 +0000 (13:20 +0100)]
changelog: Finalise 7.0~pre1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agochangelog: Bump to 7.0~pre1, document changes, send to experimental
Ian Jackson [Tue, 2 Oct 2018 11:27:33 +0000 (12:27 +0100)]
changelog: Bump to 7.0~pre1, document changes, send to experimental

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: make -C po clean all
Ian Jackson [Tue, 2 Oct 2018 11:23:51 +0000 (12:23 +0100)]
i18n: make -C po clean all

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Update README to reflect current situation
Ian Jackson [Mon, 1 Oct 2018 15:08:55 +0000 (16:08 +0100)]
i18n: Update README to reflect current situation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Dgit.pm: mark final batch of messages (2)
Ian Jackson [Mon, 1 Oct 2018 14:28:52 +0000 (15:28 +0100)]
i18n: Dgit.pm: mark final batch of messages (2)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoDgit.pm: parsecontrol: Improve error message for failed open
Ian Jackson [Mon, 1 Oct 2018 14:37:35 +0000 (15:37 +0100)]
Dgit.pm: parsecontrol: Improve error message for failed open

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoDgit.pm: Split here doc for reflog cache commit message (nfc)
Ian Jackson [Mon, 1 Oct 2018 14:32:47 +0000 (15:32 +0100)]
Dgit.pm: Split here doc for reflog cache commit message (nfc)

This will make the translation markup auditable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoDgit.pm: Improve message for control file parse failure
Ian Jackson [Mon, 1 Oct 2018 14:30:20 +0000 (15:30 +0100)]
Dgit.pm: Improve message for control file parse failure

Use fail rather than die.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoDgit.pm: Improve symlink failure message
Ian Jackson [Mon, 1 Oct 2018 14:27:56 +0000 (15:27 +0100)]
Dgit.pm: Improve symlink failure message

Use fail rather than die, and print a newline.  This is used sometimes
to link origs etc.  Hopefully if this fails the user will know why.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoDgit.pm: Replace many die calls with confess
Ian Jackson [Mon, 1 Oct 2018 14:24:18 +0000 (15:24 +0100)]
Dgit.pm: Replace many die calls with confess

As a rule of thumb, anything where we would end up printing the line
number in Dgit.pm is wrong.  Most of these are internal errors or
unexpected syscall failures.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Dgit.pm: mark some of messages (1)
Ian Jackson [Mon, 1 Oct 2018 14:19:19 +0000 (15:19 +0100)]
i18n: Dgit.pm: mark some of messages (1)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoDgit.pm: Improve getcwd failure message
Ian Jackson [Mon, 1 Oct 2018 14:18:31 +0000 (15:18 +0100)]
Dgit.pm: Improve getcwd failure message

Don't print the pointless line number in Dgit.pm.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark final batch of messages (11)
Ian Jackson [Mon, 1 Oct 2018 13:57:20 +0000 (14:57 +0100)]
i18n: dgit: mark final batch of messages (11)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: Split another here doc for commit messages (nfc)
Ian Jackson [Mon, 1 Oct 2018 13:58:16 +0000 (14:58 +0100)]
i18n: dgit: Split another here doc for commit messages (nfc)

This will make the translation markup auditable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: fix import-dsc missing file reference
Ian Jackson [Mon, 1 Oct 2018 13:55:06 +0000 (14:55 +0100)]
dgit: fix import-dsc missing file reference

The message used to say ../ but actually nowadays we look in bpd and
next to the .dsc.  Change it to say .../.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (10)
Ian Jackson [Mon, 1 Oct 2018 13:36:45 +0000 (14:36 +0100)]
i18n: dgit: mark some messages (10)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: Improve some error messages about changes files
Ian Jackson [Mon, 1 Oct 2018 13:38:39 +0000 (14:38 +0100)]
dgit: Improve some error messages about changes files

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: Remove a spurious space (nfc)
Ian Jackson [Mon, 1 Oct 2018 13:32:29 +0000 (14:32 +0100)]
dgit: Remove a spurious space (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: Replace every `die $!;' with confess
Ian Jackson [Mon, 1 Oct 2018 13:11:03 +0000 (14:11 +0100)]
dgit: Replace every `die $!;' with confess

This may improve error messages in case of internal errors etc., at
the cost of producing stack traces when it's just that the user's disk
is full.

This is probably a good tradeoff.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (9)
Ian Jackson [Mon, 1 Oct 2018 13:04:19 +0000 (14:04 +0100)]
i18n: dgit: mark some messages (9)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: Reorganise quilt differences message generation
Ian Jackson [Mon, 1 Oct 2018 13:04:58 +0000 (14:04 +0100)]
i18n: dgit: Reorganise quilt differences message generation

No functional change.
This will make the translation markup auditable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (8)
Ian Jackson [Mon, 1 Oct 2018 12:45:57 +0000 (13:45 +0100)]
i18n: dgit: mark some messages (8)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: Refactor and simplify `quilt fixup cannot be linear' generation
Ian Jackson [Mon, 1 Oct 2018 12:51:05 +0000 (13:51 +0100)]
dgit: Refactor and simplify `quilt fixup cannot be linear' generation

Fold $reportnot into its one call site, and make the print a simple
substitution rather than a complex concatenation.

No functional change.

This will make the translation markup auditable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: Split more here docs for commit messages (nfc)
Ian Jackson [Mon, 1 Oct 2018 12:41:43 +0000 (13:41 +0100)]
i18n: dgit: Split more here docs for commit messages (nfc)

This will make the translation markup auditable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (7)
Ian Jackson [Mon, 1 Oct 2018 12:29:08 +0000 (13:29 +0100)]
i18n: dgit: mark some messages (7)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: Improve some error messages
Ian Jackson [Mon, 1 Oct 2018 12:30:05 +0000 (13:30 +0100)]
dgit: Improve some error messages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: add usage message
Ian Jackson [Mon, 1 Oct 2018 12:26:23 +0000 (13:26 +0100)]
i18n: i18n-diff-auditor: add usage message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: add copyright notice
Ian Jackson [Mon, 1 Oct 2018 12:25:48 +0000 (13:25 +0100)]
i18n: i18n-diff-auditor: add copyright notice

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (6)
Ian Jackson [Sun, 30 Sep 2018 01:38:42 +0000 (02:38 +0100)]
i18n: dgit: mark some messages (6)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (5)
Ian Jackson [Mon, 1 Oct 2018 01:48:06 +0000 (02:48 +0100)]
i18n: dgit: mark some messages (5)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: rearrange some strings to prep for translation
Ian Jackson [Mon, 1 Oct 2018 01:11:21 +0000 (02:11 +0100)]
dgit: rearrange some strings to prep for translation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (4)
Ian Jackson [Mon, 1 Oct 2018 00:14:42 +0000 (01:14 +0100)]
i18n: dgit: mark some messages (4)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agodgit: splitbrain_pseudomerge: Introduce $arch_v (nfc
Ian Jackson [Mon, 1 Oct 2018 00:13:57 +0000 (01:13 +0100)]
dgit: splitbrain_pseudomerge: Introduce $arch_v (nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (3)
Ian Jackson [Sat, 29 Sep 2018 14:56:55 +0000 (15:56 +0100)]
i18n: dgit: mark some messages (3)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (2)
Ian Jackson [Sat, 29 Sep 2018 14:26:02 +0000 (15:26 +0100)]
i18n: dgit: mark some messages (2)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: dgit: mark some messages (1)
Ian Jackson [Sat, 29 Sep 2018 10:43:19 +0000 (11:43 +0100)]
i18n: dgit: mark some messages (1)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix a message
Ian Jackson [Mon, 1 Oct 2018 02:22:52 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: fix a message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: support die -> fail
Ian Jackson [Mon, 1 Oct 2018 02:22:40 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: support die -> fail

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix new invented here doc
Ian Jackson [Mon, 1 Oct 2018 02:22:15 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: fix new invented here doc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: handle invented here doc end differently
Ian Jackson [Mon, 1 Oct 2018 02:05:08 +0000 (03:05 +0100)]
i18n: i18n-diff-auditor: handle invented here doc end differently

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: debugging changes
Ian Jackson [Mon, 1 Oct 2018 02:04:48 +0000 (03:04 +0100)]
i18n: i18n-diff-auditor: debugging changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix here doc regexp
Ian Jackson [Mon, 1 Oct 2018 01:44:00 +0000 (02:44 +0100)]
i18n: i18n-diff-auditor: fix here doc regexp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: Print deleted text
Ian Jackson [Mon, 1 Oct 2018 01:40:20 +0000 (02:40 +0100)]
i18n: i18n-diff-auditor: Print deleted text

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: Make qp global (nfc)
Ian Jackson [Mon, 1 Oct 2018 01:39:47 +0000 (02:39 +0100)]
i18n: i18n-diff-auditor: Make qp global (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: further not exactly debugging improvement
Ian Jackson [Mon, 1 Oct 2018 00:52:56 +0000 (01:52 +0100)]
i18n: i18n-diff-auditor: further not exactly debugging improvement

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: more debugging improvement
Ian Jackson [Mon, 1 Oct 2018 00:45:50 +0000 (01:45 +0100)]
i18n: i18n-diff-auditor: more debugging improvement

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: bugfixes
Ian Jackson [Mon, 1 Oct 2018 00:45:24 +0000 (01:45 +0100)]
i18n: i18n-diff-auditor: bugfixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: Handle some ( __ etc., without +(
Ian Jackson [Mon, 1 Oct 2018 00:06:44 +0000 (01:06 +0100)]
i18n: i18n-diff-auditor: Handle some ( __ etc., without +(

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix `on was non-string' message
Ian Jackson [Sun, 30 Sep 2018 23:47:53 +0000 (00:47 +0100)]
i18n: i18n-diff-auditor: fix `on was non-string' message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: handle "..." strings as arguments to f_
Ian Jackson [Sun, 30 Sep 2018 23:42:40 +0000 (00:42 +0100)]
i18n: i18n-diff-auditor: handle "..." strings as arguments to f_

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix bra and ket regexps
Ian Jackson [Sun, 30 Sep 2018 23:42:22 +0000 (00:42 +0100)]
i18n: i18n-diff-auditor: fix bra and ket regexps

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: ignore space in old "-string only in brackets
Ian Jackson [Sun, 30 Sep 2018 23:34:18 +0000 (00:34 +0100)]
i18n: i18n-diff-auditor: ignore space in old "-string only in brackets

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: add two simple cases
Ian Jackson [Sun, 30 Sep 2018 23:33:01 +0000 (00:33 +0100)]
i18n: i18n-diff-auditor: add two simple cases

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: recognise tail concatenation
Ian Jackson [Sun, 30 Sep 2018 23:28:26 +0000 (00:28 +0100)]
i18n: i18n-diff-auditor: recognise tail concatenation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: tiny debug improvement
Ian Jackson [Sun, 30 Sep 2018 23:28:11 +0000 (00:28 +0100)]
i18n: i18n-diff-auditor: tiny debug improvement

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix striang (de)concatenation
Ian Jackson [Sun, 30 Sep 2018 23:17:20 +0000 (00:17 +0100)]
i18n: i18n-diff-auditor: fix striang (de)concatenation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: understand i_
Ian Jackson [Sun, 30 Sep 2018 22:45:04 +0000 (23:45 +0100)]
i18n: i18n-diff-auditor: understand i_

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: introduce is_trans (nfc)
Ian Jackson [Sun, 30 Sep 2018 22:38:29 +0000 (23:38 +0100)]
i18n: i18n-diff-auditor: introduce is_trans (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: remove a stray print
Ian Jackson [Sun, 30 Sep 2018 22:36:33 +0000 (23:36 +0100)]
i18n: i18n-diff-auditor: remove a stray print

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: improve debug output
Ian Jackson [Sun, 30 Sep 2018 22:35:31 +0000 (23:35 +0100)]
i18n: i18n-diff-auditor: improve debug output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fixes and minor improvements
Ian Jackson [Sun, 30 Sep 2018 22:27:33 +0000 (23:27 +0100)]
i18n: i18n-diff-auditor: fixes and minor improvements

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix multi-arg handling
Ian Jackson [Sun, 30 Sep 2018 20:21:40 +0000 (21:21 +0100)]
i18n: i18n-diff-auditor: fix multi-arg handling

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: more debug
Ian Jackson [Sun, 30 Sep 2018 20:07:42 +0000 (21:07 +0100)]
i18n: i18n-diff-auditor: more debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: fix debug
Ian Jackson [Sun, 30 Sep 2018 20:02:13 +0000 (21:02 +0100)]
i18n: i18n-diff-auditor: fix debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: i18n-diff-auditor: New script for checking i18n work
Ian Jackson [Sun, 30 Sep 2018 19:54:27 +0000 (20:54 +0100)]
i18n: i18n-diff-auditor: New script for checking i18n work

(copied from "play" repo, 67fc89a905d3f922ffb3e33172cd8b8343945b1c)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Provide i_ (identity function, tags for translation)
Ian Jackson [Sat, 29 Sep 2018 12:02:51 +0000 (13:02 +0100)]
i18n: Provide i_ (identity function, tags for translation)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agotest suite: t-expect-fail: Set LANGUAGE too
Ian Jackson [Sat, 29 Sep 2018 10:43:24 +0000 (11:43 +0100)]
test suite: t-expect-fail: Set LANGUAGE too

The user may have this in their environment, in which case we must
squash it too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agotest suite: i18n-messages: Test message translation
Ian Jackson [Sat, 29 Sep 2018 10:23:18 +0000 (11:23 +0100)]
test suite: i18n-messages: Test message translation

We test just one of the messages I provided for en_US.UTF-8.
That's probably sufficient.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agotest suite: New restriction x-dgit-out-of-tree-only
Ian Jackson [Sat, 29 Sep 2018 10:19:45 +0000 (11:19 +0100)]
test suite: New restriction x-dgit-out-of-tree-only

This is filtered out of debian/tests/control, but honoured in-tree.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agotests suite; t-expect-fail: Honour expect_fail_lcmessages
Ian Jackson [Sat, 29 Sep 2018 10:19:02 +0000 (11:19 +0100)]
tests suite; t-expect-fail: Honour expect_fail_lcmessages

No users yet so NFC.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Call po/Makefile directly from debian/rules
Ian Jackson [Sat, 29 Sep 2018 00:50:09 +0000 (01:50 +0100)]
i18n: Call po/Makefile directly from debian/rules

This makefile likes to dirty things quite a bit, since that's how
gettext seems to like to work.  In our call from debian/rules, we
avoid that.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months ago118n: Translate one message as a sample
Ian Jackson [Sat, 29 Sep 2018 00:47:25 +0000 (01:47 +0100)]
118n: Translate one message as a sample

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Start en_US.po
Ian Jackson [Sat, 29 Sep 2018 00:40:47 +0000 (01:40 +0100)]
i18n: Start en_US.po

This is going to be our test/demo translation.
Generated using
  make -C po en_US.po
and then editing these header fields by hand
  PO-Revision-Date
  Last-Translator
  Language-Team

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Generate initial messages.pot
Ian Jackson [Sat, 29 Sep 2018 00:35:27 +0000 (01:35 +0100)]
i18n: Generate initial messages.pot

`make -C po'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: sub prototypes for __ and f_
Ian Jackson [Sat, 29 Sep 2018 10:35:09 +0000 (11:35 +0100)]
i18n: sub prototypes for __ and f_

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Rename ___ to f_
Ian Jackson [Sat, 29 Sep 2018 10:00:22 +0000 (11:00 +0100)]
i18n: Rename ___ to f_

I have decided that's a better name.  Not _f because, unlike
printf (where f is done first, and then print), here the _ is done
first and then f.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Machinery in po/
Ian Jackson [Sat, 29 Sep 2018 00:28:16 +0000 (01:28 +0100)]
i18n: Machinery in po/

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Flag a handful of messages for translation
Ian Jackson [Sat, 29 Sep 2018 00:24:24 +0000 (01:24 +0100)]
i18n: Flag a handful of messages for translation

This is just useful for testing the forthcoming machinery, so far.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Source-level framework: call setlocale, provide __ and ___
Ian Jackson [Sat, 29 Sep 2018 00:20:17 +0000 (01:20 +0100)]
i18n: Source-level framework: call setlocale, provide __ and ___

This is the general plumbing for looking up translated messages - the
consumer-side.  No actual messages are flagged for translation yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agoi18n: Copy po/Makefile and remove-potcdate.plfrom debconf
Ian Jackson [Mon, 30 Jul 2018 06:11:29 +0000 (07:11 +0100)]
i18n: Copy po/Makefile and remove-potcdate.plfrom debconf

These are from debconf.git a326240dd50487732d8546858994d48b45bf0b20.

There doesn't seem to be a common library for this kind of thing.  I'm
going to take debconf as a good example and nick the code.

Copyright: the debian/copyright file of debconf says it's
BSD-2-clause.  So add that, and copyright notices based on "git log"
(which does seem comprehensive).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agochangelog: start 6.13
Ian Jackson [Fri, 28 Sep 2018 17:19:17 +0000 (18:19 +0100)]
changelog: start 6.13

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agochangelog: Finalise 6.12 archive/debian/6.12 debian/6.12
Ian Jackson [Fri, 28 Sep 2018 17:17:23 +0000 (18:17 +0100)]
changelog: Finalise 6.12

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
10 months agotest suite: t-check-only-bpd: Check $tmp/.. not ..
Ian Jackson [Fri, 28 Sep 2018 17:04:03 +0000 (18:04 +0100)]
test suite: t-check-only-bpd: Check $tmp/.. not ..

The test might call t-ok in $p, say, or in $tmp.

The effect of this bug was that in tests where t-ok was called in
$tmp, it looked in $tmp/.. which might contain anything, rather than
$tmp as intended.  That means the test was not effective.

Also it causes a spurious failure of t-import-nonnative in the Ubuntu
CI infrastructure, where $AUTOPKGTEST_TMP/../autopkgtest-satdep.deb
happens to exist.

Reported-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agochangelog: start 6.12
Ian Jackson [Sun, 26 Aug 2018 20:59:12 +0000 (21:59 +0100)]
changelog: start 6.12

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agochangelog: Documentation changes and finalise 6.11 archive/debian/6.11 debian/6.11
Ian Jackson [Sun, 26 Aug 2018 20:57:22 +0000 (21:57 +0100)]
changelog: Documentation changes and finalise 6.11

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agodgit-maint-debrebase(7): Formatting & wording tweaks
Sean Whitton [Sun, 26 Aug 2018 16:24:49 +0000 (09:24 -0700)]
dgit-maint-debrebase(7): Formatting & wording tweaks

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
11 months agodgit-maint-debrebase(7): Avoid some uses of =item
Sean Whitton [Sun, 26 Aug 2018 16:24:13 +0000 (09:24 -0700)]
dgit-maint-debrebase(7): Avoid some uses of =item

Commands for the user to type into their shell should have empty lines
above and below them; this ensures that.  Admittedly while making the
POD source harder to read.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
11 months agodgit-maint-debrebase(7): demote "Inspecting the history"
Sean Whitton [Sun, 26 Aug 2018 16:13:27 +0000 (09:13 -0700)]
dgit-maint-debrebase(7): demote "Inspecting the history"

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
11 months agoDrop obsolete local-pod-man script, now replaced by make %.view
Ian Jackson [Sun, 26 Aug 2018 14:36:32 +0000 (15:36 +0100)]
Drop obsolete local-pod-man script, now replaced by make %.view

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agoMakefile: Adjust scope of dgit(7) pod rule
Ian Jackson [Sat, 30 Jun 2018 20:34:46 +0000 (21:34 +0100)]
Makefile: Adjust scope of dgit(7) pod rule

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agochangelog: start 6.11
Ian Jackson [Sun, 26 Aug 2018 13:59:37 +0000 (14:59 +0100)]
changelog: start 6.11

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agochangelog: finalise 6.10 archive/debian/6.10 debian/6.10
Ian Jackson [Sun, 26 Aug 2018 13:58:24 +0000 (14:58 +0100)]
changelog: finalise 6.10

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agochangelog: Tidy up, preparatory to release
Ian Jackson [Sat, 25 Aug 2018 17:11:40 +0000 (18:11 +0100)]
changelog: Tidy up, preparatory to release

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agochangelog: Run gbp-dch
Ian Jackson [Sat, 25 Aug 2018 16:56:43 +0000 (17:56 +0100)]
changelog: Run gbp-dch

Needs tidying up.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agodgit: Pass --no-source to sbuild (always)
Ian Jackson [Sun, 26 Aug 2018 12:41:22 +0000 (13:41 +0100)]
dgit: Pass --no-source to sbuild (always)

Closes: #904966.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agotest suite: Test dgit build --build=
Ian Jackson [Sun, 26 Aug 2018 12:33:57 +0000 (13:33 +0100)]
test suite: Test dgit build --build=

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
11 months agodgit: build-*: Cope with new-style --build= specifications
Ian Jackson [Sun, 26 Aug 2018 12:28:28 +0000 (13:28 +0100)]
dgit: build-*: Cope with new-style --build= specifications

Previously, we would generally bomb out.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>