Merge lp:~mterry/langpack-o-matic/pam-touch into lp:langpack-o-matic

[Michael Terry]

Add pam to the list of source packages to include in the touch langpacks.

That way we get password prompt translations.

Add pam to the list of source packages to include in the touch langpacks.

That way we get password prompt translations.

[Martin Pitt (pitti)]

I'm afraid that won't last long. These maps are autogenerated via e. g. "./update-touch-packages xenial"; I just ran that (http://bazaar.launchpad.net/~ubuntu-langpack/langpack-o-matic/main/revision/551) but pam isn't amongst those packages. So I suspect we are missing something in the germinate call in http://bazaar.launchpad.net/~ubuntu-langpack/langpack-o-matic/main/view/head:/update-touch-packages ?

review: Needs Fixing

[Martin Pitt (pitti)]

Do you know what's the actual seed for touch RTM 15.04 (aka vivid+overlay PPA)? lp:~ubuntu-desktop/ubuntu-seeds/ubuntu-touch.vivid hasn't been touched in 10 months, and I don't see a 15.04 seed branch on https://code.launchpad.net/ubuntu-seeds . I. e. I don't currently know how to update maps/pkglist-touch-15.04.

So if pam is the *only* missing package, it could be hardcoded into update-touch-packages, but this smells fishy -- we might miss other packages.

[lp:~mterry/langpack-o-matic/pam-touch]

552. By Michael Terry on 2016-02-11

Use required seed too

553. By Michael Terry on 2016-02-11

Merge trunk

554. By Michael Terry on 2016-02-11

Update again?

[Michael Terry (mterry)]

OK, how about this. Adds the required seed. (And drops duplicate touch.)

[lp:~mterry/langpack-o-matic/pam-touch]

555. By Michael Terry on 2016-02-11

Drop change to 15.04

[Martin Pitt (pitti)]

This somehow rings a bell -- I'm fairly sure we started out with "required" indeed, but that pulled in so many translations for packages that users are never going to see on a phone, like util-linux, sysvinit, or sed.

So perhaps let's just add "pam" to a manually maintained whitelist in the update script?

[lp:~mterry/langpack-o-matic/pam-touch]

556. By Michael Terry on 2016-02-11

use whitelist for pam

[Michael Terry (mterry)]

Try this! (with bonus comment for future people in this boat)

[Martin Pitt (pitti)]

Yay, looks fine now. Thank you!

review: Approve

[Martin Pitt (pitti)]

Merged and rolled out into production.

[Łukasz Zemczak (sil2100)]

Hey Martin! The actual seeds for touch vivid-overlay are in our vivid-overlay PPA. Those are not hosted anywhere in a bzr branch as we're doing manual changes to the seeds in the metapackage as per ogra's recommendation. One of the reasons was that ubuntu-touch.vivid is the vivid seed basically, not our overlay one, and only the seeds for the current devel branch should be updated.

So basically if you want to have a look at our seeds, just download ubuntu-touch-meta from the overlay. We're more-or-less in sync with xenial right now, with only a few subtle differences.

[Michael Terry (mterry)]

Lukas, interesting... In this particular case I don't think using the wrong seeds would matter (we're still using these scripts, right?). The wrong seeds would mean we may miss more packages. But this branch should ensure we at least pull in "pam" regardless of the seeds.

[Martin Pitt (pitti)]

@Michael: I just rebuilt the 15.04 touch packages, and they do have Linux-PAM now.

=== modified file 'maps/pkglist-touch-vivid'
--- maps/pkglist-touch-vivid	2016-02-10 22:02:17 +0000
+++ maps/pkglist-touch-vivid	2016-02-11 20:52:55 +0000
@@ -330,6 +330,7 @@
 oxide-qt
 p11-kit
 packagekit
+pam
 pango1.0
 parted
 pay-service
 
=== modified file 'maps/pkglist-touch-wily'
--- maps/pkglist-touch-wily	2015-11-22 18:45:57 +0000
+++ maps/pkglist-touch-wily	2016-02-11 20:52:55 +0000
@@ -419,6 +419,7 @@
 oxide-qt
 p11-kit
 packagekit
+pam
 pango1.0
 parted
 pay-service
 
=== modified file 'maps/pkglist-touch-xenial'
--- maps/pkglist-touch-xenial	2016-02-10 22:02:17 +0000
+++ maps/pkglist-touch-xenial	2016-02-11 20:52:55 +0000
@@ -355,6 +355,7 @@
 oxide-qt
 p11-kit
 packagekit
+pam
 pango1.0
 parted
 pay-service
 
=== modified file 'update-touch-packages'
--- update-touch-packages	2014-08-05 06:02:46 +0000
+++ update-touch-packages	2016-02-11 20:52:55 +0000
@@ -11,6 +11,7 @@
 sound-theme-freedesktop
 totem-pl-parser
 xz"
+WHITELIST="pam"
 
 if [ $# != 1 ]; then
     echo "Usage: $0 <release>" >&2
@@ -39,10 +40,12 @@
 
 # determine list of binary packages in ubuntu-touch seed
 germinate --no-rdepends --no-installer -s ubuntu-touch.$RELEASE -d $RELEASE -a armhf -c main,universe -m http://ports.ubuntu.com/
+# Don't consider 'required' since most of those aren't user visible (but there
+# is a whitelist at the top for anything we want anyway)
 grep -h '^[0-9a-z]' touch sdk-libs minimal touch-core touch-android touch | cut -f1 -d ' ' | grep -v ^language-pack > binaries
 
 # map binaries to sources, generate output
-sources=''
+sources="$WHITELIST"
 for pkg in $(cat binaries); do
     s=${binsrc[$pkg]}
     if ! echo "$s" | grep -qF "$BLACKLIST"; then