[Pkg-chromium-commit] [pkg-chromium] 01/01: release 32.0.1700.123-3

Michael Gilbert mgilbert at moszumanska.debian.org
Sun Mar 9 22:30:44 UTC 2014 

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

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

commit 40f3c98783b2b16148eb67f4df590bf35b0a8610
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Mar 9 18:29:38 2014 -0400

    release 32.0.1700.123-3
---
 debian/changelog               |  9 +++++++++
 debian/control                 | 22 +++++++++++-----------
 debian/patches/file-5.17.patch | 14 ++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   | 13 +++++++++++++
 5 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7405870..3c8aeab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+chromium-browser (32.0.1700.123-3) unstable; urgency=medium
+
+  * Remove a lot of sourceless files.
+  * Suggest mozplugger (closes: #626400).
+  * Use file's -E option (closes: #740476).
+  * Capitalize Chromium in descriptions (closes: #632928, #715802).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 16 Feb 2014 18:50:06 +0000
+
 chromium-browser (32.0.1700.123-2) unstable; urgency=medium
 
   * Build with system libjs-jquery-flot.
diff --git a/debian/control b/debian/control
index bbb813b..60e5a68 100644
--- a/debian/control
+++ b/debian/control
@@ -78,8 +78,8 @@ Build-Depends:
  libdrm-dev,
  libjs-jquery,
  libjs-excanvas,
- libjs-jquery-tablesorter,
  libjs-jquery-flot | libjs-flot,
+ file (>= 1:5.17),
 Standards-Version: 3.9.5
 
 Package: chromium
@@ -91,6 +91,7 @@ Depends:
  xdg-utils,
  chromium-inspector,
 Suggests:
+ mozplugger,
  chromium-l10n,
 Provides:
  www-browser,
@@ -104,7 +105,7 @@ Conflicts:
  chromium-testsuite,
  chromium-codecs-ffmpeg,
  chromium-codecs-ffmpeg-extra,
-Description: Google's open source chromium web browser
+Description: Chromium web browser
  Chromium is an open-source browser project that aims to build a safer, faster,
  and more stable way for all Internet users to experience the web.
  .
@@ -112,7 +113,7 @@ Description: Google's open source chromium web browser
  and logo) with very few additions such as usage tracking and an auto-updater
  system.
  .
- This package contains the Chromium browser.
+ This package contains the web browser component.
 
 Package: chromium-dbg
 Architecture: i386 amd64
@@ -120,7 +121,6 @@ Section: debug
 Priority: extra
 Depends:
  ${misc:Depends},
- ${shlibs:Depends},
  chromium (= ${binary:Version}),
 Provides:
  chromium-testsuite-dbg
@@ -129,10 +129,10 @@ Replaces:
 Conflicts:
  chromium-testsuite-dbg
 Description: Debugging symbols for the chromium web browser
- Debug symbols for the Chromium browser.
- .
  Chromium is an open-source browser project that aims to build a safer, faster,
  and more stable way for all Internet users to experience the web.
+ .
+ This package contains the debugging symbols.
 
 Package: chromium-l10n
 Architecture: all
@@ -145,7 +145,7 @@ Description: chromium-browser language packages
  Chromium is an open-source browser project that aims to build a safer, faster,
  and more stable way for all Internet users to experience the web.
  .
- This package contains language packages for 50 languages:
+ This package contains language packages for:
  am, ar, bg, bn, ca, cs, da, de, el, en-GB, es-419, es, et, fi, fil, fr, gu, he,
  hi, hr, hu, id, it, ja, kn, ko, lt, lv, ml, mr, nb, nl, pl, pt-BR, pt-PT,
  ro, ru, sk, sl, sr, sv, sw, ta, te, th, tr, uk, vi, zh-CN, zh-TW
@@ -161,12 +161,12 @@ Conflicts:
  chromium (<< ${source:Version}),
 Replaces:
  chromium (<< 31.0.1650.48-1),
-Description: page inspector for the chromium browser
+Description: page inspector for the Chromium browser
  Chromium is an open-source browser project that aims to build a safer, faster,
  and more stable way for all Internet users to experience the web.
  .
- This package contains 'inspector', allowing web developers to inspect any
- element of a web page at runtime (HTML, JavaScript, CSS, ..).
+ This package contains the 'inspector', which enables web developers to inspect
+ elements of a web page at runtime (HTML, JavaScript, CSS, ..).
 
 Package: chromedriver
 Architecture: i386 amd64
@@ -174,7 +174,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  chromium (= ${binary:Version}),
-Description: WebDriver driver for chromium browser
+Description: WebDriver driver for Chromium browser
  Chromedriver serves as a bridge between the chromium web browser and the
  selenium webdriver.
  .
diff --git a/debian/patches/file-5.17.patch b/debian/patches/file-5.17.patch
new file mode 100644
index 0000000..cbd3dfe
--- /dev/null
+++ b/debian/patches/file-5.17.patch
@@ -0,0 +1,14 @@
+description: file >= 5.17 needs -E option to error on non-existent files
+author: Christoph Beidl <debian.axhn at manchmal.in-ulm.de>
+
+--- a/src/build/linux/python_arch.sh
++++ b/src/build/linux/python_arch.sh
+@@ -10,7 +10,7 @@
+ #  python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0
+ #
+ 
+-file_out=$(file --dereference "$1")
++file_out=$(file -E --dereference "$1")
+ if [ $? -ne 0 ]; then
+   echo unknown
+   exit 0
diff --git a/debian/patches/series b/debian/patches/series
index 6162e40..e526f14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ ps-print.patch
 window-placement.patch
 no-promo.patch
 chromedriver-revision.patch
+file-5.17.patch
diff --git a/debian/rules b/debian/rules
index 20df029..d148adc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -446,6 +446,19 @@ clean::
 	rm -f src/third_party/yasm/source/patched-yasm/config/config.sub
 	# remove sourceless flot files
 	rm -f src/third_party/flot/*
+	# remove webkit tests that aren't used and contain sourceless files
+	rm -rf src/third_party/WebKit/ManualTests
+	rm -rf src/third_party/WebKit/PerformanceTests
+	# remove depot_tools, which are only used during checkout
+	rm -rf src/depot_tools
+	# remove webdriver test data that contains sourceless files
+	rm -rf src/third_party/webdriver/test_data
+	# remove extension examples that contain sourceless files
+	rm -rf src/chrome/common/extensions/docs/examples/extensions
+	# remove coverage testing that contains sourceless files
+	rm -rf src/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/coverage
+	# remove prebuilt Promise.js.min
+	rm -f src/third_party/trace-viewer/third_party/Promises/polyfill/bin/Promise.min.js
 
 # Install: there's no install rules in scons yet, do it manually
 common-install-prehook-impl::

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

More information about the Pkg-chromium-commit mailing list