Ubuntu

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

Proposed by Mantas Kriaučiūnas on 2012-11-30
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
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 2012-11-30 Approve on 2013-05-21
Dimitri John Ledkov Resubmit on 2013-02-12
Sebastien Bacher Needs Fixing on 2013-02-05
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.
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!

Sebastien Bacher (seb128) wrote :

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

review: Needs Fixing
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: Resubmit
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

1=== modified file 'bin/dh_ubuntu_defaults'
2--- bin/dh_ubuntu_defaults 2012-04-03 07:28:20 +0000
3+++ bin/dh_ubuntu_defaults 2012-11-30 02:26:30 +0000
4@@ -370,7 +370,7 @@
5
6 foreach (@lines) {
7 my ($url, $name) = split /\s+/, $_, 2;
8- print $file "item.$count.title=\"$name\"
9+ print $file "item.$count.title=$name
10 item.$count.link=$url
11 ";
12 ++$count;
13
14=== modified file 'bin/ubuntu-defaults-image'
15--- bin/ubuntu-defaults-image 2012-03-23 10:44:23 +0000
16+++ bin/ubuntu-defaults-image 2012-11-30 02:26:30 +0000
17@@ -176,7 +176,7 @@
18 $SUDO lb clean
19 rm -f .stage/config
20
21-SUITE="$SUITE" PROJECT="$FLAVOUR" ARCH="$ARCH" \
22+SUITE="$SUITE" PROJECT="$FLAVOUR" ARCH="$ARCH" LB_ARCHITECTURES="$ARCH" \
23 IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid lb config
24
25 if [ "$COMPONENTS" ]; then
26@@ -235,11 +235,26 @@
27 cat <<EOF > config/binary_local-hooks/rename-kernel
28 #!/bin/sh -e
29 if [ ! -e binary/casper/initrd.lz ]; then
30+ echo "\$0: Renaming initramfs to initrd.lz..."
31 zcat binary/casper/initrd.img-* | lzma -c > binary/casper/initrd.lz
32 rm binary/casper/initrd.img-*
33 fi
34 if [ ! -e binary/casper/vmlinuz ]; then
35- mv binary/casper/vmlinuz-* binary/casper/vmlinuz
36+ echo "\$0: Renaming kernel to vmlinuz..."
37+ # This will go wrong if there's ever more than one vmlinuz-* after
38+ # excluding *.efi.signed. We can deal with that if and when it arises.
39+ for x in binary/casper/vmlinuz-*; do
40+ case \$x in
41+ *.efi.signed)
42+ ;;
43+ *)
44+ mv \$x binary/casper/vmlinuz
45+ if [ -e "\$x.efi.signed" ]; then
46+ mv \$x.efi.signed binary/casper/vmlinuz.efi
47+ fi
48+ ;;
49+ esac
50+ done
51 fi
52 EOF
53
54@@ -248,8 +263,11 @@
55 #!/bin/sh -e
56 LOC=chroot/usr/share/$PACKAGENAME/language.txt
57 if [ -e "\$LOC" ]; then
58+ echo "\$0: \$LOC exists, setting gfxboot default language..."
59 cp "\$LOC" binary/isolinux/lang
60 echo >> binary/isolinux/lang
61+else
62+ echo "\$0: \$LOC does not exist, not setting gfxboot default language"
63 fi
64 EOF
65
66
67=== modified file 'debian/changelog'
68--- debian/changelog 2012-04-26 11:13:46 +0000
69+++ debian/changelog 2012-11-30 02:26:30 +0000
70@@ -1,3 +1,36 @@
71+ubuntu-defaults-builder (0.31.3) precise-proposed; urgency=low
72+
73+ * /bin/dh_ubuntu_defaults: Removed quotes (\") from Firefox bookmarks titles
74+ (function write_bookmarks, line 'print $file "item.$count.title=\"$name\"')
75+
76+ -- Mantas Kriaučiūnas <mantas@akl.lt> Thu, 29 Nov 2012 12:16:38 +0200
77+
78+ubuntu-defaults-builder (0.31.2) precise-proposed; urgency=low
79+
80+ * bin/ubuntu-defaults-image: If a *.efi.signed kernel image is present,
81+ copy it to binary/casper/vmlinuz.efi (LP: #1075181).
82+
83+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 12 Nov 2012 17:23:31 +0000
84+
85+ubuntu-defaults-builder (0.31.1) precise-proposed; urgency=low
86+
87+ * bin/ubuntu-defaults-image: Pass LB_ARCHITECTURES as well, to fix --arch.
88+ Thanks Nobuto MURATA for the patch! (LP: #1016121)
89+
90+ -- Martin Pitt <martin.pitt@ubuntu.com> Sat, 06 Oct 2012 19:12:40 +0200
91+
92+ubuntu-defaults-builder (0.31) precise-proposed; urgency=low
93+
94+ * bin/ubuntu-defaults-image: Add some logging to hooks.
95+ * lib/language-support-hook: Do not remove language support packages for
96+ requested languages. Some language support packages are needed by
97+ several languages (most notably poppler-data), so we must not remove
98+ those, otherwise we will also remove reverse dependencies. E. g.
99+ ubuntu-defaults-zh-cn depends on poppler-data, which we removed before as
100+ poppler-data is _also_ a support package for -pt and -en. (LP: #988836)
101+
102+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 26 Apr 2012 15:35:02 +0200
103+
104 ubuntu-defaults-builder (0.30) precise; urgency=low
105
106 * bin/dh_ubuntu_defaults: Add (undocumented) --disable-restrictions option.
107
108=== modified file 'lib/language-support-hook'
109--- lib/language-support-hook 2011-08-29 14:36:34 +0000
110+++ lib/language-support-hook 2012-11-30 02:26:30 +0000
111@@ -6,6 +6,7 @@
112
113 REQUESTED_LANGUAGES=/usr/share/#DEFAULTS_PACKAGE#/langpacks.txt
114 INSTALLED_LANGUAGES=/root/installed_languages
115+NOREMOVE_PACKAGES=/root/noremove_packages
116
117 echo 'P: Configuring language support...'
118
119@@ -16,21 +17,30 @@
120
121
122 # determine installed languages
123-trap "rm -f $INSTALLED_LANGUAGES" 0 HUP INT ABRT FPE PIPE TERM
124+trap "rm -f $INSTALLED_LANGUAGES $NOREMOVE_PACKAGES" 0 HUP INT ABRT FPE PIPE TERM
125 dpkg -l 'language-pack-*'|perl -ne 'if (/^ii\s+.*language-pack-((?:zh-)?[a-z]+)\s/) { print "$1\n" }' | sort -u > $INSTALLED_LANGUAGES
126
127-REMOVE_LANGUAGES=`join -j 1 -v 1 $INSTALLED_LANGUAGES $REQUESTED_LANGUAGES`
128-
129-echo -n 'requested: '
130-sed "s/ complete/(complete)/" < "$REQUESTED_LANGUAGES" | xargs
131-echo -n 'installed: '
132-xargs < $INSTALLED_LANGUAGES
133+remove=`join -j 1 -v 1 $INSTALLED_LANGUAGES $REQUESTED_LANGUAGES`
134+installed=`xargs < $INSTALLED_LANGUAGES`
135+requested=`sed "s/ complete/(complete)/" < "$REQUESTED_LANGUAGES" | xargs`
136+
137+# determine installed packages for requested languages
138+for lang in $requested; do
139+ check-language-support --show-installed -l $lang | xargs -n1 >> $NOREMOVE_PACKAGES
140+done
141+
142+echo "requested: $requested"
143+echo "installed: $installed"
144 echo -n 'to remove: '
145-echo "$REMOVE_LANGUAGES" | xargs
146+echo "$remove" | xargs
147
148 # removal
149-for lang in $REMOVE_LANGUAGES; do
150- pkgs=`check-language-support --show-installed -l $lang`
151+for lang in $remove; do
152+ pkgs=`check-language-support --show-installed -l $lang | xargs -n1`
153+ # above list might contain packages which are also needed by the languages
154+ # we want to install/keep (e. g. poppler-data is needed by many languages),
155+ # so filter those out
156+ pkgs=`echo "$pkgs" | join -j1 -v1 - $NOREMOVE_PACKAGES | xargs`
157 echo "P: Removing packages for language $lang: $pkgs"
158 $TEST apt-get -y -q purge $pkgs
159 done
160@@ -39,7 +49,7 @@
161 # note that we iterate through all requested languages, instead of just
162 # computing the delta between requested and installed; this will catch
163 # languages which are already installed, but without complete support
164-(cat "$REQUESTED_LANGUAGES"; echo) | while read lang complete; do
165+echo "$requested" | while read lang complete; do
166 [ -n "$lang" ] || continue
167 pkgs=`check-language-support -l $lang`
168 if [ "$complete" != "complete" ]; then

Subscribers

People subscribed via source and target branches