diff -Nru flashplugin-nonfree-11.1.102.62ubuntu1/debian/changelog flashplugin-nonfree-11.1.102.62ubuntu2/debian/changelog --- flashplugin-nonfree-11.1.102.62ubuntu1/debian/changelog 2012-02-15 22:30:28.000000000 +0000 +++ flashplugin-nonfree-11.1.102.62ubuntu2/debian/changelog 2012-02-16 21:33:30.000000000 +0000 @@ -1,3 +1,19 @@ +flashplugin-nonfree (11.1.102.62ubuntu2) precise; urgency=low + + * Fix use of dpkg-reconfigure by not using $DPKG_MAINTSCRIPT_ARCH + (LP: #933484) + - debian/flashplugin-installer.postinst.in: renamed from + flashplugin-installer.postinst and replaced $DPKG_MAINTSCRIPT_ARCH + with #ARCH#. + - debian/rules: replace #ARCH# in flashplugin-installer.postinst.in + with $DEB_HOST_ARCH during build. + - debian/flashplugin-installer.prerm: also clean out subdirectories in + /var/cache/flashplugin-installer. + * flashplugin-installer.postinst.in: use "mega" style by default so we + stop filling up log files. (LP: #872723) + + -- Marc Deslauriers Thu, 16 Feb 2012 14:36:37 -0500 + flashplugin-nonfree (11.1.102.62ubuntu1) precise; urgency=low * New upstream release 11.1.102.62 diff -Nru flashplugin-nonfree-11.1.102.62ubuntu1/debian/flashplugin-installer.postinst flashplugin-nonfree-11.1.102.62ubuntu2/debian/flashplugin-installer.postinst --- flashplugin-nonfree-11.1.102.62ubuntu1/debian/flashplugin-installer.postinst 2012-02-15 22:29:33.000000000 +0000 +++ flashplugin-nonfree-11.1.102.62ubuntu2/debian/flashplugin-installer.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -#!/bin/sh - -set -e - -FLASH_VERSION=11.1.102.62 -FILENAME=adobe-flashplugin_${FLASH_VERSION}.orig.tar.gz -SHA256SUM_TGZ="d0945ed14c66d4118373b4dbb204dffe7ca731685b15467fc57b8262e265fa16" -PARTNER_URL=http://archive.canonical.com/pool/partner/a/adobe-flashplugin/$FILENAME - -VARIANTS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons" - -. /usr/share/debconf/confmodule - -# previously : flashplayer10_install_linux_091508.tar.gz and install_flash_player_10_linux/ -# currently : install_flash_player_10_linux.tar.gz and install_flash_player_10_linux/ - -fp_exit_with_error() { - echo $1 - echo "The Flash plugin is NOT installed." - db_fset flashplugin-installer/local seen false - db_fset flashplugin-installer/httpget seen false - db_set flashplugin-installer/httpget false - exit 1 -} - -fp_download_and_unpack() { - - cd /var/cache/flashplugin-installer - - db_get flashplugin-installer/local - if [ -d "$RET" -a -f "$RET"/$FILENAME ]; then - - echo "Installing from local file $RET/$FILENAME" - cp -f -p "$RET"/$FILENAME ${FILENAME}_TEMP - mv -f ${FILENAME}_TEMP $FILENAME - else # no local file - - db_get flashplugin-installer/httpget - if [ "$RET" != "true" ]; then - fp_exit_with_error "download or license refused" - fi - - # use apt proxy - APT_PROXIES=$(apt-config shell \ - http_proxy Acquire::http::Proxy \ - https_proxy Acquire::https::Proxy \ - ftp_proxy Acquire::ftp::Proxy \ - ) - - if [ -n "$APT_PROXIES" ]; then - eval export $APT_PROXIES - fi - - # setting wget options - :> wgetrc - echo "noclobber = off" >> wgetrc - echo "dir_prefix = ." >> wgetrc - echo "dirstruct = off" >> wgetrc - echo "verbose = on" >> wgetrc - echo "progress = dot:default" >> wgetrc - echo "tries = 2" >> wgetrc - - # downloading the plugin - echo "Downloading..." - rm -f $FILENAME - WGETRC=wgetrc wget $PARTNER_URL \ - || fp_exit_with_error "download failed" - rm -f wgetrc - echo "Download done." - - fi # end if local file - - # verify SHA256 checksum of (copied or downloaded) tarball - rm -rf adobe_flashplugin*/ - echo "$SHA256SUM_TGZ $FILENAME" | sha256sum -c > /dev/null 2>&1 \ - || fp_exit_with_error "sha256sum mismatch $FILENAME" - - # unpacking and checking the plugin - tar xzf $FILENAME || fp_exit_with_error "cannot unpack plugin" -} - -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 - update-alternatives --quiet --remove "$p-flashplugin" /var/lib/flashplugin-installer/npwrapper.libflashplayer.so - done - rm -f /var/lib/flashplugin-installer/npwrapper.libflashplayer.so - rm -f /usr/share/ubufox/plugins/npwrapper.libflashplayer.so -fi - -fp_download_and_unpack - -install -m 644 adobe-flashplugin*/"$DPKG_MAINTSCRIPT_ARCH"/libflashplayer.so /usr/lib/flashplugin-installer/ -rm -rf adobe-flashplugin* - -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 - -db_fset flashplugin-installer/local seen false -db_fset flashplugin-installer/httpget seen false -db_set flashplugin-installer/httpget false - -#DEBHELPER# - -exit 0 - -# vim: ts=2 sw=2 diff -Nru flashplugin-nonfree-11.1.102.62ubuntu1/debian/flashplugin-installer.postinst.in flashplugin-nonfree-11.1.102.62ubuntu2/debian/flashplugin-installer.postinst.in --- flashplugin-nonfree-11.1.102.62ubuntu1/debian/flashplugin-installer.postinst.in 1970-01-01 00:00:00.000000000 +0000 +++ flashplugin-nonfree-11.1.102.62ubuntu2/debian/flashplugin-installer.postinst.in 2012-02-16 21:32:16.000000000 +0000 @@ -0,0 +1,118 @@ +#!/bin/sh + +set -e + +FLASH_VERSION=11.1.102.62 +FILENAME=adobe-flashplugin_${FLASH_VERSION}.orig.tar.gz +SHA256SUM_TGZ="d0945ed14c66d4118373b4dbb204dffe7ca731685b15467fc57b8262e265fa16" +PARTNER_URL=http://archive.canonical.com/pool/partner/a/adobe-flashplugin/$FILENAME + +VARIANTS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons" + +. /usr/share/debconf/confmodule + +# previously : flashplayer10_install_linux_091508.tar.gz and install_flash_player_10_linux/ +# currently : install_flash_player_10_linux.tar.gz and install_flash_player_10_linux/ + +fp_exit_with_error() { + echo $1 + echo "The Flash plugin is NOT installed." + db_fset flashplugin-installer/local seen false + db_fset flashplugin-installer/httpget seen false + db_set flashplugin-installer/httpget false + exit 1 +} + +fp_download_and_unpack() { + + cd /var/cache/flashplugin-installer + + db_get flashplugin-installer/local + if [ -d "$RET" -a -f "$RET"/$FILENAME ]; then + + echo "Installing from local file $RET/$FILENAME" + cp -f -p "$RET"/$FILENAME ${FILENAME}_TEMP + mv -f ${FILENAME}_TEMP $FILENAME + else # no local file + + db_get flashplugin-installer/httpget + if [ "$RET" != "true" ]; then + fp_exit_with_error "download or license refused" + fi + + # use apt proxy + APT_PROXIES=$(apt-config shell \ + http_proxy Acquire::http::Proxy \ + https_proxy Acquire::https::Proxy \ + ftp_proxy Acquire::ftp::Proxy \ + ) + + if [ -n "$APT_PROXIES" ]; then + eval export $APT_PROXIES + fi + + # setting wget options + :> wgetrc + echo "noclobber = off" >> wgetrc + echo "dir_prefix = ." >> wgetrc + echo "dirstruct = off" >> wgetrc + echo "verbose = on" >> wgetrc + echo "progress = dot:mega" >> wgetrc + echo "tries = 2" >> wgetrc + + # downloading the plugin + echo "Downloading..." + rm -f $FILENAME + WGETRC=wgetrc wget $PARTNER_URL \ + || fp_exit_with_error "download failed" + rm -f wgetrc + echo "Download done." + + fi # end if local file + + # verify SHA256 checksum of (copied or downloaded) tarball + rm -rf adobe_flashplugin*/ + echo "$SHA256SUM_TGZ $FILENAME" | sha256sum -c > /dev/null 2>&1 \ + || fp_exit_with_error "sha256sum mismatch $FILENAME" + + # unpacking and checking the plugin + tar xzf $FILENAME || fp_exit_with_error "cannot unpack plugin" +} + +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 + update-alternatives --quiet --remove "$p-flashplugin" /var/lib/flashplugin-installer/npwrapper.libflashplayer.so + done + rm -f /var/lib/flashplugin-installer/npwrapper.libflashplayer.so + rm -f /usr/share/ubufox/plugins/npwrapper.libflashplayer.so +fi + +fp_download_and_unpack + +install -m 644 adobe-flashplugin*/#ARCH#/libflashplayer.so /usr/lib/flashplugin-installer/ +rm -rf adobe-flashplugin* + +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 + +db_fset flashplugin-installer/local seen false +db_fset flashplugin-installer/httpget seen false +db_set flashplugin-installer/httpget false + +#DEBHELPER# + +exit 0 + +# vim: ts=2 sw=2 diff -Nru flashplugin-nonfree-11.1.102.62ubuntu1/debian/flashplugin-installer.prerm flashplugin-nonfree-11.1.102.62ubuntu2/debian/flashplugin-installer.prerm --- flashplugin-nonfree-11.1.102.62ubuntu1/debian/flashplugin-installer.prerm 2012-01-18 21:34:52.000000000 +0000 +++ flashplugin-nonfree-11.1.102.62ubuntu2/debian/flashplugin-installer.prerm 2012-02-16 21:16:25.000000000 +0000 @@ -6,7 +6,7 @@ rm -rf /usr/lib/flashplugin-installer/* rm -f /var/lib/flashplugin-installer/* -rm -f /var/cache/flashplugin-installer/* +rm -rf /var/cache/flashplugin-installer/* rm -f /usr/share/ubufox/plugins/libflashplayer.so for p in $VARIANTS; do diff -Nru flashplugin-nonfree-11.1.102.62ubuntu1/debian/rules flashplugin-nonfree-11.1.102.62ubuntu2/debian/rules --- flashplugin-nonfree-11.1.102.62ubuntu1/debian/rules 2012-01-18 21:34:52.000000000 +0000 +++ flashplugin-nonfree-11.1.102.62ubuntu2/debian/rules 2012-02-16 20:53:10.000000000 +0000 @@ -2,3 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk +binary-install/flashplugin-installer:: + cat debian/flashplugin-installer.postinst.in | sed -e 's/#ARCH#/$(DEB_HOST_ARCH)/g' > debian/flashplugin-installer.postinst + +clean:: + rm -f debian/flashplugin-installer.postinst +