From 17279822d509cf9940fa99ea306f88bb330302cb Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 20 Aug 2021 09:21:48 +1200 Subject: [PATCH] Get source catalog translations from subiquity git, as brz is in universe. --- checkout-translations-branch | 7 ++++--- debian/changelog | 6 ++++++ debian/control | 1 - live-build/auto/config | 3 +-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/checkout-translations-branch b/checkout-translations-branch index cd235f8b..3a60119a 100755 --- a/checkout-translations-branch +++ b/checkout-translations-branch @@ -3,7 +3,8 @@ set -eux branch=$1 -target="$(readlink -f "${2}")" +dir=$2 +target="$(readlink -f "${3}")" tmpdir="$(mktemp -d)" cd "${tmpdir}" @@ -16,7 +17,7 @@ trap cleanup EXIT mkdir -p $target -bzr branch $branch checkout -for po in checkout/*.po; do +git clone $branch checkout +for po in checkout/$dir/*.po; do msgfmt "${po}" -o "${target}/$(basename "${po}" .po).mo" done diff --git a/debian/changelog b/debian/changelog index e1208435..6c0068e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.735) UNRELEASED; urgency=medium + + * Get source catalog translations from subiquity git, as brz is in universe. + + -- Michael Hudson-Doyle Fri, 20 Aug 2021 09:20:44 +1200 + livecd-rootfs (2.734) impish; urgency=medium [ Ethan Hsieh ] diff --git a/debian/control b/debian/control index ecbec401..4aa37bb9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Architecture: any Depends: ${misc:Depends}, apt-utils, attr, - bzr, debootstrap, distro-info, dosfstools, diff --git a/live-build/auto/config b/live-build/auto/config index 32cebd0b..97a0029e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -812,8 +812,7 @@ case $PROJECT in done /usr/share/livecd-rootfs/checkout-translations-branch \ - lp:~canonical-foundations/subiquity/translations-export \ - config/catalog-translations + https://git.launchpad.net/subiquity po config/catalog-translations ;; *) echo "unrecognized subproject for server: '$SUBPROJECT'"