[Pkg-chromium-commit] [pkg-chromium] 01/03: release 55.0.2883.75-6

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit 0ea367215db688b52c73c4ed670799466fb506b1
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Thu Jan 26 01:41:51 2017 +0000

    release 55.0.2883.75-6
---
 debian/changelog                                   | 10 ++++++++
 debian/clean                                       |  2 ++
 debian/control                                     |  2 ++
 .../{ => fixes}/chromedriver-revision.patch        |  0
 debian/patches/{ => fixes}/glibc2.24.patch         |  0
 debian/patches/{ => fixes}/gpu-timeout.patch       |  0
 debian/patches/{ => fixes}/gtk3theme.patch         |  0
 debian/patches/{ => fixes}/ps-print.patch          |  0
 debian/patches/{ => fixes}/widevine-revision.patch |  0
 .../arm64-toolchain.patch}                         |  0
 debian/patches/{arm64-gn.patch => gn/arm64.patch}  |  0
 .../{build-flags.patch => gn/buildflags.patch}     |  0
 debian/patches/{gn.patch => gn/parallel.patch}     |  0
 debian/patches/series                              | 27 ++++++++++------------
 debian/scripts/chromium                            |  5 ++--
 15 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index babda5f..d10514c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+chromium-browser (55.0.2883.75-6) unstable; urgency=medium
+
+  * Organize patches.
+  * Move widevine package to contrib (closes: #851917).
+  * Conflict with very old versions of libsecret (closes: #838864).
+  * Support --enable-remote-extensions option passed through CHROMIUM_FLAGS
+    (closes: #851927).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 22 Jan 2017 00:47:28 +0000
+
 chromium-browser (55.0.2883.75-5) unstable; urgency=medium
 
   * Fix new lintian warnings.
diff --git a/debian/clean b/debian/clean
index 44bef22..b3ece38 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,5 @@
+debian/files
+
 Makefile
 third_party/flot/*.js
 chrome/test/data/webui/i18n_process_css_test.html
diff --git a/debian/control b/debian/control
index 900f583..1c9cea8 100644
--- a/debian/control
+++ b/debian/control
@@ -105,6 +105,7 @@ Provides:
  gnome-www-browser,
 Conflicts:
  libnettle4,
+ libsecret-1-0 (<< 0.18),
  libgl1-mesa-swx11,
 Description: web browser
  Web browser that aims to build a safer, faster, and more stable internet
@@ -140,6 +141,7 @@ Description: web browser - minimal shell
  (the content shell).
 
 Package: chromium-widevine
+Section: contrib/web
 Architecture: i386 amd64 arm64 armhf
 Depends:
  ${misc:Depends},
diff --git a/debian/patches/chromedriver-revision.patch b/debian/patches/fixes/chromedriver-revision.patch
similarity index 100%
rename from debian/patches/chromedriver-revision.patch
rename to debian/patches/fixes/chromedriver-revision.patch
diff --git a/debian/patches/glibc2.24.patch b/debian/patches/fixes/glibc2.24.patch
similarity index 100%
rename from debian/patches/glibc2.24.patch
rename to debian/patches/fixes/glibc2.24.patch
diff --git a/debian/patches/gpu-timeout.patch b/debian/patches/fixes/gpu-timeout.patch
similarity index 100%
rename from debian/patches/gpu-timeout.patch
rename to debian/patches/fixes/gpu-timeout.patch
diff --git a/debian/patches/gtk3theme.patch b/debian/patches/fixes/gtk3theme.patch
similarity index 100%
rename from debian/patches/gtk3theme.patch
rename to debian/patches/fixes/gtk3theme.patch
diff --git a/debian/patches/ps-print.patch b/debian/patches/fixes/ps-print.patch
similarity index 100%
rename from debian/patches/ps-print.patch
rename to debian/patches/fixes/ps-print.patch
diff --git a/debian/patches/widevine-revision.patch b/debian/patches/fixes/widevine-revision.patch
similarity index 100%
rename from debian/patches/widevine-revision.patch
rename to debian/patches/fixes/widevine-revision.patch
diff --git a/debian/patches/arm64-gcc-toolchain.patch b/debian/patches/gn/arm64-toolchain.patch
similarity index 100%
rename from debian/patches/arm64-gcc-toolchain.patch
rename to debian/patches/gn/arm64-toolchain.patch
diff --git a/debian/patches/arm64-gn.patch b/debian/patches/gn/arm64.patch
similarity index 100%
rename from debian/patches/arm64-gn.patch
rename to debian/patches/gn/arm64.patch
diff --git a/debian/patches/build-flags.patch b/debian/patches/gn/buildflags.patch
similarity index 100%
rename from debian/patches/build-flags.patch
rename to debian/patches/gn/buildflags.patch
diff --git a/debian/patches/gn.patch b/debian/patches/gn/parallel.patch
similarity index 100%
rename from debian/patches/gn.patch
rename to debian/patches/gn/parallel.patch
diff --git a/debian/patches/series b/debian/patches/series
index 097591c..0e3ae3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,28 +1,25 @@
 manpage.patch
+master-preferences.patch
+
+gn/parallel.patch
+gn/buildflags.patch
+
+gn/arm64.patch
+gn/arm64-toolchain.patch
 
 disable/promo.patch
 disable/google-api-warning.patch
 disable/third-party-cookies.patch
 disable/external-components.patch
 
-# gtk3theme.patch
-
-glibc2.24.patch
-
-gn.patch
-ps-print.patch
-gpu-timeout.patch
-build-flags.patch
-master-preferences.patch
-
-widevine-revision.patch
-chromedriver-revision.patch
+fixes/ps-print.patch
+fixes/glibc2.24.patch
+fixes/gpu-timeout.patch
+fixes/widevine-revision.patch
+fixes/chromedriver-revision.patch
 
 system/icu.patch
 system/vpx.patch
 system/nspr.patch
 system/event.patch
 system/ffmpeg.patch
-
-arm64-gcc-toolchain.patch
-arm64-gn.patch
diff --git a/debian/scripts/chromium b/debian/scripts/chromium
index 41817bb..3505d8a 100644
--- a/debian/scripts/chromium
+++ b/debian/scripts/chromium
@@ -60,7 +60,6 @@ export CHROME_VERSION_EXTRA="built on Debian $BUILD_DIST, running on Debian $DIS
 
 want_debug=0
 want_temp_profile=0
-want_remote_extensions=0
 while [ $# -gt 0 ]; do
   case "$1" in
     -h | --help | -help )
@@ -73,7 +72,7 @@ while [ $# -gt 0 ]; do
       want_temp_profile=1
       shift ;;
     --enable-remote-extensions )
-      want_remote_extensions=1
+      CHROMIUM_FLAGS="$CHROMIUM_FLAGS --enable-remote-extensions"
       shift ;;
     -- ) # Stop option prcessing
       shift
@@ -84,7 +83,7 @@ while [ $# -gt 0 ]; do
 done
 
 # Whitelist installed extensions that are specified via --load-extension
-if [ $want_remote_extensions -eq 0 ]; then
+if [ -z "$(echo $CHROMIUM_FLAGS | grep \\-\\-enable-remote-extensions)" ]; then
   export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disable-extensions-except=$(echo $CHROMIUM_FLAGS | tr ' ' \\n | grep \\-\\-load-extension | cut -d= -f2 | tr \\n ,)"
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git