diff -Nru flashplugin-nonfree-11.1.102.63ubuntu1/debian/changelog flashplugin-nonfree-11.1.102.63ubuntu2/debian/changelog --- flashplugin-nonfree-11.1.102.63ubuntu1/debian/changelog 2012-03-05 14:19:27.000000000 +0000 +++ flashplugin-nonfree-11.1.102.63ubuntu2/debian/changelog 2012-03-12 14:44:15.000000000 +0000 @@ -1,3 +1,13 @@ +flashplugin-nonfree (11.1.102.63ubuntu2) precise; urgency=low + + * Only create symlinks in /usr/lib/mozilla/plugins + - update debian/flashplugin-installer.postinst.in + - update debian/flashplugin-installer.prerm.in + * Don't create a symlink in /usr/share/ubufox/plugins + - update debian/flashplugin-installer.postinst.in + + -- Chris Coulson Mon, 12 Mar 2012 14:36:44 +0000 + flashplugin-nonfree (11.1.102.63ubuntu1) precise; urgency=low * New upstream release 11.1.102.63 diff -Nru flashplugin-nonfree-11.1.102.63ubuntu1/debian/flashplugin-installer.postinst.in flashplugin-nonfree-11.1.102.63ubuntu2/debian/flashplugin-installer.postinst.in --- flashplugin-nonfree-11.1.102.63ubuntu1/debian/flashplugin-installer.postinst.in 2012-03-05 14:35:31.000000000 +0000 +++ flashplugin-nonfree-11.1.102.63ubuntu2/debian/flashplugin-installer.postinst.in 2012-03-12 14:17:24.000000000 +0000 @@ -7,7 +7,7 @@ SHA256SUM_TGZ="ad724b60cae3b8a79fff602f046e57847c287b677afff8acc23284bf51bf7c68" PARTNER_URL=http://archive.canonical.com/pool/partner/a/adobe-flashplugin/$FILENAME -VARIANTS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons" +OLD_VARIANTS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons" . /usr/share/debconf/confmodule @@ -82,7 +82,7 @@ if dpkg --compare-versions "$2" lt 11.1.102.55ubuntu3; then # We now install a native amd64 flash binary, so remove the old # nspluginwrapper alternatives - for p in $VARIANTS; do + for p in $OLD_VARIANTS; do update-alternatives --quiet --remove "$p-flashplugin" /var/lib/flashplugin-installer/npwrapper.libflashplayer.so done rm -f /var/lib/flashplugin-installer/npwrapper.libflashplayer.so @@ -96,16 +96,13 @@ echo "Flash Plugin installed." -for p in $VARIANTS; do - update-alternatives --quiet --install "/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" /usr/lib/flashplugin-installer/libflashplayer.so 50 - # previous versions used update-alternatives --set to force a particular - # value here, which now needs to be cleaned up. We should never use - # u-a --set in a maintainer script. - if dpkg --compare-versions "$2" lt 10.3.183.10ubuntu5; then - update-alternatives --quiet --auto "$p-flashplugin" - fi -done -ln -sf /usr/lib/flashplugin-installer/libflashplayer.so /usr/share/ubufox/plugins +update-alternatives --quiet --install "/usr/lib/mozilla/plugins/flashplugin-alternative.so" "mozilla-flashplugin" /usr/lib/flashplugin-installer/libflashplayer.so 50 +# previous versions used update-alternatives --set to force a particular +# value here, which now needs to be cleaned up. We should never use +# u-a --set in a maintainer script. +if dpkg --compare-versions "$2" lt 10.3.183.10ubuntu5; then + update-alternatives --quiet --auto "mozilla-flashplugin" +fi db_fset flashplugin-installer/local seen false db_fset flashplugin-installer/httpget seen false diff -Nru flashplugin-nonfree-11.1.102.63ubuntu1/debian/flashplugin-installer.prerm flashplugin-nonfree-11.1.102.63ubuntu2/debian/flashplugin-installer.prerm --- flashplugin-nonfree-11.1.102.63ubuntu1/debian/flashplugin-installer.prerm 2012-02-16 21:16:25.000000000 +0000 +++ flashplugin-nonfree-11.1.102.63ubuntu2/debian/flashplugin-installer.prerm 2012-03-12 14:13:22.000000000 +0000 @@ -2,16 +2,12 @@ set -e -VARIANTS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons" - rm -rf /usr/lib/flashplugin-installer/* rm -f /var/lib/flashplugin-installer/* rm -rf /var/cache/flashplugin-installer/* rm -f /usr/share/ubufox/plugins/libflashplayer.so -for p in $VARIANTS; do - update-alternatives --quiet --remove "$p-flashplugin" /usr/lib/flashplugin-installer/libflashplayer.so -done +update-alternatives --quiet --remove "mozilla-flashplugin" /usr/lib/flashplugin-installer/libflashplayer.so #DEBHELPER#