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

[Thibaud ECAROT]

My little and first correction and contribution

[lp:~thibaud-ecarot/ubuntu/precise/icedtea-web/lp-945699]

40. By Thibaud ECAROT on 2012-03-04

update changelog message

[Micah Gersten (micahg)]

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

review: Approve

=== modified file 'debian/PLUGIN7.postinst.in'
--- debian/PLUGIN7.postinst.in	2012-03-03 12:35:35 +0000
+++ debian/PLUGIN7.postinst.in	2012-03-04 01:34:17 +0000
@@ -25,7 +25,7 @@
 	    fi
 
             if [ -n "$multiarch" ] && [ -n "$2" ]; then
-                if [ -n $(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$old_basedir/)" ]; then
+                if [ -n "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$old_basedir/)" ]; then
 		    update-alternatives --remove $browser-javaplugin.so $OLD_PLUGINPTH || true
                 fi
 	    fi
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-03 12:35:35 +0000
+++ debian/changelog	2012-03-04 01:34:17 +0000
@@ -1,3 +1,9 @@
+icedtea-web (1.2~pre3-1ubuntu2) precise; urgency=low
+
+  * debian/PLUGIN7.postinst.in: fix quoting issue LP: #945699 
+
+ -- Thibaud Ecarot <[e-mail]>  Sun, 04 Mar 2012 00:48:45 +0100
+
 icedtea-web (1.2~pre3-1ubuntu1) precise; urgency=low
 
   * Regenerate the control file.