diff -Nru pepperflashplugin-nonfree-1.8.2/debian/changelog pepperflashplugin-nonfree-1.8.2ubuntu1/debian/changelog --- pepperflashplugin-nonfree-1.8.2/debian/changelog 2015-12-18 04:28:21.000000000 +0900 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/changelog 2016-04-04 10:36:50.000000000 +0900 @@ -1,3 +1,16 @@ +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. @@ -28,6 +41,16 @@ -- Bart Martens Wed, 22 Oct 2014 07:49:22 +0200 +pepperflashplugin-nonfree (1.7ubuntu1) utopic; urgency=medium + + * Merge with Debian unstable, remaining change: + - Add support for Ubuntu’s location of Chromium settings. + - Suggest chromium-browser instead of chromium. + - Do not suggest hal. + * Refresh changes to update-pepperflashplugin-nonfree. + + -- Felix Geyer Sun, 14 Sep 2014 14:23:16 +0200 + pepperflashplugin-nonfree (1.7) unstable; urgency=medium * Closes: #761397 : @@ -57,6 +80,21 @@ -- Bart Martens Wed, 10 Sep 2014 06:40:27 +0200 +pepperflashplugin-nonfree (1.5ubuntu2) utopic; urgency=medium + + * Suggest chromium-browser instead of chromium, do not suggest + hal (LP: #1273861). + * Fix root permissions check (LP: #1311936). + + -- Dmitry Shachnev Sun, 27 Jul 2014 09:47:05 +0400 + +pepperflashplugin-nonfree (1.5ubuntu1) utopic; urgency=medium + + * Merge with Debian unstable, remaining change: + - Add support for Ubuntu’s location of Chromium settings. + + -- Dmitry Shachnev Sun, 27 Jul 2014 09:35:25 +0400 + pepperflashplugin-nonfree (1.5) unstable; urgency=low * update-pepperflashplugin-nonfree: Added chrome-beta directory. @@ -70,6 +108,12 @@ -- Bart Martens Sun, 22 Jun 2014 12:25:16 +0200 +pepperflashplugin-nonfree (1.3ubuntu1) trusty; urgency=medium + + * Add support for Ubuntu's location of Chromium settings (LP: #1270815). + + -- Dmitry Shachnev Thu, 23 Jan 2014 13:54:27 +0400 + pepperflashplugin-nonfree (1.3) unstable; urgency=medium * Depends: libpango-1.0-0 | libpango1.0-0, to make it work for stable. @@ -97,3 +141,4 @@ * Initial package. Closes: #715245. -- Bart Martens Sun, 07 Jul 2013 22:52:06 +0200 + diff -Nru pepperflashplugin-nonfree-1.8.2/debian/control pepperflashplugin-nonfree-1.8.2ubuntu1/debian/control --- pepperflashplugin-nonfree-1.8.2/debian/control 2014-12-21 19:40:47.000000000 +0900 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/control 2016-03-21 02:16:11.000000000 +0900 @@ -1,7 +1,8 @@ Source: pepperflashplugin-nonfree Section: contrib/web Priority: optional -Maintainer: Bart Martens +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bart Martens Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 Homepage: http://wiki.debian.org/PepperFlashPlayer @@ -10,8 +11,8 @@ 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} Pre-Depends: ca-certificates -Suggests: chromium, ttf-mscorefonts-installer, ttf-dejavu, ttf-xfree86-nonfree, hal -Conflicts: libflash-mozplugin, chromium (<< 37.0.2062.120-4) +Suggests: chromium-browser, ttf-mscorefonts-installer, ttf-dejavu, ttf-xfree86-nonfree +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.8.2/debian/dirs pepperflashplugin-nonfree-1.8.2ubuntu1/debian/dirs --- pepperflashplugin-nonfree-1.8.2/debian/dirs 2014-10-22 15:07:06.000000000 +0900 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/dirs 2016-03-21 02:22:40.000000000 +0900 @@ -1,3 +1,4 @@ var/cache/pepperflashplugin-nonfree usr/lib/pepperflashplugin-nonfree -etc/chromium.d/ +#etc/chromium.d/ +etc/chromium-browser/customizations/ diff -Nru pepperflashplugin-nonfree-1.8.2/debian/install pepperflashplugin-nonfree-1.8.2ubuntu1/debian/install --- pepperflashplugin-nonfree-1.8.2/debian/install 2014-10-22 15:13:17.000000000 +0900 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/debian/install 2016-03-21 02:18:58.000000000 +0900 @@ -1,3 +1,4 @@ update-pepperflashplugin-nonfree usr/sbin/ pubkey-google.txt usr/lib/pepperflashplugin-nonfree/ -debian/etc/chromium.d/pepperflashplugin-nonfree etc/chromium.d/ +#debian/etc/chromium.d/pepperflashplugin-nonfree etc/chromium.d/ +debian/etc/chromium.d/pepperflashplugin-nonfree etc/chromium-browser/customizations/ diff -Nru pepperflashplugin-nonfree-1.8.2/update-pepperflashplugin-nonfree pepperflashplugin-nonfree-1.8.2ubuntu1/update-pepperflashplugin-nonfree --- pepperflashplugin-nonfree-1.8.2/update-pepperflashplugin-nonfree 2015-12-18 02:28:04.000000000 +0900 +++ pepperflashplugin-nonfree-1.8.2ubuntu1/update-pepperflashplugin-nonfree 2016-04-04 10:34:55.000000000 +0900 @@ -174,6 +174,11 @@ [ "$verbose" != "yes" ] || echo "doing apt-get update on google repository" 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: ,,"` @@ -181,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: ,,"` @@ -235,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