diff -Nru pepperflashplugin-nonfree-1.7ubuntu1/debian/changelog pepperflashplugin-nonfree-1.8.2ubuntu1/debian/changelog --- pepperflashplugin-nonfree-1.7ubuntu1/debian/changelog 2014-09-14 12:34:45.000000000 +0000 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/changelog 2016-04-11 07:41:20.000000000 +0000 @@ -1,3 +1,46 @@ +pepperflashplugin-nonfree (1.8.2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. (LP: #1527426) Remaining changes: + - Add support for Ubuntu’s location of Chromium settings. + - Suggest chromium-browser instead of chromium. + - Do not suggest hal. + * Removed changes to update-pepperflashplugin-nonfree. + - Copy settings file to etc/chromium-browser/customiations/ + * Fix hashsum checking for new apt + - Import patch from Debian: #818540. + + -- Mitsuya Shibata Mon, 04 Apr 2016 10:36:42 +0900 + +pepperflashplugin-nonfree (1.8.2) unstable; urgency=medium + + * Added APT::Sandbox::User "root"; Closes: #769740. + * Added '|| true'. Closes: #803349. + + -- Bart Martens Thu, 17 Dec 2015 17:36:19 +0100 + +pepperflashplugin-nonfree (1.8.1) unstable; urgency=medium + + * debian/control: Pre-Depends: ca-certificates. Closes: #773629. + + -- Bart Martens Sun, 21 Dec 2014 11:37:47 +0100 + +pepperflashplugin-nonfree (1.8) unstable; urgency=medium + + * Removed support for /etc/chromium/default. Closes: #760388. + + etc-chromium-default.txt: Removed. + + debian/etc/chromium.d/pepperflashplugin-nonfree: Added. + + debian/dirs: Added etc/chromium.d/. + + debian/install: add file in etc/chromium.d/. + + update-pepperflashplugin-nonfree: Removed dealing with + /etc/chromium/default and /etc/chromium.d. + + debian/control: Conflicts: chromium (<< 37.0.2062.120-4). This package + doesn't really conflict with these old versions of chromium, but it makes + explicit that pepperflashplugin-nonfree isn't useful for versions of + chromium still using /etc/chromium/default, as agreed on debian-release + on Sun, 12 Oct 2014 15:38:03 +0200. + + -- Bart Martens Wed, 22 Oct 2014 07:49:22 +0200 + pepperflashplugin-nonfree (1.7ubuntu1) utopic; urgency=medium * Merge with Debian unstable, remaining change: @@ -98,3 +141,4 @@ * Initial package. Closes: #715245. -- Bart Martens Sun, 07 Jul 2013 22:52:06 +0200 + diff -Nru pepperflashplugin-nonfree-1.7ubuntu1/debian/control pepperflashplugin-nonfree-1.8.2ubuntu1/debian/control --- pepperflashplugin-nonfree-1.7ubuntu1/debian/control 2014-09-14 12:26:29.000000000 +0000 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/control 2016-04-11 07:41:20.000000000 +0000 @@ -4,14 +4,15 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Bart Martens Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://wiki.debian.org/PepperFlashPlayer Package: pepperflashplugin-nonfree Architecture: i386 amd64 -Depends: debconf | debconf-2.0, wget, gnupg, libatk1.0-0, libcairo2, libfontconfig1, libfreetype6, libgcc1, libglib2.0-0, libgtk2.0-0 (>= 2.14), libnspr4, libnss3, libpango-1.0-0 | libpango1.0-0, libstdc++6, libx11-6, libxext6, libxt6, libcurl3-gnutls, binutils, ${misc:Depends}, ${shlibs:Depends}, ca-certificates +Depends: debconf | debconf-2.0, wget, gnupg, libatk1.0-0, libcairo2, libfontconfig1, libfreetype6, libgcc1, libglib2.0-0, libgtk2.0-0 (>= 2.14), libnspr4, libnss3, libpango-1.0-0 | libpango1.0-0, libstdc++6, libx11-6, libxext6, libxt6, libcurl3-gnutls, binutils, ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ca-certificates Suggests: chromium-browser, ttf-mscorefonts-installer, ttf-dejavu, ttf-xfree86-nonfree -Conflicts: libflash-mozplugin +Conflicts: libflash-mozplugin, chromium-browser (<< 37.0.2062.120-4) Description: Pepper Flash Player - browser plugin This package will download Chrome from Google, and unpack it to make the included Pepper Flash Player available for use with Chromium. The end user diff -Nru pepperflashplugin-nonfree-1.7ubuntu1/debian/dirs pepperflashplugin-nonfree-1.8.2ubuntu1/debian/dirs --- pepperflashplugin-nonfree-1.7ubuntu1/debian/dirs 2013-07-09 18:13:11.000000000 +0000 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/dirs 2016-04-11 07:41:20.000000000 +0000 @@ -1,2 +1,4 @@ var/cache/pepperflashplugin-nonfree usr/lib/pepperflashplugin-nonfree +#etc/chromium.d/ +etc/chromium-browser/customizations/ diff -Nru pepperflashplugin-nonfree-1.7ubuntu1/debian/etc/chromium.d/pepperflashplugin-nonfree pepperflashplugin-nonfree-1.8.2ubuntu1/debian/etc/chromium.d/pepperflashplugin-nonfree --- pepperflashplugin-nonfree-1.7ubuntu1/debian/etc/chromium.d/pepperflashplugin-nonfree 1970-01-01 00:00:00.000000000 +0000 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/etc/chromium.d/pepperflashplugin-nonfree 2016-04-11 07:41:09.000000000 +0000 @@ -0,0 +1,3 @@ +flashso="/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" +flashversion=`strings $flashso 2> /dev/null | grep LNX | cut -d ' ' -f 2 | sed -e "s/,/./g"` +CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ppapi-flash-path=$flashso --ppapi-flash-version=$flashversion" diff -Nru pepperflashplugin-nonfree-1.7ubuntu1/debian/install pepperflashplugin-nonfree-1.8.2ubuntu1/debian/install --- pepperflashplugin-nonfree-1.7ubuntu1/debian/install 2013-07-09 18:53:45.000000000 +0000 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/install 2016-04-11 07:41:20.000000000 +0000 @@ -1,3 +1,4 @@ update-pepperflashplugin-nonfree usr/sbin/ pubkey-google.txt usr/lib/pepperflashplugin-nonfree/ -etc-chromium-default.txt usr/lib/pepperflashplugin-nonfree/ +#debian/etc/chromium.d/pepperflashplugin-nonfree etc/chromium.d/ +debian/etc/chromium.d/pepperflashplugin-nonfree etc/chromium-browser/customizations/ diff -Nru pepperflashplugin-nonfree-1.7ubuntu1/etc-chromium-default.txt pepperflashplugin-nonfree-1.8.2ubuntu1/etc-chromium-default.txt --- pepperflashplugin-nonfree-1.7ubuntu1/etc-chromium-default.txt 2014-09-14 11:06:57.000000000 +0000 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/etc-chromium-default.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ - -# part for pepperflashplugin-nonfree : begin - -flashso="/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" - -if [ -f $flashso ] -then - flashversion=`strings $flashso 2> /dev/null | grep LNX | cut -d ' ' -f 2 | sed -e "s/,/./g"` - CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ppapi-flash-path=$flashso --ppapi-flash-version=$flashversion" -fi - -# part for pepperflashplugin-nonfree : end - diff -Nru pepperflashplugin-nonfree-1.7ubuntu1/update-pepperflashplugin-nonfree pepperflashplugin-nonfree-1.8.2ubuntu1/update-pepperflashplugin-nonfree --- pepperflashplugin-nonfree-1.7ubuntu1/update-pepperflashplugin-nonfree 2014-09-14 12:22:56.000000000 +0000 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/update-pepperflashplugin-nonfree 2016-04-11 07:41:20.000000000 +0000 @@ -161,6 +161,7 @@ Dir "."; Dir::Etc::trusted "pubring.gpg"; Debug::NoLocking "true"; + APT::Sandbox::User "root"; EOF arch=`dpkg --print-architecture` @@ -172,7 +173,12 @@ gpg --quiet --no-permission-warning --homedir "etc/apt" --import /usr/lib/pepperflashplugin-nonfree/pubkey-google.txt [ "$verbose" != "yes" ] || echo "doing apt-get update on google repository" - stdouterr=`APT_CONFIG=apt.conf apt-get --quiet --quiet update 2>&1` + stdouterr=`APT_CONFIG=apt.conf apt-get --quiet --quiet update 2>&1 || true` + warning_ck=`echo ${stdouterr} |grep "^W\:"` || [ "$verbose" != "yes" ] || echo "no 'apt-get update' warning" + if [ "${warning_ck}" != "" ]; then + echo "WARNING: $stdouterr" + stdouterr="" + fi [ "$stdouterr" = "" ] || die_hard_with_a_cleanup "failed to retrieve status information from google : $stdouterr" newchromeversion=`APT_CONFIG=apt.conf apt-cache show google-chrome-$variant | grep "^Version: " | sed -e "s,^Version: ,,"` @@ -180,6 +186,7 @@ deburl="http://dl.google.com/linux/chrome/deb/$poolfile" debfile=`echo $poolfile|sed -e "s,.*/,,"` debsize=`APT_CONFIG=apt.conf apt-cache show google-chrome-$variant | grep "^Size: " | sed -e "s,^Size: ,,"` + debsha256=`APT_CONFIG=apt.conf apt-cache show google-chrome-$variant | grep "^SHA256: " | sed -e "s,^SHA256: ,,"` debsha1=`APT_CONFIG=apt.conf apt-cache show google-chrome-$variant | grep "^SHA1: " | sed -e "s,^SHA1: ,,"` debmd5=`APT_CONFIG=apt.conf apt-cache show google-chrome-$variant | grep "^MD5sum: " | sed -e "s,^MD5sum: ,,"` @@ -205,24 +212,6 @@ fi fi -remove_pepper_from_chromium_config() -{ - if [ -f /etc/chromium/default ] - then - cat /etc/chromium/default \ - | sed -e "/^# part for pepperflashplugin-nonfree : begin$/,/^# part for pepperflashplugin-nonfree : end$/d" \ - > /etc/chromium/default.NEW - mv /etc/chromium/default.NEW /etc/chromium/default - fi - if [ -f /etc/chromium-browser/default ] - then - cat /etc/chromium-browser/default \ - | sed -e "/^# part for pepperflashplugin-nonfree : begin$/,/^# part for pepperflashplugin-nonfree : end$/d" \ - > /etc/chromium-browser/default.NEW - mv /etc/chromium-browser/default.NEW /etc/chromium-browser/default - fi -} - case "$ACTION" in --install) @@ -252,6 +241,7 @@ HOME=/root wget $wgetoptions $deburl || die_hard_with_a_cleanup "wget failed to download $deburl" [ `stat --format=%s $debfile` = "$debsize" ] || die_hard_with_a_cleanup "rejecting $debfile : wrong size" + [ `sha256sum $debfile|sed -e "s, .*,,"` = "$debsha256" ] || die_hard_with_a_cleanup "rejecting $debfile : wrong sha256sum" [ `sha1sum $debfile|sed -e "s, .*,,"` = "$debsha1" ] || die_hard_with_a_cleanup "rejecting $debfile : wrong sha1sum" [ `md5sum $debfile|sed -e "s, .*,,"` = "$debmd5" ] || die_hard_with_a_cleanup "rejecting $debfile : wrong md5sum" fi @@ -284,34 +274,6 @@ [ "$verbose" != "yes" ] || echo "end of action $ACTION" - if [ -d /etc/chromium.d ] - then - [ "$verbose" != "yes" ] || echo "remove_pepper_from_chromium_config" - remove_pepper_from_chromium_config - - [ "$verbose" != "yes" ] || echo "adding file to /etc/chromium.d" - cp -f /usr/lib/pepperflashplugin-nonfree/etc-chromium-default.txt /etc/chromium.d/pepperflashplugin-nonfree - - elif [ -f /etc/chromium/default ] - then - [ "$verbose" != "yes" ] || echo "remove_pepper_from_chromium_config" - remove_pepper_from_chromium_config - - [ "$verbose" != "yes" ] || echo "updating /etc/chromium/default" - grep -q pepperflashplugin-nonfree /etc/chromium/default \ - || cat /usr/lib/pepperflashplugin-nonfree/etc-chromium-default.txt >> /etc/chromium/default - elif [ -f /etc/chromium-browser/default ] - then - [ "$verbose" != "yes" ] || echo "remove_pepper_from_chromium_config" - remove_pepper_from_chromium_config - - [ "$verbose" != "yes" ] || echo "updating /etc/chromium-browser/default" - grep -q pepperflashplugin-nonfree /etc/chromium-browser/default \ - || cat /usr/lib/pepperflashplugin-nonfree/etc-chromium-default.txt >> /etc/chromium-browser/default - else - [ "$verbose" != "yes" ] || echo "cannot configure chromium to use pepperflashplugin-nonfree" 1>&2 - fi - ls -1t /var/cache/pepperflashplugin-nonfree/*.deb|tail -n +3|xargs -r rm || true ;; @@ -323,9 +285,6 @@ rm -f /usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so rm -f /usr/lib/pepperflashplugin-nonfree/manifest.json - [ "$verbose" != "yes" ] || echo "remove_pepper_from_chromium_config" - remove_pepper_from_chromium_config - [ "$verbose" != "yes" ] || echo "end of action $ACTION" ;;