Merge lp:~thibaud-ecarot/ubuntu/precise/icedtea-web/lp-945699 into lp:ubuntu/precise/icedtea-web

Proposed by Thibaud ECAROT
Status: Merged
Merged at revision: 39
Proposed branch: lp:~thibaud-ecarot/ubuntu/precise/icedtea-web/lp-945699
Merge into: lp:ubuntu/precise/icedtea-web
Diff against target: 26 lines (+7/-1)
2 files modified
debian/PLUGIN7.postinst.in (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~thibaud-ecarot/ubuntu/precise/icedtea-web/lp-945699
Reviewer Review Type Date Requested Status
Micah Gersten (community) Approve
Ubuntu branches Pending
Review via email: mp+95768@code.launchpad.net

Description of the change

My little and first correction and contribution

To post a comment you must log in.
40. By Thibaud ECAROT

update changelog message

Revision history for this message
Micah Gersten (micahg) wrote :

Looks good, this is the the same change I applied to the last version which seems to have been dropped.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/PLUGIN7.postinst.in'
2--- debian/PLUGIN7.postinst.in 2012-03-03 12:35:35 +0000
3+++ debian/PLUGIN7.postinst.in 2012-03-04 01:34:17 +0000
4@@ -25,7 +25,7 @@
5 fi
6
7 if [ -n "$multiarch" ] && [ -n "$2" ]; then
8- if [ -n $(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$old_basedir/)" ]; then
9+ if [ -n "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$old_basedir/)" ]; then
10 update-alternatives --remove $browser-javaplugin.so $OLD_PLUGINPTH || true
11 fi
12 fi
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2012-03-03 12:35:35 +0000
16+++ debian/changelog 2012-03-04 01:34:17 +0000
17@@ -1,3 +1,9 @@
18+icedtea-web (1.2~pre3-1ubuntu2) precise; urgency=low
19+
20+ * debian/PLUGIN7.postinst.in: fix quoting issue LP: #945699
21+
22+ -- Thibaud Ecarot <thibaud.ecarot@gmail.com> Sun, 04 Mar 2012 00:48:45 +0100
23+
24 icedtea-web (1.2~pre3-1ubuntu1) precise; urgency=low
25
26 * Regenerate the control file.

Subscribers

People subscribed via source and target branches