From b11965c72c10d1f5c24614013cd2358fc9369c71 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 7 Aug 2019 15:58:16 +0100 Subject: [PATCH] Revert "Trick pkgstriptranslations into creating translations tarball with .pot/po but not stripping any .mo translations from the subiquitycore package (by using blacklist section) and ship empty /usr/share/locale directory in the console-conf package. Otherwise, console-conf fails to start on core20 as it needs _a_ translation. However, not sure if one can use translations in console-conf at all." This reverts commit 3c1f8e1d27c3da4113ab6d6bf97b735fbe38325b. Because base tarballs dpkg exclude translations anyway, so this will not work. --- debian/changelog | 11 ----------- debian/console-conf.dirs | 1 - debian/control | 1 - 3 files changed, 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2d86cd7..8a9d4fc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,3 @@ -subiquity (19.08.1.1) eoan; urgency=medium - - * Trick pkgstriptranslations into creating translations tarball with - .pot/po but not stripping any .mo translations from the subiquitycore - package (by using blacklist section) and ship empty /usr/share/locale - directory in the console-conf package. Otherwise, console-conf fails - to start on core20 as it needs _a_ translation. However, not sure if - one can use translations in console-conf at all. - - -- Dimitri John Ledkov Wed, 07 Aug 2019 12:25:43 +0100 - subiquity (19.08.1) eoan; urgency=medium * Fix up debian packaging: diff --git a/debian/console-conf.dirs b/debian/console-conf.dirs index 19f78314..5507f721 100644 --- a/debian/console-conf.dirs +++ b/debian/console-conf.dirs @@ -1,2 +1 @@ -/usr/share/locale /var/lib/console-conf diff --git a/debian/control b/debian/control index d5fadf19..672130b9 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,6 @@ Description: Ubuntu Server Installer Package: subiquitycore Architecture: all -Section: debian-installer Depends: probert, python3-urwid (>= 1.2.1), python3-yaml,