Merge lp:~baltix/ubuntu/precise/ubuntu-defaults-builder/remove-quotes-from-firefox-bookmarks-titles into lp:ubuntu/precise/ubuntu-defaults-builder

[Mantas Kriaučiūnas]

 * Added improvements from 0.31.1 and 0.31.2 versions
 * Removed quotes (\") from Firefox bookmarks titles - file /bin/dh_ubuntu_defaults, line
   print $file "item.$count.title=\"$name\"
   (see debian/changelog for more info)

[Iain Lane (laney)]

Hey,

Thanks for your fix. I think it's probably fine (didn't check building/running), but for stable release updates we need each update to be accompanied by a bug report for testing/validation tracking. Could you please file one with the necessary information and update your debian/changelog to reference it, then link this bug to it?

It'll also need to be fixed for raring too, but no bug needed there (as this it the in-development release), just a branch is fine.

https://wiki.ubuntu.com/StableReleaseUpdates#Procedure

Thank you!

[Sebastien Bacher (seb128)]

settings as needs fixing until the upload is linked to SRU compliant bugs

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

Are you proposing this change for development release (raring) as well?
 * Removed quotes (\") from Firefox bookmarks titles - file /bin/dh_ubuntu_defaults, line
   print $file "item.$count.title=\"$name\"

I'm not entirely sure why the quotes are being removed. Do they look ugly?

Please open a bug report and resubmit for raring first, before doing an SRU.

review: Needs Resubmitting

[Martin Pitt (pitti)]

Thanks for the fix! I merged r145 into current trunk (for saucy); I verified that this indeed works with current Firefox, and removes the quotes from the bookmark menu.

review: Approve

=== modified file 'bin/dh_ubuntu_defaults'
--- bin/dh_ubuntu_defaults	2012-04-03 07:28:20 +0000
+++ bin/dh_ubuntu_defaults	2012-11-30 02:26:30 +0000
@@ -370,7 +370,7 @@
 
     foreach (@lines) {
 	my ($url, $name) = split /\s+/, $_, 2;
-	print $file "item.$count.title=\"$name\"
+	print $file "item.$count.title=$name
 item.$count.link=$url
 ";
 	++$count;

=== modified file 'bin/ubuntu-defaults-image'
--- bin/ubuntu-defaults-image	2012-03-23 10:44:23 +0000
+++ bin/ubuntu-defaults-image	2012-11-30 02:26:30 +0000
@@ -176,7 +176,7 @@
 $SUDO lb clean
 rm -f .stage/config
 
-SUITE="$SUITE" PROJECT="$FLAVOUR" ARCH="$ARCH" \
+SUITE="$SUITE" PROJECT="$FLAVOUR" ARCH="$ARCH" LB_ARCHITECTURES="$ARCH" \
     IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid lb config
 
 if [ "$COMPONENTS" ]; then
@@ -235,11 +235,26 @@
 cat <<EOF > config/binary_local-hooks/rename-kernel
 #!/bin/sh -e
 if [ ! -e binary/casper/initrd.lz ]; then
+    echo "\$0: Renaming initramfs to initrd.lz..."
     zcat binary/casper/initrd.img-* | lzma -c > binary/casper/initrd.lz
     rm binary/casper/initrd.img-*
 fi
 if [ ! -e binary/casper/vmlinuz ]; then
-    mv binary/casper/vmlinuz-* binary/casper/vmlinuz
+    echo "\$0: Renaming kernel to vmlinuz..."
+    # This will go wrong if there's ever more than one vmlinuz-* after
+    # excluding *.efi.signed.  We can deal with that if and when it arises.
+    for x in binary/casper/vmlinuz-*; do
+	case \$x in
+	    *.efi.signed)
+		;;
+	    *)
+		mv \$x binary/casper/vmlinuz
+		if [ -e "\$x.efi.signed" ]; then
+		    mv \$x.efi.signed binary/casper/vmlinuz.efi
+		fi
+		;;
+	esac
+    done
 fi
 EOF
 
@@ -248,8 +263,11 @@
 #!/bin/sh -e
 LOC=chroot/usr/share/$PACKAGENAME/language.txt
 if [ -e "\$LOC" ]; then
+    echo "\$0: \$LOC exists, setting gfxboot default language..."
     cp "\$LOC" binary/isolinux/lang
     echo >> binary/isolinux/lang
+else
+    echo "\$0: \$LOC does not exist, not setting gfxboot default language"
 fi
 EOF
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-26 11:13:46 +0000
+++ debian/changelog	2012-11-30 02:26:30 +0000
@@ -1,3 +1,36 @@
+ubuntu-defaults-builder (0.31.3) precise-proposed; urgency=low
+
+  * /bin/dh_ubuntu_defaults: Removed quotes (\") from Firefox bookmarks titles
+    (function write_bookmarks, line 'print $file "item.$count.title=\"$name\"')
+
+ -- Mantas Kriaučiūnas <[e-mail]>  Thu, 29 Nov 2012 12:16:38 +0200
+
+ubuntu-defaults-builder (0.31.2) precise-proposed; urgency=low
+
+  * bin/ubuntu-defaults-image: If a *.efi.signed kernel image is present,
+    copy it to binary/casper/vmlinuz.efi (LP: #1075181).
+
+ -- Colin Watson <[e-mail]>  Mon, 12 Nov 2012 17:23:31 +0000
+
+ubuntu-defaults-builder (0.31.1) precise-proposed; urgency=low
+
+  * bin/ubuntu-defaults-image: Pass LB_ARCHITECTURES as well, to fix --arch.
+    Thanks Nobuto MURATA for the patch! (LP: #1016121)
+
+ -- Martin Pitt <[e-mail]>  Sat, 06 Oct 2012 19:12:40 +0200
+
+ubuntu-defaults-builder (0.31) precise-proposed; urgency=low
+
+  * bin/ubuntu-defaults-image: Add some logging to hooks.
+  * lib/language-support-hook: Do not remove language support packages for
+    requested languages. Some language support packages are needed by
+    several languages (most notably poppler-data), so we must not remove
+    those, otherwise we will also remove reverse dependencies. E. g. 
+    ubuntu-defaults-zh-cn depends on poppler-data, which we removed before as
+    poppler-data is _also_ a support package for -pt and -en.  (LP: #988836)
+
+ -- Martin Pitt <[e-mail]>  Thu, 26 Apr 2012 15:35:02 +0200
+
 ubuntu-defaults-builder (0.30) precise; urgency=low
 
   * bin/dh_ubuntu_defaults: Add (undocumented) --disable-restrictions option.

=== modified file 'lib/language-support-hook'
--- lib/language-support-hook	2011-08-29 14:36:34 +0000
+++ lib/language-support-hook	2012-11-30 02:26:30 +0000
@@ -6,6 +6,7 @@
 
 REQUESTED_LANGUAGES=/usr/share/#DEFAULTS_PACKAGE#/langpacks.txt
 INSTALLED_LANGUAGES=/root/installed_languages
+NOREMOVE_PACKAGES=/root/noremove_packages
 
 echo 'P: Configuring language support...'
 
@@ -16,21 +17,30 @@
 
 
 # determine installed languages
-trap "rm -f $INSTALLED_LANGUAGES" 0 HUP INT ABRT FPE PIPE TERM
+trap "rm -f $INSTALLED_LANGUAGES $NOREMOVE_PACKAGES" 0 HUP INT ABRT FPE PIPE TERM
 dpkg -l 'language-pack-*'|perl -ne 'if (/^ii\s+.*language-pack-((?:zh-)?[a-z]+)\s/) { print "$1\n" }' | sort -u > $INSTALLED_LANGUAGES
 
-REMOVE_LANGUAGES=`join -j 1 -v 1 $INSTALLED_LANGUAGES $REQUESTED_LANGUAGES`
-
-echo -n 'requested: '
-sed "s/ complete/(complete)/" < "$REQUESTED_LANGUAGES" | xargs
-echo -n 'installed: '
-xargs < $INSTALLED_LANGUAGES
+remove=`join -j 1 -v 1 $INSTALLED_LANGUAGES $REQUESTED_LANGUAGES`
+installed=`xargs < $INSTALLED_LANGUAGES`
+requested=`sed "s/ complete/(complete)/" < "$REQUESTED_LANGUAGES" | xargs`
+
+# determine installed packages for requested languages
+for lang in $requested; do
+    check-language-support --show-installed -l $lang | xargs -n1 >> $NOREMOVE_PACKAGES
+done
+
+echo "requested: $requested"
+echo "installed: $installed"
 echo -n 'to remove: '
-echo "$REMOVE_LANGUAGES" | xargs
+echo "$remove" | xargs
 
 # removal
-for lang in $REMOVE_LANGUAGES; do
-    pkgs=`check-language-support --show-installed -l $lang`
+for lang in $remove; do
+    pkgs=`check-language-support --show-installed -l $lang | xargs -n1`
+    # above list might contain packages which are also needed by the languages
+    # we want to install/keep (e. g. poppler-data is needed by many languages),
+    # so filter those out
+    pkgs=`echo "$pkgs" | join -j1 -v1 - $NOREMOVE_PACKAGES | xargs`
     echo "P: Removing packages for language $lang: $pkgs"
     $TEST apt-get -y -q purge $pkgs
 done
@@ -39,7 +49,7 @@
 # note that we iterate through all requested languages, instead of just
 # computing the delta between requested and installed; this will catch
 # languages which are already installed, but without complete support
-(cat "$REQUESTED_LANGUAGES"; echo) | while read lang complete; do
+echo "$requested" | while read lang complete; do
     [ -n "$lang" ] || continue
     pkgs=`check-language-support -l $lang`
     if [ "$complete" != "complete" ]; then