Merge ~ubuntu-core-dev/grub/+git/ubuntu:translation-template-fix into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 588161a80c1d464b4eb9c6a7a5b6f91193292c33
Proposed branch: ~ubuntu-core-dev/grub/+git/ubuntu:translation-template-fix
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 221 lines (+178/-0)
6 files modified
debian/changelog (+10/-0)
debian/patches/gettext/0001-Support-POTFILES-shell.patch (+54/-0)
debian/patches/gettext/0002-Handle-gettext_printf-shell-function.patch (+46/-0)
debian/patches/gettext/0003-Make-msgfmt-output-in-little-endian.patch (+34/-0)
debian/patches/gettext/0004-Use-SHELL-rather-than-bin-sh.patch (+26/-0)
debian/rules (+8/-0)
Reviewer Review Type Date Requested Status
Julian Andres Klode Approve
Colin Watson Pending
Review via email: mp+382057@code.staging.launchpad.net

Commit message

* debian/patches/gettext,
  debian/patches/rules:
  - backport upstream patches to fix the list of translated strings,
    reported on the ubuntu-translators mailing list. The changes would
    be overwritten by autoreconf so applying from a rules override.

Description of the change

See https://lists.ubuntu.com/archives/ubuntu-translators/2020-April/007636.html

The patches can't be applied from the series since that would be before autoreconf which overrides the local customizations.

There should be no need to tweak the clean target since that's only patching a generated files and dh_autoreconf should already handle restoring the original version

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Sorry for the resubmit, by default launchpad picked Colin's Vcs as target...

Revision history for this message
Julian Andres Klode (juliank) wrote :

Looks OK, I'll merge this together with https://code.launchpad.net/~juliank/grub/+git/ubuntu/+merge/382201 as an upload.

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches