[Pkg-chromium-commit] [pkg-chromium] 01/02: release 43.0.2357.81-1

[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 10f53498d173e081031ee686a1820147c59e33be
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Wed Jun 17 02:46:30 2015 +0000

    release 43.0.2357.81-1
---
 debian/{README => README.debian}     |  0
 debian/changelog                     |  8 ++++++++
 debian/clean                         |  3 +++
 debian/copyright                     | 17 +++++++++++++++++
 debian/patches/disable/hotword.patch | 13 +++++++++++++
 debian/patches/series                |  2 +-
 debian/rules                         | 25 ++++++++++---------------
 7 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/debian/README b/debian/README.debian
similarity index 100%
rename from debian/README
rename to debian/README.debian
diff --git a/debian/changelog b/debian/changelog
index 941f03d..56e79f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+chromium-browser (43.0.2357.81-1) unstable; urgency=medium
+
+  * New upstream release fixing missing icon (closes: #786490).
+  * Disable hotword (closes: #786909).
+  * Remove some sourceless files.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Mon, 15 Jun 2015 04:04:34 +0000
+
 chromium-browser (43.0.2357.65-1) unstable; urgency=medium
 
   * New upstream stable release:
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..b6394b9
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+*.pyc
+Makefile
+third_party/flot/*.js
diff --git a/debian/copyright b/debian/copyright
index 225de08..f61a605 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,23 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Source: http://www.chromium.org/Home
 Upstream-Name: chromium
+Files-Excluded:
+ .gn
+ .DEPS.git
+ .clang-format
+ *.mk
+ *.swf
+ *config.sub
+ *config.guess
+ *jquery*.min.js
+ native_client/NOTICE
+ third_party/bidichecker
+ third_party/swig/linux
+ third_party/flot/*.js
+ third_party/webgl/src/sdk
+ third_party/webgl/src/other
+ third_party/libsrtp/srtp/doc/rfc3711.txt
+ third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
 
 Files: debian/*
 Copyright:
diff --git a/debian/patches/disable/hotword.patch b/debian/patches/disable/hotword.patch
new file mode 100644
index 0000000..ace072e
--- /dev/null
+++ b/debian/patches/disable/hotword.patch
@@ -0,0 +1,13 @@
+description: disable hotword service, which downloads binary blobs
+bug-debian: http://bugs.debian.org/786909
+
+--- a/chrome/browser/search/hotword_service.cc
++++ b/chrome/browser/search/hotword_service.cc
+@@ -632,6 +632,7 @@ bool HotwordService::IsServiceAvailable(
+ }
+ 
+ bool HotwordService::IsHotwordAllowed() {
++  return false;
+   std::string group = base::FieldTrialList::FindFullName(
+       hotword_internal::kHotwordFieldTrialName);
+   // Allow hotwording by default, and only disable if the field trial has been
diff --git a/debian/patches/series b/debian/patches/series
index 2ced643..3331fd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ manpage.patch
 clang.patch
 
 disable/promo.patch
+disable/hotword.patch
 disable/google-api-warning.patch
 disable/third-party-cookies.patch
 disable/default-browser-warning.patch
@@ -11,4 +12,3 @@ master-preferences.patch
 system-speech.patch
 ps-print.patch
 chromedriver-revision.patch
-
diff --git a/debian/rules b/debian/rules
index 1948ac3..c387bac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,12 +99,6 @@ endif
 flotpaths=/usr/share/javascript/jquery/*min.js \
           /usr/share/javascript/jquery-flot/*min.js \
 
-# files to exclude from the upstream tarball
-excluded=native_client/NOTICE \
-	 third_party/flot/* \
-	 third_party/libsrtp/srtp/doc/rfc3711.txt \
-	 third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api \
-
 %:
 	dh $@ --parallel
 
@@ -140,24 +134,25 @@ override_dh_fixperms:
 	dh_fixperms --exclude chrome-sandbox
 
 override_dh_strip:
-	dh_strip --dbg-package=chromium-dbg
+	dh_strip --dbg-package chromium-dbg
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libjs-jquery libjs-jquery-flot)"
 
 override_dh_auto_clean:
-	rm -rf out Makefile third_party/flot/*
-	find . -name \*.mk -execdir rm -rf {} \;
-	find . -name \*.pyc -execdir rm -rf {} \;
+	rm -rf out
+	dh_auto_clean
 
 ###################### upstream source downloading ############################
 
 url=https://gsdview.appspot.com/chromium-browser-official
-version=$(shell dpkg-parsechangelog --show-field=version | sed s/-.*//)
+version=$(shell dpkg-parsechangelog -S Version | sed s/-.*//)
 tarball=chromium-$(version).tar.xz
 
 get-orig-source:
-	wget -c $(url)/$(tarball) -O ../$(tarball) && \
-	    x=$$(tar tf ../$(tarball) --strip-components=1 | grep -e config\.sub -e config\.guess -e \*.mk) && \
-	    y=$$(for f in $(excluded) $$x; do echo --exclude-file $$f; done) && \
-	    mk-origtargz $$y ../$(tarball)
+	wget -c $(url)/$(tarball) -O ../$(tarball)
+	mk-origtargz ../$(tarball)
+	tar tf ../$(tarball) | sort > ../chromium.upstream
+	tar tf ../chromium-browser_$(version).orig.tar.xz | sort > ../chromium.orig
+	diff -u ../chromium.upstream ../chromium.orig | \
+	    tee ../chromium-browser_$(version).files-removed

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