Ubuntu
ubuntu-defaults-builder package

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

  1. Precise (12.04)
  2. remove-quotes-from-firefox-bookmarks-titles
  3. Merge into precise
Proposed by Mantas Kriaučiūnas
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~baltix/ubuntu/precise/ubuntu-defaults-builder/remove-quotes-from-firefox-bookmarks-titles
Merge into: lp:ubuntu/precise/ubuntu-defaults-builder
Diff against target: 168 lines (+75/-14)
4 files modified
bin/dh_ubuntu_defaults (+1/-1)
bin/ubuntu-defaults-image (+20/-2)
debian/changelog (+33/-0)
lib/language-support-hook (+21/-11)
To merge this branch: bzr merge lp:~baltix/ubuntu/precise/ubuntu-defaults-builder/remove-quotes-from-firefox-bookmarks-titles
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Dimitri John Ledkov Needs Resubmitting
Sebastien Bacher Needs Fixing
Review via email: mp+137107@code.launchpad.net

Description of the change

 * 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)

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

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!

Revision history for this message
Sebastien Bacher (seb128) wrote :

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

review: Needs Fixing
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

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
Revision history for this message
Martin Pitt (pitti) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
370370
371 foreach (@lines) {371 foreach (@lines) {
372 my ($url, $name) = split /\s+/, $_, 2;372 my ($url, $name) = split /\s+/, $_, 2;
373 print $file "item.$count.title=\"$name\"373 print $file "item.$count.title=$name
374item.$count.link=$url374item.$count.link=$url
375";375";
376 ++$count;376 ++$count;
377377
=== 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 @@
176$SUDO lb clean176$SUDO lb clean
177rm -f .stage/config177rm -f .stage/config
178178
179SUITE="$SUITE" PROJECT="$FLAVOUR" ARCH="$ARCH" \179SUITE="$SUITE" PROJECT="$FLAVOUR" ARCH="$ARCH" LB_ARCHITECTURES="$ARCH" \
180 IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid lb config180 IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid lb config
181181
182if [ "$COMPONENTS" ]; then182if [ "$COMPONENTS" ]; then
@@ -235,11 +235,26 @@
235cat <<EOF > config/binary_local-hooks/rename-kernel235cat <<EOF > config/binary_local-hooks/rename-kernel
236#!/bin/sh -e236#!/bin/sh -e
237if [ ! -e binary/casper/initrd.lz ]; then237if [ ! -e binary/casper/initrd.lz ]; then
238 echo "\$0: Renaming initramfs to initrd.lz..."
238 zcat binary/casper/initrd.img-* | lzma -c > binary/casper/initrd.lz239 zcat binary/casper/initrd.img-* | lzma -c > binary/casper/initrd.lz
239 rm binary/casper/initrd.img-*240 rm binary/casper/initrd.img-*
240fi241fi
241if [ ! -e binary/casper/vmlinuz ]; then242if [ ! -e binary/casper/vmlinuz ]; then
242 mv binary/casper/vmlinuz-* binary/casper/vmlinuz243 echo "\$0: Renaming kernel to vmlinuz..."
244 # This will go wrong if there's ever more than one vmlinuz-* after
245 # excluding *.efi.signed. We can deal with that if and when it arises.
246 for x in binary/casper/vmlinuz-*; do
247 case \$x in
248 *.efi.signed)
249 ;;
250 *)
251 mv \$x binary/casper/vmlinuz
252 if [ -e "\$x.efi.signed" ]; then
253 mv \$x.efi.signed binary/casper/vmlinuz.efi
254 fi
255 ;;
256 esac
257 done
243fi258fi
244EOF259EOF
245260
@@ -248,8 +263,11 @@
248#!/bin/sh -e263#!/bin/sh -e
249LOC=chroot/usr/share/$PACKAGENAME/language.txt264LOC=chroot/usr/share/$PACKAGENAME/language.txt
250if [ -e "\$LOC" ]; then265if [ -e "\$LOC" ]; then
266 echo "\$0: \$LOC exists, setting gfxboot default language..."
251 cp "\$LOC" binary/isolinux/lang267 cp "\$LOC" binary/isolinux/lang
252 echo >> binary/isolinux/lang268 echo >> binary/isolinux/lang
269else
270 echo "\$0: \$LOC does not exist, not setting gfxboot default language"
253fi271fi
254EOF272EOF
255273
256274
=== 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 @@
1ubuntu-defaults-builder (0.31.3) precise-proposed; urgency=low
2
3 * /bin/dh_ubuntu_defaults: Removed quotes (\") from Firefox bookmarks titles
4 (function write_bookmarks, line 'print $file "item.$count.title=\"$name\"')
5
6 -- Mantas Kriaučiūnas <mantas@akl.lt> Thu, 29 Nov 2012 12:16:38 +0200
7
8ubuntu-defaults-builder (0.31.2) precise-proposed; urgency=low
9
10 * bin/ubuntu-defaults-image: If a *.efi.signed kernel image is present,
11 copy it to binary/casper/vmlinuz.efi (LP: #1075181).
12
13 -- Colin Watson <cjwatson@ubuntu.com> Mon, 12 Nov 2012 17:23:31 +0000
14
15ubuntu-defaults-builder (0.31.1) precise-proposed; urgency=low
16
17 * bin/ubuntu-defaults-image: Pass LB_ARCHITECTURES as well, to fix --arch.
18 Thanks Nobuto MURATA for the patch! (LP: #1016121)
19
20 -- Martin Pitt <martin.pitt@ubuntu.com> Sat, 06 Oct 2012 19:12:40 +0200
21
22ubuntu-defaults-builder (0.31) precise-proposed; urgency=low
23
24 * bin/ubuntu-defaults-image: Add some logging to hooks.
25 * lib/language-support-hook: Do not remove language support packages for
26 requested languages. Some language support packages are needed by
27 several languages (most notably poppler-data), so we must not remove
28 those, otherwise we will also remove reverse dependencies. E. g.
29 ubuntu-defaults-zh-cn depends on poppler-data, which we removed before as
30 poppler-data is _also_ a support package for -pt and -en. (LP: #988836)
31
32 -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 26 Apr 2012 15:35:02 +0200
33
1ubuntu-defaults-builder (0.30) precise; urgency=low34ubuntu-defaults-builder (0.30) precise; urgency=low
235
3 * bin/dh_ubuntu_defaults: Add (undocumented) --disable-restrictions option.36 * bin/dh_ubuntu_defaults: Add (undocumented) --disable-restrictions option.
437
=== 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 @@
66
7REQUESTED_LANGUAGES=/usr/share/#DEFAULTS_PACKAGE#/langpacks.txt7REQUESTED_LANGUAGES=/usr/share/#DEFAULTS_PACKAGE#/langpacks.txt
8INSTALLED_LANGUAGES=/root/installed_languages8INSTALLED_LANGUAGES=/root/installed_languages
9NOREMOVE_PACKAGES=/root/noremove_packages
910
10echo 'P: Configuring language support...'11echo 'P: Configuring language support...'
1112
@@ -16,21 +17,30 @@
1617
1718
18# determine installed languages19# determine installed languages
19trap "rm -f $INSTALLED_LANGUAGES" 0 HUP INT ABRT FPE PIPE TERM20trap "rm -f $INSTALLED_LANGUAGES $NOREMOVE_PACKAGES" 0 HUP INT ABRT FPE PIPE TERM
20dpkg -l 'language-pack-*'|perl -ne 'if (/^ii\s+.*language-pack-((?:zh-)?[a-z]+)\s/) { print "$1\n" }' | sort -u > $INSTALLED_LANGUAGES21dpkg -l 'language-pack-*'|perl -ne 'if (/^ii\s+.*language-pack-((?:zh-)?[a-z]+)\s/) { print "$1\n" }' | sort -u > $INSTALLED_LANGUAGES
2122
22REMOVE_LANGUAGES=`join -j 1 -v 1 $INSTALLED_LANGUAGES $REQUESTED_LANGUAGES`23remove=`join -j 1 -v 1 $INSTALLED_LANGUAGES $REQUESTED_LANGUAGES`
2324installed=`xargs < $INSTALLED_LANGUAGES`
24echo -n 'requested: '25requested=`sed "s/ complete/(complete)/" < "$REQUESTED_LANGUAGES" | xargs`
25sed "s/ complete/(complete)/" < "$REQUESTED_LANGUAGES" | xargs26
26echo -n 'installed: '27# determine installed packages for requested languages
27xargs < $INSTALLED_LANGUAGES28for lang in $requested; do
29 check-language-support --show-installed -l $lang | xargs -n1 >> $NOREMOVE_PACKAGES
30done
31
32echo "requested: $requested"
33echo "installed: $installed"
28echo -n 'to remove: '34echo -n 'to remove: '
29echo "$REMOVE_LANGUAGES" | xargs35echo "$remove" | xargs
3036
31# removal37# removal
32for lang in $REMOVE_LANGUAGES; do38for lang in $remove; do
33 pkgs=`check-language-support --show-installed -l $lang`39 pkgs=`check-language-support --show-installed -l $lang | xargs -n1`
40 # above list might contain packages which are also needed by the languages
41 # we want to install/keep (e. g. poppler-data is needed by many languages),
42 # so filter those out
43 pkgs=`echo "$pkgs" | join -j1 -v1 - $NOREMOVE_PACKAGES | xargs`
34 echo "P: Removing packages for language $lang: $pkgs"44 echo "P: Removing packages for language $lang: $pkgs"
35 $TEST apt-get -y -q purge $pkgs45 $TEST apt-get -y -q purge $pkgs
36done46done
@@ -39,7 +49,7 @@
39# note that we iterate through all requested languages, instead of just49# note that we iterate through all requested languages, instead of just
40# computing the delta between requested and installed; this will catch50# computing the delta between requested and installed; this will catch
41# languages which are already installed, but without complete support51# languages which are already installed, but without complete support
42(cat "$REQUESTED_LANGUAGES"; echo) | while read lang complete; do52echo "$requested" | while read lang complete; do
43 [ -n "$lang" ] || continue53 [ -n "$lang" ] || continue
44 pkgs=`check-language-support -l $lang`54 pkgs=`check-language-support -l $lang`
45 if [ "$complete" != "complete" ]; then55 if [ "$complete" != "complete" ]; then

Subscribers

People subscribed via source and target branches