release 35.0.1916.153-2 master
authorMichael Gilbert <mgilbert@debian.org>
Fri, 13 Jun 2014 04:04:56 +0000 (00:04 -0400)
committerMichael Gilbert <mgilbert@debian.org>
Fri, 13 Jun 2014 04:04:56 +0000 (00:04 -0400)
49 files changed:
debian/TODO
debian/changelog
debian/chromedriver.install [new file with mode: 0644]
debian/chromium-browser.links [deleted file]
debian/chromium-inspector.install
debian/chromium-inspector.links [new file with mode: 0644]
debian/chromium.install
debian/chromium.lintian-overrides
debian/control
debian/copyright
debian/initial_bookmarks.html [new file with mode: 0644]
debian/master_preferences
debian/patches/arm-no-float-abi.patch [deleted file]
debian/patches/arm.patch [deleted file]
debian/patches/armv4.patch [deleted file]
debian/patches/chromedriver-revision.patch [new file with mode: 0644]
debian/patches/chromium_useragent.patch [deleted file]
debian/patches/cups1.5.patch [deleted file]
debian/patches/disable-gn.patch [new file with mode: 0644]
debian/patches/expat.patch
debian/patches/ffmpeg_arm.patch
debian/patches/file-5.17.patch [new file with mode: 0644]
debian/patches/fix-manpage.patch
debian/patches/fix_null_conversion.patch [deleted file]
debian/patches/gcc4.7.patch [deleted file]
debian/patches/gcc46.patch [deleted file]
debian/patches/glew.patch
debian/patches/icon.patch
debian/patches/libav0.8.patch [deleted file]
debian/patches/linker-flags.patch [new file with mode: 0644]
debian/patches/make-support/gyp.patch [new file with mode: 0644]
debian/patches/make-support/mojo.patch [new file with mode: 0644]
debian/patches/make-support/opus.patch [new file with mode: 0644]
debian/patches/no-polymer.patch [new file with mode: 0644]
debian/patches/no-promo.patch [new file with mode: 0644]
debian/patches/no-sse2.patch [new file with mode: 0644]
debian/patches/no_tree_sink_v8.patch [deleted file]
debian/patches/nspr.patch
debian/patches/nss.patch
debian/patches/prefs.patch
debian/patches/ps-print.patch [new file with mode: 0644]
debian/patches/series
debian/patches/system-speech.patch
debian/patches/third-party-cookies-off-by-default.patch [new file with mode: 0644]
debian/patches/vpx.patch [deleted file]
debian/patches/webkit-version.patch [deleted file]
debian/patches/window-placement.patch [new file with mode: 0644]
debian/rules
debian/run-test.sh [deleted file]

index 439af00..707dc65 100644 (file)
@@ -1,3 +1,9 @@
-* Add an 'install' target to scons: see http://code.google.com/p/chromium/issues/detail?id=4451
+* Switch to the official chromium source tarballs
+  - http://gsdview.appspot.com/chromium-browser-official/
+  - these packages are ~160 MB vs. 600 MB with the existing get-orig-source rules
+* Switch to debhelper 9 and simplified debian/rules
+* Fix existing lintian warnings/errors
+  - Move images out of /usr/lib
+* Add an 'install' target to scons:
+  - http://code.google.com/p/chromium/issues/detail?id=4451
 * Run the test suite
-* Use system libv8
index c9d8a57..4fdc5c5 100644 (file)
@@ -1,3 +1,938 @@
+chromium-browser (35.0.1916.153-2) unstable; urgency=medium
+
+  * Avoid gcc 4.9 (closes: #751294)
+
+ -- Michael Gilbert <mgilbert@debian.org>  Thu, 12 Jun 2014 01:11:09 +0000
+
+chromium-browser (35.0.1916.153-1) unstable; urgency=high
+
+  * New upstream stable release:
+    - CVE-2014-3154: Use-after-free in filesystem api. Credit to Collin Payne.
+    - CVE-2014-3155: Out-of-bounds read in SPDY. Credit to James March, Daniel
+      Sommermann and Alan Frindell of Facebook.
+    - CVE-2014-3156: Buffer overflow in clipboard. Credit to Atte Kettunen.
+    - CVE-2014-3157: Heap overflow in media.
+  * Don't set sse2 compiler flags on i386 (closes: #750361).
+  * Prefer libgcrypt11 (closes: #750304).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Wed, 11 Jun 2014 02:31:22 +0000
+
+chromium-browser (35.0.1916.114-2) unstable; urgency=medium
+
+  * Add flags to avoid memory exhaustion while linking on i386
+    (closes: #746034).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Tue, 27 May 2014 03:09:00 +0000
+
+chromium-browser (35.0.1916.114-1) unstable; urgency=high
+
+  * New upstream stable release:
+    - CVE-2014-1743: Use-after-free in styles. Credit to cloudfuzzer.
+    - CVE-2014-1744: Integer overflow in audio. Credit to Aaron Staple.
+    - CVE-2014-1745: Use-after-free in SVG. Credit to Atte Kettunen.
+    - CVE-2014-1746: Out-of-bounds read in media filters. Credit to
+      Holger Fuhrmannek.
+    - CVE-2014-1747: UXSS with local MHTML file. Credit to packagesu.
+    - CVE-2014-1748: UI spoofing with scrollbar. Credit to Jordan Milne.
+    - CVE-2014-1749: Various fixes from internal audits, fuzzing and other
+      initiatives.
+    - CVE-2014-3152: Integer underflow in V8 fixed in version 3.25.28.16.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Wed, 21 May 2014 23:15:51 +0000
+
+chromium-browser (34.0.1847.137-1) unstable; urgency=medium
+
+  * New upstream stable release:
+    - High CVE-2014-1740: Use-after-free in WebSockets. Credit to Collin
+      Payne.
+    - High CVE-2014-1741: Integer overflow in DOM ranges. Credit to John
+      Butler.
+    - High CVE-2014-1742: Use-after-free in editing. Credit to cloudfuzzer.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sat, 17 May 2014 13:06:30 +0000
+
+chromium-browser (34.0.1847.132-1) unstable; urgency=medium
+
+  * New upstream stable release:
+    - High CVE-2014-1730: Type confusion in V8. Credit to Anonymous.
+    - High CVE-2014-1731: Type confusion in DOM. Credit to John Butler.
+    - High CVE-2014-1736: Integer overflow in V8.  Credit to SkyLined working
+      with HP's Zero Day Initiative
+    - Medium CVE-2014-1732: Use-after-free in Speech Recognition. Credit to
+      Khalil Zhani
+    - Medium CVE-2014-1733: Compiler bug in Seccomp-BPF. Credit to Jed Davis
+    - CVE-2014-1734: Various fixes from internal audits, fuzzing and other
+      initiatives.
+    - CVE-2014-1735: Multiple vulnerabilities in V8 fixed in version
+      3.24.35.33.
+  * Add libkrb5-dev build-dependency (closes: #745794).
+  * Remove non-free file (closes: #745397).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sat, 26 Apr 2014 18:03:53 +0000
+
+chromium-browser (34.0.1847.116-2) unstable; urgency=medium
+
+  * Add libgcrypt build-dependency.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Tue, 15 Apr 2014 00:22:36 +0000
+
+chromium-browser (34.0.1847.116-1) unstable; urgency=high
+
+  * New upstream stable release:
+    - High CVE-2014-1716: UXSS in V8. Credit to Anonymous.
+    - High CVE-2014-1717: OOB access in V8. Credit to Anonymous.
+    - High CVE-2014-1718: Integer overflow in compositor. Credit to Aaron
+      Staple.
+    - High CVE-2014-1719: Use-after-free in web workers. Credit to Collin
+      Payne.
+    - High CVE-2014-1720: Use-after-free in DOM. Credit to cloudfuzzer.
+    - High CVE-2014-1721: Memory corruption in V8. Credit to Christian Holler.
+    - High CVE-2014-1722: Use-after-free in rendering. Credit to miaubiz.
+    - High CVE-2014-1723: Url confusion with RTL characters. Credit to George
+      McBay.
+    - High CVE-2014-1724: Use-after-free in speech. Credit to Atte Kettunen.
+    - Medium CVE-2014-1725: OOB read with window property. Credit to
+      Anonymous.
+    - Medium CVE-2014-1726: Local cross-origin bypass. Credit to Jann Horn.
+    - Medium CVE-2014-1727: Use-after-free in forms. Credit to Khalil Zhani.
+    - CVE-2014-1728: Various fixes from internal audits, fuzzing and other
+      initiatives.
+    - CVE-2014-1729: Multiple vulnerabilities in V8 fixed in version
+      3.24.35.22.
+  * Remove sourceless javascript files (closes: #735355).
+  * Remove sourceless swf files (closes: #735344).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Fri, 11 Apr 2014 01:42:04 +0000
+
+chromium-browser (33.0.1750.152-1) unstable; urgency=high
+
+  * [641361a] Disable new GN stuff
+  * [43cea90] Refreshed patches
+  * New stable release:
+    - High CVE-2014-1713: Use-after-free in Blink bindings
+    - High CVE-2014-1714: Windows clipboard vulnerability
+    - High CVE-2014-1705: Memory corruption in V8
+    - High CVE-2014-1715: Directory traversal issue
+    - High CVE-2014-1700: Use-after-free in speech. Credit to Chamal de Silva.
+    - High CVE-2014-1701: UXSS in events. Credit to aidanhs.
+    - High CVE-2014-1702: Use-after-free in web database.
+      Credit to Collin Payne.
+    - High CVE-2014-1703: Potential sandbox escape due to a use-after-free
+      in web sockets.
+    - CVE-2014-1704: Multiple vulnerabilities in V8 fixed in version 3.23.17.18
+    - High CVE-2013-6663: Use-after-free in svg images. Credit to Atte
+      Kettunen of OUSPG.
+    - High CVE-2013-6664: Use-after-free in speech recognition.
+      Credit to Khalil Zhani.
+    - High CVE-2013-6665: Heap buffer overflow in software
+      rendering. Credit to cloudfuzzer.
+    - Medium CVE-2013-6666: Chrome allows requests in flash header request.
+      Credit to netfuzzerr.
+    - CVE-2013-6667: Various fixes from internal audits, fuzzing and other
+      initiatives.
+    - CVE-2013-6668: Multiple vulnerabilities in V8 fixed in version 3.24.35.10
+    - High CVE-2013-6653: Use-after-free related to web contents.
+      Credit to Khalil Zhani.
+    - High CVE-2013-6654: Bad cast in SVG. Credit to TheShow3511.
+    - High CVE-2013-6655: Use-after-free in layout. Credit to cloudfuzzer.
+    - High CVE-2013-6656: Information leak in XSS auditor. Credit to NeexEmil.
+    - Medium CVE-2013-6657: Information leak in XSS auditor. Credit to NeexEmil
+    - Medium CVE-2013-6658: Use-after-free in layout. Credit to cloudfuzzer.
+    - Medium CVE-2013-6659: Issue with certificates validation in
+      TLS handshake. Credit to Antoine Delignat-Lavaud and Karthikeyan Bhargavan
+      from Prosecco, Inria Paris.
+    - Low CVE-2013-6660: Information leak in drag and drop. Credit to
+      bishopjeffreys.
+    - Low-High CVE-2013-6661: Various fixes from internal audits, fuzzing
+      and other initiatives. Of these, seven are fixes for issues that could
+      have allowed for sandbox escapes from compromised renderers.
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Fri, 21 Mar 2014 17:20:44 +0100
+
+chromium-browser (32.0.1700.123-4) unstable; urgency=medium
+
+  * Remove polymer.js.min.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 09 Mar 2014 22:30:14 +0000
+
+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@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.
+  * Build chromedriver (closes: #725130).
+    - Thanks to Vincent Bernat and Adrian Lang.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 16 Feb 2014 02:32:18 +0000
+
+chromium-browser (32.0.1700.123-1) unstable; urgency=medium
+
+  * [a7cf72b] Refreshed Patches
+  * [0da7fc2] Added libdrm-dev and libcap-dev in build-deps
+  * New stable release:
+    - High CVE-2013-6649: Use-after-free in SVG images. Credit to
+      Atte Kettunen of OUSPG.
+    - High CVE-2013-6650: Memory corruption in V8. This issue was
+      fixed in v8 version 3.22.24.16. Credit to Christian Holler.
+    - High CVE-2013-6646: Use-after-free in web workers. Credit to
+      Collin Payne.
+    - High CVE-2013-6641: Use-after-free related to forms. Credit to
+      Atte Kettunen of OUSPG.
+    - High CVE-2013-6643: Unprompted sync with an attacker’s Google
+      account. Credit to Joao Lucas Melo Brasio.
+    - CVE-2013-6645 Use-after-free related to speech input elements.
+      Credit to Khalil Zhani.
+    - CVE-2013-6644: Various fixes from internal audits, fuzzing and other
+      initiatives.
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Thu, 13 Feb 2014 19:36:17 +0100
+
+chromium-browser (31.0.1650.63-1) unstable; urgency=medium
+
+  * New upstream stable release:
+    - Medium CVE-2013-6634: Session fixation in sync related to 302 redirects.
+      Credit to Andrey Labunets.
+    - High CVE-2013-6635: Use-after-free in editing. Credit to cloudfuzzer.
+    - Medium CVE-2013-6636: Address bar spoofing related to modal dialogs.
+      Credit to Bas Venis.
+    - CVE-2013-6637: Various fixes from internal audits, fuzzing and other
+      initiatives.
+    - Medium CVE-2013-6638: Buffer overflow in v8. This issue was fixed in v8
+      version 3.22.24.7. Credit to Jakob Kummerow of the Chromium project.
+    - High CVE-2013-6639: Out of bounds write in v8. This issue was fixed in v8
+      version 3.22.24.7. Credit to Jakob Kummerow of the Chromium project.
+    - Medium CVE-2013-6640: Out of bounds read in v8. This issue was fixed in
+      v8 version 3.22.24.7. Credit to Jakob Kummerow of the Chromium project.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Thu, 05 Dec 2013 14:05:22 +0000
+
+chromium-browser (31.0.1650.57-1) unstable; urgency=medium
+
+  * New upstream stable release:
+    - Medium-Critical CVE-2013-2931: Various fixes from internal audits,
+      fuzzing and other initiatives.
+    - Medium CVE-2013-6621: Use after free related to speech input elements.
+      Credit to Khalil Zhani.
+    - High CVE-2013-6622: Use after free related to media elements. Credit to
+      cloudfuzzer.
+    - High CVE-2013-6623: Out of bounds read in SVG. Credit to miaubiz.
+    - High CVE-2013-6624: Use after free related to “id” attribute strings.
+      Credit to Jon Butler.
+    - High CVE-2013-6625: Use after free in DOM ranges. Credit to cloudfuzzer.
+    - Low CVE-2013-6626: Address bar spoofing related to interstitial warnings.
+      Credit to Chamal de Silva.
+    - High CVE-2013-6627: Out of bounds read in HTTP parsing. Credit to
+      skylined.
+    - Medium CVE-2013-6628: Issue with certificates not being checked during
+      TLS renegotiation. Credit to Antoine Delignat-Lavaud and Karthikeyan
+      Bhargavan from Prosecco of INRIA Paris.
+    - Medium CVE-2013-6629: Read of uninitialized memory in libjpeg and
+      libjpeg-turbo. Credit to Michal Zalewski of Google.
+    - Medium CVE-2013-6630: Read of uninitialized memory in libjpeg-turbo.
+      Credit to Michal Zalewski of Google.
+    - High CVE-2013-6631: Use after free in libjingle. Credit to Patrik Höglund
+      of the Chromium project.
+    - Critical CVE-2013-6632: Multiple memory corruption issues. Credit to
+      Pinkie Pie.
+  * Disable promos by default (closes: #634101).
+  * Set WANT_TESTS=0 if WANT_TESTS=1 fails (closes: #589654).
+  * Maintain window ordering when new tabs are opened (closes: #725350).
+  * Install chromium-inspector files to /usr/share instead of /usr/lib.
+  * Don't remove third party libraries from the upstream tarball.
+  * Remove non-default compression selections from debian/rules.
+  * Build with breakpad crash reporting.
+  * Fix some lintian warnings.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Wed, 13 Nov 2013 07:44:55 +0000
+
+chromium-browser (30.0.1599.101-3) unstable; urgency=medium
+
+  * Fix sandbox installation path (closes: #728823).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Thu, 07 Nov 2013 04:24:55 +0000
+
+chromium-browser (30.0.1599.101-2) unstable; urgency=medium
+
+  * Use system zlib.
+  * Remove arm patches.
+  * Update lintian overrides.
+  * Remove an unsafe symlink.
+  * Remove icu build dependency.
+  * Support poststript printing (closes: #717722).
+  * Use fonts-ipafont instead of ttf-kochi (closes: #725800).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sat, 02 Nov 2013 21:25:50 +0000
+
+chromium-browser (30.0.1599.101-1) unstable; urgency=low
+
+  [ Giuseppe Iuculano ]
+  * New stable release:
+    - High CVE-2013-2925: Use after free in XHR. Credit to Atte Kettunen of
+      OUSPG.
+    - High CVE-2013-2926: Use after free in editing. Credit to
+      cloudfuzzer.
+    - High CVE-2013-2927: Use after free in forms. Credit to
+      cloudfuzzer.
+    - CVE-2013-2928: Various fixes from internal audits, fuzzing and other
+      initiatives.
+    - Medium CVE-2013-2906: Races in Web Audio.
+      Credit to Atte Kettunen of OUSPG.
+    - Medium CVE-2013-2907: Out of bounds read in Window.prototype object.
+      Credit to Boris Zbarsky.
+    - Medium CVE-2013-2908: Address bar spoofing related to the "204
+      No Content" status code. Credit to Chamal de Silva.
+    - High CVE-2013-2909: Use after free in inline-block
+      rendering. Credit to Atte Kettunen of OUSPG. 
+    - Medium CVE-2013-2910: Use-after-free in Web Audio. Credit to
+      Byoungyoung Lee of Georgia Tech Information Security Center (GTISC).
+    - High CVE-2013-2911: Use-after-free in XSLT. Credit to Atte
+      Kettunen of OUSPG.
+    - High CVE-2013-2912: Use-after-free in PPAPI. Credit to Chamal
+      de Silva and 41.w4r10r(at)garage4hackers.com.
+    - High CVE-2013-2913: Use-after-free in XML document parsing.
+      Credit to cloudfuzzer. 
+    - High CVE-2013-2914: Use after free in the Windows color
+      chooser dialog. Credit to Khalil Zhani. 
+    - Low CVE-2013-2915: Address bar spoofing via a malformed scheme.
+      Credit to Wander Groeneveld. 
+    - High CVE-2013-2916: Address bar spoofing related to the "204
+      No Content” status code. Credit to Masato Kinugawa.
+    - Medium CVE-2013-2917: Out of bounds read in Web Audio. Credit
+      to Byoungyoung Lee and Tielei Wang of Georgia Tech Information
+      Security Center (GTISC). 
+    - High CVE-2013-2918: Use-after-free in DOM. Credit to
+      Byoungyoung Lee of Georgia Tech Information Security Center (GTISC).
+    - High CVE-2013-2919: Memory corruption in V8. Credit to Adam
+      Haile of Concrete Data. 
+    - Medium CVE-2013-2920: Out of bounds read in URL parsing. Credit to
+      Atte Kettunen of OUSPG.
+    - High CVE-2013-2921: Use-after-free in resource loader. Credit
+      to Byoungyoung Lee and Tielei Wang of Georgia Tech Information
+      Security Center (GTISC). 
+    - High CVE-2013-2922: Use-after-free in template element. Credit
+      to Jon Butler. 
+    - CVE-2013-2923: Various fixes from internal audits, fuzzing and other
+      initiatives (Chrome 30).
+    - Medium CVE-2013-2924: Use-after-free in ICU. Upstream bug here.
+
+  * [6651f1c] Added chrpath to build-depends
+  * [3c88b20] Refreshed Patches for version 30
+  * [743a0a6] Make default of third-party cookies the most secure for users.
+    Thanks to Chad Miller
+  * [9507f07] Do not install remoting_locales/en-US.pak
+  * [64b895b] Move chrome_sandbox to chrome-sandbox, chromium reads that file
+
+  [ Shawn Landden ]
+  * [6d027f1] rules: dpkg compresses .deb files with xz by default now
+
+  [ Michael Gilbert ]
+  * [18341ce] add some TODO tasks
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Mon, 21 Oct 2013 13:06:14 +0200
+
+chromium-browser (29.0.1547.57-3) unstable; urgency=medium
+
+  * Drop transitional packages (closes: #684369).
+  * Fix another copyright file syntax error.
+  * Remove libav build dependencies.
+  * Fix lintian override syntax.
+  * Fix version control URL.
+  * Use system vpx.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Tue, 27 Aug 2013 01:01:35 +0000
+
+chromium-browser (29.0.1547.57-2) unstable; urgency=medium
+
+  * Mark chromium-inspector as multi-arch: foreign (closes: #695229).
+  * Use system libpng (closes: #699918).
+  * Fix copyright file syntax error.
+  * Drop implicit g++ dependency.
+  * Add some lintian overrides.
+  * Update my email address.
+  * Remove unsafe symlink.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 25 Aug 2013 02:15:35 +0000
+
+chromium-browser (29.0.1547.57-1) unstable; urgency=medium
+
+  [ Michael Gilbert ]
+  * New upstream stable release:
+    - High CVE-2013-2900: Incomplete path sanitization in file handling. Credit
+      to Krystian Bigaj.
+    - Low CVE-2013-2905: Information leak via overly broad permissions on
+      shared memory files. Credit to Christian Jaeger.
+    - High CVE-2013-2901: Integer overflow in ANGLE. Credit to Alex Chapman.
+    - High CVE-2013-2902: Use after free in XSLT. Credit to cloudfuzzer.
+    - High CVE-2013-2903: Use after free in media element. Credit to
+      cloudfuzzer.
+    - High CVE-2013-2904: Use after free in document parsing. Credit to
+      cloudfuzzer.
+    - CVE-2013-2887: Various fixes from internal audits, fuzzing and other
+      initiatives (Chrome 29).
+  * Remove unused webkit layout tests (closes: 720446).
+  * Use source package name for get-orig-source rule.
+  * Remove gfdl documentation (closes: #708860).
+  * Build-depend on git.
+  
+  [ Shawn Landden ]
+  * New standards version.
+  * Use canonical VCS url.
+  * Always use system includes rather than ones of a chroot.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sat, 24 Aug 2013 20:14:52 +0000
+
+chromium-browser (28.0.1500.95-3) unstable; urgency=medium
+
+  * Fix placement of -fuse-ld=gold in ldflags.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Thu, 01 Aug 2013 16:38:05 +0000
+
+chromium-browser (28.0.1500.95-2) unstable; urgency=medium
+
+  * Use -fuse-ld=gold instead of binutils-gold.
+  * Drop libv8-dev build-dependency.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Wed, 31 Jul 2013 20:22:33 +0000
+
+chromium-browser (28.0.1500.95-1) unstable; urgency=medium
+
+  * New upstream stable release:
+    - Medium CVE-2013-2881: Origin bypass in frame handling. Credit to Karthik
+      Bhargavan.
+    - High CVE-2013-2882: Type confusion in V8. Credit to Cloudfuzzer.
+    - High CVE-2013-2883: Use-after-free in MutationObserver. Credit to
+      Cloudfuzzer.
+    - High CVE-2013-2884: Use-after-free in DOM. Credit to Ivan Fratric of
+      Google Security Team.
+    - High CVE-2013-2885: Use-after-free in input handling. Credit to Ivan
+      Fratric of Google Security Team.
+    - High CVE-2013-2886: Various fixes from internal audits, fuzzing and other
+      initiatives.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Tue, 30 Jul 2013 20:34:19 +0000
+
+chromium-browser (28.0.1500.71-2) unstable; urgency=medium
+
+  * Disable armhf.
+  * Remove outdated patches.
+  * Eliminate special handling for old compiler versions.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Mon, 15 Jul 2013 18:40:47 +0000
+
+chromium-browser (28.0.1500.71-1) unstable; urgency=medium
+
+  [ Michael Gilbert ]
+  * New upstream stable release:
+    - Low CVE-2013-2867: Block pop-unders in various scenarios.
+    - High CVE-2013-2879: Confusion setting up sign-in and sync. Credit to
+      Andrey Labunets.
+    - Medium CVE-2013-2868: Incorrect sync of NPAPI extension component. Credit
+      to Andrey Labunets.
+    - Medium CVE-2013-2869: Out-of-bounds read in JPEG2000 handling. Credit to
+      Felix Groebert of Google Security Team.
+    - Critical CVE-2013-2870: Use-after-free with network sockets. Credit to
+      Collin Payne.
+    - Medium CVE-2013-2853: Man-in-the-middle attack against HTTP in SSL.
+      Credit to Antoine Delignat-Lavaud and Karthikeyan Bhargavan from Prosecco
+      at INRIA Paris.
+    - High CVE-2013-2871: Use-after-free in input handling. Credit to miaubiz.
+    - High CVE-2013-2873: Use-after-free in resource loading. Credit to
+      miaubiz.
+    - Medium CVE-2013-2875: Out-of-bounds-read in SVG. Credit to miaubiz.
+    - Medium CVE-2013-2876: Extensions permissions confusion with
+      interstitials.  Credit to Dev Akhawe.
+    - Low CVE-2013-2877: Out-of-bounds read in XML parsing. Credit to Aki Helin
+      of OUSPG.
+    - None: Remove the “viewsource” attribute on iframes. Credit to Collin
+      Jackson.
+    - Medium CVE-2013-2878: Out-of-bounds read in text handling. Credit to Atte
+      Kettunen of OUSPG.
+    - High CVE-2013-2880: Various fixes from internal audits, fuzzing and other
+      initiatives. Credit to Chrome 28 team.
+  * Install mksnapshot.
+
+  [ Shawn Landden ]
+  * Enable armhf.
+  * Build with system libwebp when version >= 0.3.0.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Fri, 12 Jul 2013 15:19:18 +0000
+
+chromium-browser (27.0.1453.110-2) unstable; urgency=low
+
+  [ Michael Gilbert ]
+  * Use default gcc.
+  * Enable verbose build.
+  * Support gcc 4.8 (closes: #701256).
+  * Disable pie hardening flag due to ffmpeg linking issue.
+
+  [ Giuseppe Iuculano ]
+  * Remove hardening-wrapper and switch to dpkg-buildflags.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 07 Jul 2013 20:06:05 +0000
+
+chromium-browser (27.0.1453.110-1) unstable; urgency=low
+
+  * New stable release:
+    - Medium CVE-2013-2855: Memory corruption in dev tools API.
+      Credit to "daniel.zulla".
+    - High CVE-2013-2856: Use-after-free in input handling. Credit
+      to miaubiz.
+    - High CVE-2013-2857: Use-after-free in image handling. Credit
+      to miaubiz.
+    - High CVE-2013-2858: Use-after-free in HTML5 Audio. Credit to
+      "cdel921".
+    - High CVE-2013-2859: Cross-origin namespace pollution. Credit
+      to "bobbyholley".
+    - High CVE-2013-2860: Use-after-free with workers accessing
+      database APIs. Credit to Collin Payne.
+    - High CVE-2013-2861: Use-after-free with SVG. Credit to
+      miaubiz.
+    - High CVE-2013-2862: Memory corruption in Skia GPU handling.
+      Credit to Atte Kettunen of OUSPG.
+    - Critical CVE-2013-2863: Memory corruption in SSL socket handling.
+      Credit to Sebastien Marchand of the Chromium development community.
+    - High CVE-2013-2864: Bad free in PDF viewer. Credit to Mateusz
+      Jurczyk, with contributions by Gynvael Coldwind, both from Google Security
+      Team.
+    - High CVE-2013-2865: Various fixes from internal audits, fuzzing and
+      other initiatives.
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Wed, 05 Jun 2013 17:00:28 +0200
+
+chromium-browser (27.0.1453.93-1) unstable; urgency=low
+
+  * New stable release:
+    - High CVE-2013-2837: Use-after-free in SVG. Credit to Sławomir Błażek.
+    - Medium CVE-2013-2838: Out-of-bounds read in v8. Credit to Christian
+      Holler.
+    - High CVE-2013-2839: Bad cast in clipboard handling. Credit to Jon of MWR
+      InfoSecurity.
+    - High CVE-2013-2840: Use-after-free in media loader. Credit to Nils of
+      MWR InfoSecurity.
+    - High CVE-2013-2841: Use-after-free in Pepper resource handling. Credit
+      to Chamal de Silva.
+    - High CVE-2013-2842: Use-after-free in widget handling. Credit to Cyril
+      Cattiaux.
+    - High CVE-2013-2843: Use-after-free in speech handling. Credit to Khalil
+      Zhani.
+    - High CVE-2013-2844: Use-after-free in style resolution. Credit to Sachin
+      Shinde (@cons0ul).
+    - High CVE-2013-2845: Memory safety issues in Web Audio. Credit to Atte
+      Kettunen of OUSPG.
+    - High CVE-2013-2846: Use-after-free in media loader. Credit to Chamal de
+      Silva.
+    - High CVE-2013-2847: Use-after-free race condition with workers. Credit
+      to Collin Payne.
+    - Medium CVE-2013-2848: Possible data extraction with XSS Auditor. Credit
+      to Egor Homakov.
+    - Low CVE-2013-2849: Possible XSS with drag+drop or copy+paste. Credit to
+      Mario Heiderich.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Wed, 22 May 2013 03:03:49 +0000
+
+chromium-browser (26.0.1410.43-1) unstable; urgency=medium
+
+  * New stable release:
+    - High CVE-2013-0916: Use-after-free in Web Audio. Credit to Atte Kettunen
+      of OUSPG.
+    - Low CVE-2013-0917: Out-of-bounds read in URL loader. Credit to Google
+      Chrome Security Team (Cris Neckar).
+    - Low CVE-2013-0918: Do not navigate dev tools upon drag and drop. Credit
+      to Vsevolod Vlasov of the Chromium development community.
+    - Medium CVE-2013-0919: Use-after-free with pop-up windows in extensions.
+      Credit to Google Chrome Security Team (Mustafa Emre Acer).
+    - Medium CVE-2013-0920: Use-after-free in extension bookmarks API. Credit
+      to Google Chrome Security Team (Mustafa Emre Acer).
+    - High CVE-2013-0921: Ensure isolated web sites run in their own processes.
+    - Low CVE-2013-0922: Avoid HTTP basic auth brute force attempts. Credit to
+      “t3553r”.
+    - Medium CVE-2013-0923: Memory safety issues in the USB Apps API. Credit to
+      Google Chrome Security Team (Mustafa Emre Acer).
+    - Low CVE-2013-0924: Check an extension’s permissions API usage again file
+      permissions. Credit to Benjamin Kalman of the Chromium development
+      community.
+    - Low CVE-2013-0925: Avoid leaking URLs to extensions without the tabs
+      permissions. Credit to Michael Vrable of Google.
+    - Medium CVE-2013-0926: Avoid pasting active tags in certain situations.
+      Credit to Subho Halder, Aditya Gupta, and Dev Kar of xys3c.
+  * Use embedded libvpx for vp9 support, which chromium now requires.
+  * Add libspeechd-dev build-dependency.
+  * Disable breakpad crash reporting.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sat, 30 Mar 2013 14:44:33 +0000
+
+chromium-browser (25.0.1364.160-1) unstable; urgency=high
+
+  * New stable security release:
+    - High CVE-2013-0912: Type confusion in WebKit. Credit to Nils and Jon of
+      MWR Labs.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Fri, 08 Mar 2013 03:46:20 +0000
+
+chromium-browser (25.0.1364.152-1) unstable; urgency=high
+
+  * [8761d73] Remove armel and armhf. We cannot support them in wheezy
+  * New stable security release:
+    - High CVE-2013-0902: Use-after-free in frame loader. Credit to
+      Chamal de Silva.
+    - High CVE-2013-0903: Use-after-free in browser navigation
+      handling. Credit to "chromium.khalil".
+    - High CVE-2013-0904: Memory corruption in Web Audio.
+      Credit to Atte Kettunen of OUSPG.
+    - High CVE-2013-0905: Use-after-free with SVG animations.
+      Credit to Atte Kettunen of OUSPG.
+    - High CVE-2013-0906: Memory corruption in Indexed DB. Credit to Google
+      Chrome Security Team (Jüri Aedla).
+    - Medium CVE-2013-0907: Race condition in media thread handling. Credit
+      to Andrew Scherkus of the Chromium development community.
+    - Medium CVE-2013-0908: Incorrect handling of bindings for extension
+      processes.
+    - Low CVE-2013-0909: Referer leakage with XSS Auditor. Credit to Egor
+      Homakov.
+    - Medium CVE-2013-0910: Mediate renderer -> browser plug-in loads more
+      strictly. Credit to Google Chrome Security Team (Chris Evans).
+    - High CVE-2013-0911: Possible path traversal in database handling.
+      Credit to Google Chrome Security Team (Jüri Aedla).
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Tue, 05 Mar 2013 11:14:34 +0100
+
+chromium-browser (25.0.1364.97-1) unstable; urgency=low
+
+  * New stable release:
+    - High CVE-2013-0879: Memory corruption with web audio
+      node. Credit to Atte Kettunen of OUSPG.
+    - High CVE-2013-0880: Use-after-free in database handling.
+      Credit to Chamal de Silva.
+    - Medium CVE-2013-0881: Bad read in Matroska handling. Credit to
+      Atte Kettunen of OUSPG.
+    - High CVE-2013-0882: Bad memory access with excessive SVG
+      parameters. Credit to Renata Hodovan.
+    - Medium CVE-2013-0883: Bad read in Skia. Credit to Atte
+      Kettunen of OUSPG.
+    - Low CVE-2013-0884: Inappropriate load of NaCl. Credit to Google
+      Chrome Security Team (Chris Evans).
+    - Medium CVE-2013-0885: Too many API permissions granted to web store.
+    - Low CVE-2013-0887: Developer tools process has too many
+      permissions and places too much trust in the connected server.
+    - Medium CVE-2013-0888: Out-of-bounds read in Skia. Credit to Google
+      Chrome Security Team (Inferno).
+    - Low CVE-2013-0889: Tighten user gesture check for dangerous file
+      downloads.
+    - High CVE-2013-0890: Memory safety issues across the IPC
+      layer. Credit to Google Chrome Security Team (Chris Evans).
+    - High CVE-2013-0891: Integer overflow in blob handling. Credit to
+      Google Chrome Security Team (Jüri Aedla).
+    - Medium CVE-2013-0892: Lower severity issues across the IPC layer.
+      Credit to Google Chrome Security Team (Chris Evans).
+    - Medium CVE-2013-0893: Race condition in media handling. Credit to
+      Andrew Scherkus of the Chromium development community.
+    - High CVE-2013-0894: Buffer overflow in vorbis decoding. Credit to
+      Google Chrome Security Team (Inferno).
+    - High CVE-2013-0895: Incorrect path handling in file
+      copying. Credit to Google Chrome Security Team (Jüri Aedla).
+    - High CVE-2013-0896: Memory management issues in plug-in message
+      handling. Credit to Google Chrome Security Team (Cris Neckar).
+    - High CVE-2013-0898: Use-after-free in URL handling. Credit to
+      Alexander Potapenko of the Chromium development community.
+    - Low CVE-2013-0899: Integer overflow in Opus handling. Credit to
+      Google Chrome Security Team (Jüri Aedla).
+    - Medium CVE-2013-0900: Race condition in ICU. Credit to Google Chrome
+      Security Team (Inferno).
+  * [a5f15ae] Added libpci-dev to B-depends
+  * [ace2b7a] Refreshed patches
+  * [32c84fa] Install remoting_locales
+  * [f868804] Do not enable NEON on ARM, thanks Ubuntu.
+  * [d1a3e36] Ignore stamp files in missing checks
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Sat, 23 Feb 2013 11:45:07 +0100
+
+chromium-browser (24.0.1312.68-1) unstable; urgency=high
+
+  * New stable release:
+    - High CVE-2013-0839: Use-after-free in canvas font handling.
+      Credit to Atte Kettunen of OUSPG.
+    - Medium CVE-2013-0840: Missing URL validation when opening new
+      windows.
+    - High CVE-2013-0841: Unchecked array index in content blocking. Credit
+      to Google Chrome Security Team (Chris Evans).
+    - Medium CVE-2013-0842: Problems with NULL characters embedded in
+      paths. Credit to Google Chrome Security Team (Jüri Aedla).
+    - High CVE-2012-5145: Use-after-free in SVG layout. Credit to
+      Atte Kettunen of OUSPG. 
+    - High CVE-2012-5146: Same origin policy bypass with malformed
+      URL. Credit to Erling A Ellingsen and Subodh Iyengar, both of Facebook. 
+    - High CVE-2012-5147: Use-after-free in DOM handling. Credit to
+      José A. Vázquez. 
+    - Medium CVE-2012-5148: Missing filename sanitization in hyphenation
+      support. Credit to Google Chrome Security Team (Justin Schuh). 
+    - High CVE-2012-5149: Integer overflow in audio IPC handling. Credit to
+      Google Chrome Security Team (Chris Evans). 
+    - High CVE-2012-5150: Use-after-free when seeking video. Credit to
+      Google Chrome Security Team (Inferno). 
+    - High CVE-2012-5151: Integer overflow in PDF JavaScript. Credit to
+      Mateusz Jurczyk, with contribution from Gynvael Coldwind, both of Google
+      Security Team. 
+    - Medium CVE-2012-5152: Out-of-bounds read when seeking video. Credit
+      to Google Chrome Security Team (Inferno). 
+    - High CVE-2012-5153: Out-of-bounds stack access in v8. Credit to
+      Andreas Rossberg of the Chromium development community. 
+    - High CVE-2013-0829: Corruption of database metadata leading to
+      incorrect file access. Credit to Google Chrome Security Team (Jüri Aedla). 
+    - Low CVE-2013-0831: Possible path traversal from extension process.
+      Credit to Google Chrome Security Team (Tom Sepez). 
+    - [160380] Medium CVE-2013-0832: Use-after-free with printing. Credit to Google
+      Chrome Security Team (Cris Neckar). 
+    - Medium CVE-2013-0833: Out-of-bounds read with printing. Credit to
+      Google Chrome Security Team (Cris Neckar). 
+    - Medium CVE-2013-0834: Out-of-bounds read with glyph handling. Credit
+      to Google Chrome Security Team (Cris Neckar). 
+    - Low CVE-2013-0835: Browser crash with geolocation. Credit to Arthur
+      Gerkis. 
+    - High CVE-2013-0836: Crash in v8 garbage collection. Credit to Google
+      Chrome Security Team (Cris Neckar). 
+    - Medium CVE-2013-0837: Crash in extension tab handling. Credit to Tom
+      Nielsen. 
+    - Low CVE-2013-0838: Tighten permissions on shared memory
+      segments. Credit to Google Chrome Security Team (Chris Palmer). 
+    - High CVE-2012-5139: Use-after-free with visibility events.
+      Credit to Chamal de Silva.
+    - High CVE-2012-5140: Use-after-free in URL loader. Credit to
+      Chamal de Silva.
+    - Medium CVE-2012-5141: Limit Chromoting client plug-in instantiation.
+      Credit to Google Chrome Security Team (Jüri Aedla).
+    - Critical CVE-2012-5142: Crash in history navigation. Credit to Michal
+      Zalewski of Google Security Team.
+    - Medium CVE-2012-5143: Integer overflow in PPAPI image buffers. Credit
+      to Google Chrome Security Team (Cris Neckar).
+    - High CVE-2012-5144: Stack corruption in AAC decoding. Credit
+      to pawlkt.
+    - High CVE-2012-5138: Incorrect file path handling. Credit to Google
+      Chrome Security Team (Jüri Aedla).
+    - High CVE-2012-5137: Use-after-free in media source handling.
+      Credit to Pinkie Pie.
+    - High CVE-2012-5133: Use-after-free in SVG filters. Credit to
+      miaubiz.
+    - Medium CVE-2012-5130: Out-of-bounds read in Skia. Credit to
+      Atte Kettunen of OUSPG.
+    - Low CVE-2012-5132: Browser crash with chunked encoding. Credit to
+      Attila Szász.
+    - High CVE-2012-5134: Buffer underflow in libxml. Credit to Google
+      Chrome Security Team (Jüri Aedla).
+    - Medium CVE-2012-5135: Use-after-free with printing. Credit to Fermin
+      Serna of Google Security Team.
+    - Medium CVE-2012-5136: Bad cast in input element handling. Credit to
+      Google Chrome Security Team (Inferno).
+    - Medium CVE-2012-5127: Integer overflow leading to
+      out-of-bounds read in WebP handling. Credit to Phil Turnbull.
+    - [Linux 64-bit only] Medium CVE-2012-5120: Out-of-bounds array
+      access in v8. Credit to Atte Kettunen of OUSPG.
+    - High CVE-2012-5116: Use-after-free in SVG filter handling.
+      Credit to miaubiz.
+    - High CVE-2012-5121: Use-after-free in video layout. Credit to
+      Atte Kettunen of OUSPG.
+    - Low CVE-2012-5117: Inappropriate load of SVG subresource in img
+      context. Credit to Felix Gröbert of the Google Security Team.
+    - Medium CVE-2012-5119: Race condition in Pepper buffer handling.
+      Credit to Fermin Serna of the Google Security Team.
+    - Medium CVE-2012-5122: Bad cast in input handling. Credit to Google
+      Chrome Security Team (Inferno).
+    - Medium CVE-2012-5123: Out-of-bounds reads in Skia. Credit to
+      Google Chrome Security Team (Inferno).
+    - High CVE-2012-5124: Memory corruption in texture handling. Credit to
+      Al Patrick of the Chromium development community.
+    - Medium CVE-2012-5125: Use-after-free in extension tab handling.
+      Credit to Alexander Potapenko of the Chromium development community.
+    - Medium CVE-2012-5126: Use-after-free in plug-in placeholder handling.
+      Credit to Google Chrome Security Team (Inferno).
+    - High CVE-2012-5128: Bad write in v8. Credit to Google Chrome Security
+      Team (Cris Neckar).
+  * [574d76c] Override the lintian flag:
+    embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
+  * [3105012] Updated changelog
+  * [ac9c032] Use explicit library dependencies instead of dlopen
+  * [1ad217c] Fixed CHANNELS_URL
+  * [7c2d359] Drop SCM revision from the version
+  * [ca31c0c] Install all chromium libs
+  * [167aea7] Use internal copy of libpng. This is necessary because with
+    system libpng render process is consuming 100% CPU
+    (see http://code.google.com/p/chromium/issues/detail?id=174603)
+  * [8742d82] debian/patches/pulse_ftbfs.patch: Fix FTBFS
+  * [9e76ec7] Refreshed patches
+  * [1c6f4c3] Use Debian api key
+  * [cdf5c74] Refreshed patches
+  * [ad9480c] Remove useless embedded copy of documentation from source
+    containing non DFSG-compliant material:
+    - src/native_client/toolchain/linux_x86/info
+    - src/native_client/toolchain/linux_x86/man
+    - src/native_client/toolchain/linux_x86/share/info
+    - src/native_client/toolchain/linux_x86/x86_64-nacl/share/info
+    - src/native_client/toolchain/linux_x86_newlib/info
+    - src/native_client/toolchain/linux_x86_newlib/man
+    - src/native_client/toolchain/linux_x86_newlib/share/info
+    (Closes: #695703)
+  * [31ea388] Fixed Homepage field.
+    Thanks to Dmitry Shachnev (Closes: #686561)
+  * [d509e07] Override the lintian flag: embedded-library usr/lib/chromium/chromium: libpng
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Wed, 06 Feb 2013 15:34:17 +0100
+
+chromium-browser (22.0.1229.94~r161065-3) unstable; urgency=medium
+
+  * Use system vpx library again (resolves armel build failures).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 28 Oct 2012 00:55:58 -0400
+
+chromium-browser (22.0.1229.94~r161065-2) unstable; urgency=medium
+
+  * [574d76c] Override the lintian flag: embedded-library
+     usr/lib/chromium/libffmpegsumo.so: libavcodec
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Tue, 23 Oct 2012 17:51:56 +0200
+
+chromium-browser (22.0.1229.94~r161065-1) unstable; urgency=medium
+
+  * New stable release:
+    - High CVE-2012-2889: UXSS in frame handling. Credit to
+      Sergey Glazunov.
+    - High CVE-2012-2886: UXSS in v8 bindings. Credit to Sergey
+      Glazunov.
+    - High CVE-2012-2881: DOM tree corruption with plug-ins. Credit
+      to Chamal de Silva.
+    - High CVE-2012-2876: Buffer overflow in SSE2 optimizations.
+      Credit to Atte Kettunen of OUSPG.
+    - High CVE-2012-2883: Out-of-bounds write in Skia. Credit to
+      Atte Kettunen of OUSPG.
+    - High CVE-2012-2887: Use-after-free in onclick handling.
+      Credit to Atte Kettunen of OUSPG.
+    - High CVE-2012-2888: Use-after-free in SVG text references.
+      Credit to miaubiz.
+    - High CVE-2012-2894: Crash in graphics context handling.
+      Credit to Sławomir Błażek.
+    - Medium CVE-2012-2877: Browser crash with extensions and modal
+      dialogs. Credit to Nir Moshe.
+    - Low CVE-2012-2879: DOM topology corruption. Credit to pawlkt.
+    - Medium CVE-2012-2884: Out-of-bounds read in Skia. Credit to
+      Atte Kettunen of OUSPG.
+    - High CVE-2012-2874: Out-of-bounds write in Skia. Credit to Google
+      Chrome Security Team (Inferno).
+    - High CVE-2012-2878: Use-after-free in plug-in handling. Credit to
+      Fermin Serna of Google Security Team.
+    - Medium CVE-2012-2880: Race condition in plug-in paint buffer. Credit
+      to Google Chrome Security Team (Cris Neckar).
+    - High CVE-2012-2882: Wild pointer in OGG container handling. Credit to
+      Google Chrome Security Team (Inferno).
+    - Medium CVE-2012-2885: Possible double free on exit. Credit to the
+      Chromium development community.
+    - Low CVE-2012-2891: Address leak over IPC. Credit to Lei Zhang of the
+      Chromium development community.
+    - Low CVE-2012-2892: Pop-up block bypass. Credit to Google Chrome
+      Security Team (Cris Neckar).
+    - High CVE-2012-2893: Double free in XSL transforms. Credit to Google
+      Chrome Security Team (Cris Neckar).
+    - High CVE-2012-2900: Crash in Skia text rendering.
+      Credit to Atte Kettunen of OUSPG.
+    - Critical CVE-2012-5108: Race condition in audio device
+      handling. Credit to Atte Kettunen of OUSPG.
+    - Medium CVE-2012-5109: OOB read in ICU regex. Credit to Arthur
+      Gerkis.
+    - Medium CVE-2012-5110: Out-of-bounds read in compositor. Credit to
+      Google Chrome Security Team (Inferno).
+    - Low CVE-2012-5111: Plug-in crash monitoring was missing for Pepper
+      plug-ins. Credit to Google Chrome Security Team (Chris Evans).
+    - Critical CVE-2012-5112: SVG use-after-free and IPC arbitrary file write.
+      Credit to Pinkie Pie.
+  * [3de18b6] Use zlib internal copy. This is necessary due to the CRIME work
+     around. We can use the system zlib when chrome will remove
+     SPDY 2/3 support.
+  * [3b9811a] Updated patches
+  * [152902d] Install libvpx_obj_int_extract
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Mon, 01 Oct 2012 15:22:27 +0200
+
+chromium-browser (21.0.1180.89~r154005-1) unstable; urgency=high
+
+  * New stable security release:
+    - Medium CVE-2012-2865: Out-of-bounds read in line breaking. Credit to miaubiz.
+    - High CVE-2012-2866: Bad cast with run-ins. Credit to miaubiz.
+    - Low CVE-2012-2867: Browser crash with SPDY.
+    - Medium CVE-2012-2868: Race condition with workers and XHR.
+      Credit to miaubiz.
+    - High CVE-2012-2869: Avoid stale buffer in URL loading. Credit to
+      Fermin Serna of the Google Security Team.
+    - Low CVE-2012-2870: Lower severity memory management issues
+      in XPath. Credit to Nicolas Gregoire.
+    - High CVE-2012-2871: Bad cast in XSL transforms. Credit to
+      Nicolas Gregoire.
+    - Medium CVE-2012-2872: XSS in SSL interstitial. Credit to
+      Emmanuel Bronshtein.
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Fri, 31 Aug 2012 11:24:58 +0200
+
+chromium-browser (21.0.1180.75~r150248-1) unstable; urgency=medium
+
+  [ Shawn Landden ]
+  * [b7c6ba3] update changelog to record changes in last upload
+  * [3c6a149] master_prefs: don't go straight to internet, don't prompt to change default browser
+  * [e441276] initial_bookmarks.html: add Debian support page
+  * [2bb621a] compress source tarball as xz (Closes: #676774)
+
+  [ Giuseppe Iuculano ]
+  * New stable minor release fixing the following issues:
+    - REGRESSION: Rendering difference in Chrome 21 and 22 that affected on
+      Persian Wikipedia
+    - Some known crashes
+    - Audio objects are not "switched" immediately
+    - Print and Print Preview ignore paper size default in printer config
+    - Candidate windows is shown in wrong place in Retina display
+    - more of the choppy and distorted audio issues 
+    - Japanese characters showing in Chinese font 
+    - Sync invalidation notification broken after restart
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Fri, 10 Aug 2012 17:31:57 +0200
+
+chromium-browser (21.0.1180.57~r148591-1) unstable; urgency=medium
+
+  [ Giuseppe Iuculano ]
+  * [fd04758] Install demo extension
+  * New upstream stable release:
+    - Medium CVE-2012-2846: Cross-process interference in
+      renderers. Credit to Google Chrome Security Team (Julien Tinnes).
+    - Low CVE-2012-2847: Missing re-prompt to user upon excessive
+      downloads. Credit to Matt Austin of Aspect Security.
+    - Medium CVE-2012-2848: Overly broad file access granted after
+      drag+drop. Credit to Matt Austin of Aspect Security.
+    - Low CVE-2012-2849: Off-by-one read in GIF decoder. Credit to Atte
+      Kettunen of OUSPG.
+    - Medium CVE-2012-2853: webRequest can interfere with the Chrome Web
+      Store. Credit to Trev of Adblock.
+    - Low CVE-2012-2854: Leak of pointer values to WebUI renderers. Credit
+      to Nasko Oskov of the Chromium development community.
+    - High CVE-2012-2855: Use-after-free in PDF viewer. Credit to Mateusz
+      Jurczyk of Google Security Team, with contributions by Gynvael Coldwind of
+      Google Security Team.
+    - High CVE-2012-2857: Use-after-free in CSS DOM. Credit to
+    - Arthur Gerkis.
+    - High CVE-2012-2858: Buffer overflow in WebP decoder. Credit
+      to Jüri Aedla.
+    - Critical CVE-2012-2859: Crash in tab handling. Credit to
+      Jeff Roberts of Google Security Team.
+    - Medium CVE-2012-2860: Out-of-bounds access when clicking in date
+      picker. Credit to Chamal de Silva.
+  [ Shawn Landden ]
+   * [0d2e43a9] Switch to xz/lzma2 compression for debs. (from lzma)
+   * [e3e9a801] replace incorrect prefs.patch with patch from OpenSUSE
+   * [faed2b9e] /etc/chromium/master_preferences: don't bug user for
+       Google account.
+
+ -- Giuseppe Iuculano <iuculano@debian.org>  Tue, 07 Aug 2012 10:55:17 +0200
+
 chromium-browser (20.0.1132.57~r145807-1) unstable; urgency=medium
 
   [ Michael Gilbert ]
diff --git a/debian/chromedriver.install b/debian/chromedriver.install
new file mode 100644 (file)
index 0000000..ddc9dba
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/chromium/chromedriver
diff --git a/debian/chromium-browser.links b/debian/chromium-browser.links
deleted file mode 100644 (file)
index 6b1b72e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/chromium usr/bin/chromium-browser
-usr/share/pixmaps/chromium.png usr/share/pixmaps/chromium-browser.png
-usr/share/man/man1/chromium.1.gz usr/share/man/man1/chromium-browser.1.gz
index 5ee353a..8df0eeb 100644 (file)
@@ -1 +1 @@
-debian/tmp/usr/lib/chromium/resources/inspector
+usr/share/chromium-inspector
diff --git a/debian/chromium-inspector.links b/debian/chromium-inspector.links
new file mode 100644 (file)
index 0000000..4389291
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/chromium-inspector /usr/lib/chromium/resources/inspector
index eb9a864..94fc434 100644 (file)
@@ -1,17 +1,23 @@
 debian/tmp/etc
 debian/tmp/usr/bin
-debian/tmp/usr/lib/chromium/chrom*
+
+debian/tmp/usr/lib/chromium/chromium
+debian/tmp/usr/lib/chromium/chrome-sandbox
 debian/tmp/usr/lib/chromium/*.pak
 debian/tmp/usr/lib/chromium/resources/extension/demo/library.js
 debian/tmp/usr/lib/chromium/content_resources.pak
 debian/tmp/usr/lib/chromium/locales/*
-#debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
-#debian/tmp/usr/lib/chromium/libppGoogleNaClPluginChrome.so
-debian/tmp/usr/lib/chromium/libffmpegsumo.so
-#debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
-#debian/tmp/usr/lib/chromium/nacl_irt_*
+debian/tmp/usr/lib/chromium/remoting_locales
+debian/tmp/usr/lib/chromium/lib*
+debian/tmp/usr/lib/chromium/mksnapshot.*
 debian/tmp/usr/lib/chromium/pseudo_locales/fake-bidi.pak
+debian/tmp/usr/lib/chromium/icudtl.dat
+
 debian/chromium.desktop usr/share/applications
+
 debian/chromium.xml usr/share/gnome-control-center/default-apps
+
+debian/initial_bookmarks.html etc/chromium
 debian/master_preferences etc/chromium
+
 debian/presubj usr/share/bug/chromium
index 7ef8e1d..ab64bed 100644 (file)
@@ -1,3 +1,6 @@
-chromium: embedded-library usr/lib/chromium/chromium: sqlite
-chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_64.nexe
-chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_32.nexe
+embedded-library usr/lib/chromium/chromium: libpng
+embedded-library usr/lib/chromium/chromium: sqlite
+embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
+embedded-library usr/lib/chromium/libffmpegsumo.so: libavutil
+setuid-binary usr/lib/chromium/chrome-sandbox 4755 root/root
+shlib-with-non-pic-code usr/lib/chromium/libffmpegsumo.so
index 30679ef..ae57078 100644 (file)
@@ -4,146 +4,109 @@ Priority: optional
 Maintainer: Debian Chromium Maintainers <pkg-chromium-maint@lists.alioth.debian.org>
 Uploaders:
  Giuseppe Iuculano <iuculano@debian.org>,
- Michael Gilbert <michael.s.gilbert@gmail.com>
-Vcs-Git: git://git.debian.org/git/pkg-chromium/pkg-chromium.git
+ Michael Gilbert <mgilbert@debian.org>,
+Vcs-Git: git://anonscm.debian.org/pkg-chromium/pkg-chromium.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-chromium/pkg-chromium.git
-Homepage: http://code.google.com/chromium/
-Build-Depends: cdbs,
-       debhelper (>= 7),
-       g++-4.6,
-       pkg-config,
-       lsb-release,
-       gyp (>= 0.1~svn1119),
-       patchutils (>= 0.2.25),
-       python,
-       bison,
-       flex,
-       gperf,
-       gdb,
-       wdiff,
-       coreutils (>= 7.5) | timeout,
-       xvfb,
-       x11-apps,
-       xfonts-base,
-       ttf-kochi-gothic,
-       ttf-kochi-mincho,
-       libjpeg-dev,
-       libpng-dev,
-       libbz2-dev,
-       zlib1g-dev,
-       libxml2-dev,
-       libxslt1-dev,
-       lzma-dev,
-       libhunspell-dev,
-       libsqlite3-dev,
-       libasound2-dev,
-       libnss3-dev (>= 3.12.3),
-       libnspr4-dev (>= 2:4.9-2~),
-       libgl1-mesa-dri,
-       mesa-common-dev,
-       libgl1-mesa-dev,
-       libglu1-mesa-dev,
-       libxss-dev,
-       libpango1.0-dev,
-       libglib2.0-dev,
-       libgtk2.0-dev,
-       libdbus-glib-1-dev,
-       libgconf2-dev,
-       libicu-dev (>= 4.2.1),
-       libevent-dev (>= 1.4.13),
-       yasm,
-       libprotobuf-dev,
-       protobuf-compiler,
-       libglewmx-dev,
-       libvpx-dev,
-       libcups2-dev (>= 1.5.0),
-       libgnome-keyring-dev,
-       libspeex-dev,
-       hardening-wrapper,
-       libxt-dev,
-       libxtst-dev,
-       libpam0g-dev,
-       binutils-gold,
-       libflac-dev,
-       libwebp-dev,
-       autotools-dev,
-       libv8-dev (>= 3.8),
-       libpulse-dev,
-       libavcodec-dev (>= 4:0.7.1),
-       libavformat-dev (>= 4:0.7.1),
-       libavutil-dev (>= 4:0.7.1),
-       scons,
-       libelf-dev,
-       python-simplejson,
-       libegl1-mesa-dev,
-       libgles2-mesa-dev,
-       subversion,
-       libudev-dev,
-       libssl-dev
-Standards-Version: 3.9.2
-
-Package: chromium-browser
-Architecture: all
-Depends: chromium (>= 10), ${misc:Depends}
-Breaks: chromium (<< 13.0.782.215~r97094-1)
-Replaces: chromium (<< 13.0.782.215~r97094-1)
-Section: oldlibs
-Description: Chromium browser - transitional dummy package
- 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.
- .
- Chromium serves as a base for Google Chrome, which is Chromium rebranded (name
- and logo) with very few additions such as usage tracking and an auto-updater
- system.
- .
- This package contains the Chromium browser transitional dummy package.
-
-Package: chromium-browser-dbg
-Architecture: all
-Section: oldlibs
-Depends: chromium-dbg, chromium, ${misc:Depends}
-Priority: extra
-Description: chromium-browser debug symbols transitional dummy package
- Debug symbols for the Chromium browser - transitional dummy package
- .
- 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.
-
-Package: chromium-browser-l10n
-Architecture: all
-Section: oldlibs
-Depends: chromium-l10n, ${misc:Depends}
-Description: chromium-browser language packages - transitional dummy package
- 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
- (transitional dummy package):
- 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
-
-Package: chromium-browser-inspector
-Architecture: all
-Section: oldlibs
-Depends: chromium-inspector, ${misc:Depends}
-Description: page inspector for the chromium-browser - transitional dummy package
- 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', transitional dummy package.
+Homepage: http://www.chromium.org/Home
+Build-Depends:
+ cdbs,
+ debhelper (>= 7),
+ g++-4.8,
+ pkg-config,
+ lsb-release,
+ gyp (>= 0.1~svn1119),
+ patchutils (>= 0.2.25),
+ python,
+ bison,
+ flex,
+ gperf,
+ wdiff,
+ coreutils (>= 7.5) | timeout,
+ xvfb,
+ x11-apps,
+ xfonts-base,
+ fonts-ipafont-gothic,
+ fonts-ipafont-mincho,
+ libjpeg-dev,
+ libpng-dev,
+ libbz2-dev,
+ libxml2-dev,
+ libxslt1-dev,
+ lzma-dev,
+ libhunspell-dev,
+ libsqlite3-dev,
+ libasound2-dev,
+ libnss3-dev (>= 3.12.3),
+ libnspr4-dev (>= 2:4.9-2~),
+ libgl1-mesa-dri,
+ mesa-common-dev,
+ libgl1-mesa-dev,
+ libglu1-mesa-dev,
+ libxss-dev,
+ libglib2.0-dev,
+ libgtk2.0-dev,
+ libdbus-glib-1-dev,
+ libgconf2-dev,
+ libevent-dev (>= 1.4.13),
+ yasm,
+ libprotobuf-dev,
+ protobuf-compiler,
+ libglewmx-dev,
+ libvpx-dev,
+ libcups2-dev (>= 1.5.0),
+ libgnome-keyring-dev,
+ libspeex-dev,
+ libspeechd-dev,
+ libxt-dev,
+ libxtst-dev,
+ libpam0g-dev,
+ libflac-dev,
+ libwebp-dev,
+ autotools-dev,
+ libpulse-dev,
+ scons,
+ libelf-dev,
+ python-simplejson,
+ libegl1-mesa-dev,
+ libgles2-mesa-dev,
+ subversion,
+ git,
+ libkrb5-dev,
+ libudev-dev,
+ libssl-dev,
+ libpci-dev,
+ libcap-dev,
+ libdrm-dev,
+ libjs-jquery,
+ libjs-excanvas,
+ libjs-jquery-flot | libjs-flot,
+ libgcrypt11-dev | libgcrypt20-dev,
+Standards-Version: 3.9.5
 
 Package: chromium
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends},
-       libnspr4 (>= 2:4.9-2~),
-       xdg-utils,
-       chromium-inspector
-Suggests: chromium-l10n
-Provides: www-browser, chromium-testsuite, gnome-www-browser
-Replaces: chromium-testsuite, chromium-codecs-ffmpeg, chromium-codecs-ffmpeg-extra, chromium-browser (<< 10.0.648.82~r75062-1~)
-Conflicts: chromium-testsuite, chromium-codecs-ffmpeg, chromium-codecs-ffmpeg-extra, chromium-browser (<< 10.0.648.82~r75062-1~)
-Description: Google's open source chromium web browser
+Architecture: i386 amd64
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libnspr4 (>= 2:4.9-2~),
+ xdg-utils,
+ chromium-inspector,
+Suggests:
+ mozplugger,
+ chromium-l10n,
+Provides:
+ www-browser,
+ gnome-www-browser,
+ chromium-testsuite,
+Replaces:
+ chromium-testsuite,
+ chromium-codecs-ffmpeg,
+ chromium-codecs-ffmpeg-extra,
+Conflicts:
+ chromium-testsuite,
+ chromium-codecs-ffmpeg,
+ chromium-codecs-ffmpeg-extra,
+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.
  .
@@ -151,45 +114,69 @@ 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 armel armhf
+Architecture: i386 amd64
 Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, chromium (= ${binary:Version})
-Provides: chromium-testsuite-dbg
-Replaces: chromium-testsuite-dbg, chromium-browser-dbg (<< 10.0.648.82~r75062-1~)
-Conflicts: chromium-testsuite-dbg, chromium-browser-dbg (<< 10.0.648.82~r75062-1~)
+Depends:
+ ${misc:Depends},
+ chromium (= ${binary:Version}),
+Provides:
+ chromium-testsuite-dbg
+Replaces:
+ chromium-testsuite-dbg
+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
-Depends: ${misc:Depends}, chromium (>= ${source:Version}), chromium (<< ${source:Version}.1~)
-Replaces: chromium-browser-l10n (<< 10.0.648.82~r75062-1~)
-Conflicts: chromium-browser-l10n (<< 10.0.648.82~r75062-1~)
+Section: localization
+Depends:
+ ${misc:Depends},
+ chromium (>= ${source:Version}),
+ chromium (<< ${source:Version}.1~),
 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
 
 Package: chromium-inspector
 Architecture: all
-Depends: ${misc:Depends}
-Recommends: chromium (>= 10)
-Conflicts: chromium (<< ${source:Version}), chromium-browser-inspector (<< 10.0.648.82~r75062-1~)
-Replaces: chromium-browser-inspector (<< 10.0.648.82~r75062-1~)
-Description: page inspector for the chromium browser
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+Recommends:
+ chromium (>= 10),
+Conflicts:
+ chromium (<< ${source:Version}),
+Replaces:
+ chromium (<< 31.0.1650.48-1),
+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
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ chromium (= ${binary:Version}),
+Description: WebDriver driver for Chromium browser
+ Chromedriver serves as a bridge between the chromium web browser and the
+ selenium webdriver.
+ .
+ See http://code.google.com/p/selenium/wiki/ChromeDriver for details.
index 10bd7b7..3321670 100644 (file)
@@ -1875,7 +1875,6 @@ Files: src/chrome_frame/tools/test/page_cycler/cf_cycler.py
 Copyright: Copyright (c) 2009 The Chromium Authors. All rights reserved.
  Use of this source code is governed by a BSD-style license that can be
  found in the LICENSE file.
-:
 License: global BSD-style Chromium
 
 Files: src/depot_tools/gclient_utils.py
@@ -1918,20 +1917,12 @@ Files: src/depot_tools/third_party/__init__.py
 Copyright: Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.:
 License: global BSD-style Chromium
 
-Files: src/depot_tools/third_party/pymox/stubout_test.py
-Copyright: UNKNOWN:
-License: *No copyright* Apache-2.0
-
-Files: src/depot_tools/third_party/pymox/setup.py, src/depot_tools/third_party/pymox/stubout_testee.py
-Copyright: UNKNOWN:
-License: *No copyright* UNKNOWN
-
-Files: src/depot_tools/third_party/pymox/mox.py, src/depot_tools/third_party/pymox/mox_test.py, src/depot_tools/third_party/pymox/mox_test_helper.py, src/depot_tools/third_party/pymox/stubout.py
-Copyright: Copyright: 2008 Google Inc:
+Files: src/depot_tools/third_party/pymox/*
+Copyright: Copyright 2008 Google Inc.
 License: Apache-2.0
 
 Files: src/depot_tools/third_party/repo/progress.py
-Copyright: Copyright: 2009 The Android Open Source Project:
+Copyright: Copyright: 2009 The Android Open Source Project
 License: Apache-2.0
 
 Files: src/depot_tools/third_party/simplejson/__init__.py, src/depot_tools/third_party/simplejson/decoder.py, src/depot_tools/third_party/simplejson/encoder.py, src/depot_tools/third_party/simplejson/ordered_dict.py, src/depot_tools/third_party/simplejson/scanner.py, src/depot_tools/third_party/simplejson/tool.py
@@ -13118,7 +13109,6 @@ Files: src/third_party/cld/base/string_util.h
 Copyright: Copyright (c) 2010 The Chromium Authors. All rights reserved.
  Use of this source code is governed by a BSD-style license that can be
  found in the LICENSE file.
-:
 License: global BSD-style Chromium
 
 Files: src/third_party/cld/base/basictypes.h
@@ -20767,7 +20757,7 @@ License: BSL-1
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License GPL-2+
+License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
@@ -20785,7 +20775,7 @@ License GPL-2+
  On debian/ubuntu the full license text can be found here:
  /usr/share/common-licenses/GPL-2
 
-License GPL (v3 or later)
+License: GPL (v3 or later)
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
diff --git a/debian/initial_bookmarks.html b/debian/initial_bookmarks.html
new file mode 100644 (file)
index 0000000..c9da165
--- /dev/null
@@ -0,0 +1,12 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1>Bookmarks</H1>
+<DL><p>
+    <DT><H3 PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Bar</H3>
+    <DL><p>
+        <DT><A HREF="http://www.debian.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Debian.org</A>
+        <DT><A HREF="http://www.debian.org/News/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Latest News</A>
+        <DT><A HREF="http://www.debian.org/support" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Help</A>
+    </DL><p>
+</DL><p>
index 2389f6a..db54668 100644 (file)
@@ -1,19 +1,20 @@
 {
   "distribution": {
+     "import_bookmarks": false,
+     "import_bookmarks_from_file": "/etc/chromium/initial_bookmarks.html",
      "skip_first_run_ui": true,
      "make_chrome_default": false,
      "make_chrome_default_for_user": false,
      "create_all_shortcuts": true,
-     "show_welcome_page": true
+     "show_welcome_page": false
   },
   "browser": {
-     "show_home_button": true
+     "show_home_button": true,
+     "check_default_browser" : false
   },
   "bookmark_bar": {
      "show_on_all_tabs": true
   },
-  "first_run_tabs": [
-     "http://www.debian.org"
-  ],
   "homepage": "http://www.debian.org"
 }
+
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
deleted file mode 100644 (file)
index 976c12f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sid/src/build/common.gypi
-===================================================================
---- sid.orig/src/build/common.gypi     2012-08-06 12:15:02.377549576 +0200
-+++ sid/src/build/common.gypi  2012-08-06 12:15:13.853549209 +0200
-@@ -732,7 +732,7 @@
-     'arm_fpu%': 'vfpv3',
-     # Set ARM float abi compilation flag.
--    'arm_float_abi%': 'softfp',
-+    #'arm_float_abi%': 'softfp',
-     # Enable new NPDevice API.
-     'enable_new_npdevice_api%': 0,
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
deleted file mode 100644 (file)
index f09defc..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: sid/src/skia/skia.gyp
-===================================================================
---- sid.orig/src/skia/skia.gyp 2012-08-06 10:27:59.000000000 +0200
-+++ sid/src/skia/skia.gyp      2012-08-06 12:19:18.277541378 +0200
-@@ -1210,9 +1210,11 @@
-         [ 'target_arch == "arm" and armv7 != 1', {
-           'sources': [
-             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
-+            '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
-           ],
-           'sources!': [
-             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
-+            '../third_party/skia/src/opts/opts_check_arm.cpp',
-           ],
-         }],
-       ],
-Index: sid/src/ui/base/resource/data_pack.cc
-===================================================================
---- sid.orig/src/ui/base/resource/data_pack.cc 2012-08-06 10:29:02.000000000 +0200
-+++ sid/src/ui/base/resource/data_pack.cc      2012-08-06 12:19:18.277541378 +0200
-@@ -130,9 +130,11 @@
-   // 2) Verify the entries are within the appropriate bounds. There's an extra
-   // entry after the last item which gives us the length of the last item.
-   for (size_t i = 0; i < resource_count_ + 1; ++i) {
-+    uint32 t;
-     const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(
-         mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry)));
--    if (entry->file_offset > mmap_->length()) {
-+    memcpy(&t, &entry->file_offset, 32/8);
-+    if (t > mmap_->length()) {
-       LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
-                  << "Was the file corrupted?";
-       UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
-Index: sid/src/v8/src/arm/macro-assembler-arm.cc
-===================================================================
---- sid.orig/src/v8/src/arm/macro-assembler-arm.cc     2012-08-06 10:30:43.000000000 +0200
-+++ sid/src/v8/src/arm/macro-assembler-arm.cc  2012-08-06 12:19:18.281541378 +0200
-@@ -61,9 +61,9 @@
- // We do not support thumb inter-working with an arm architecture not supporting
- // the blx instruction (below v5t).  If you know what CPU you are compiling for
- // you can use -march=armv7 or similar.
--#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
--# error "For thumb inter-working we require an architecture which supports blx"
--#endif
-+//#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
-+//# error "For thumb inter-working we require an architecture which supports blx"
-+//#endif
- // Using bx does not yield better code, so use it only when required
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
deleted file mode 100644 (file)
index 4bdec8b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-Do not use armv4 incopatible code
-Index: sid/src/third_party/skia/include/core/SkMath.h
-===================================================================
---- sid.orig/src/third_party/skia/include/core/SkMath.h        2012-08-06 10:30:10.000000000 +0200
-+++ sid/src/third_party/skia/include/core/SkMath.h     2012-08-06 12:13:40.057552214 +0200
-@@ -156,7 +156,7 @@
- #if defined(__arm__) \
-   && !defined(__thumb__) \
-   && !defined(__ARM_ARCH_4T__) \
--  && !defined(__ARM_ARCH_5T__)
-+  && 0
-     static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
-         SkASSERT((int16_t)x == x);
-         SkASSERT((int16_t)y == y);
-Index: sid/src/build/common.gypi
-===================================================================
---- sid.orig/src/build/common.gypi     2012-08-06 10:28:13.000000000 +0200
-+++ sid/src/build/common.gypi  2012-08-06 12:13:40.057552214 +0200
-@@ -2123,6 +2123,7 @@
-                   # silences those warnings, as they are not helpful and
-                   # clutter legitimate warnings.
-                   '-Wno-abi',
-+                  '-fno-tree-sink',
-                 ],
-                 'conditions': [
-                   ['arm_thumb==1', {
-Index: sid/src/base/debug/debugger_posix.cc
-===================================================================
---- sid.orig/src/base/debug/debugger_posix.cc  2012-08-06 10:28:13.000000000 +0200
-+++ sid/src/base/debug/debugger_posix.cc       2012-08-06 12:13:40.057552214 +0200
-@@ -215,7 +215,7 @@
- } while (0)
- #else
- // ARM && !ANDROID
--#define DEBUG_BREAK() asm("bkpt 0")
-+#define DEBUG_BREAK() asm("nop")
- #endif
- #else
- #define DEBUG_BREAK() asm("int3")
-Index: sid/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
-===================================================================
---- sid.orig/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp      2012-08-06 10:30:09.000000000 +0200
-+++ sid/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp   2012-08-06 12:13:40.057552214 +0200
-@@ -675,8 +675,8 @@
-                   /* dst1_scale and dst2_scale*/
-                   "lsr    r9, r5, #24                \n\t" /* src >> 24 */
-                   "lsr    r10, r6, #24               \n\t" /* src >> 24 */
--                  "smulbb r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
--                  "smulbb r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
-+                  "mul    r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
-+                  "mul    r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
-                   "lsr    r9, r9, #8                 \n\t" /* r9 >> 8 */
-                   "lsr    r10, r10, #8               \n\t" /* r10 >> 8 */
-                   "rsb    r9, r9, #256               \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
-@@ -745,7 +745,7 @@
-                   "lsr    r6, r5, #24                \n\t" /* src >> 24 */
-                   "and    r8, r12, r5, lsr #8        \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
--                  "smulbb r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
-+                  "mul    r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
-                   "and    r9, r12, r5                \n\t" /* rb = r9 = r5 masked by r12 */
-                   "lsr    r6, r6, #8                 \n\t" /* r6 >> 8 */
-                   "mul    r8, r8, %[alpha]           \n\t" /* ag = r8 times scale */
diff --git a/debian/patches/chromedriver-revision.patch b/debian/patches/chromedriver-revision.patch
new file mode 100644 (file)
index 0000000..047674a
--- /dev/null
@@ -0,0 +1,15 @@
+description: set chromedriver version as undefined
+
+Index: chromium/src/chrome/test/chromedriver/embed_version_in_cpp.py
+===================================================================
+--- chromium.orig/src/chrome/test/chromedriver/embed_version_in_cpp.py 2014-04-11 01:43:42.224278647 +0000
++++ chromium/src/chrome/test/chromedriver/embed_version_in_cpp.py      2014-04-11 01:43:42.220278647 +0000
+@@ -25,7 +25,7 @@
+   options, args = parser.parse_args()
+   version = open(options.version_file, 'r').read().strip()
+-  revision = lastchange.FetchVersionInfo(None).revision
++  revision = "undefined"
+   if revision:
+     version += '.' + revision.strip()
diff --git a/debian/patches/chromium_useragent.patch b/debian/patches/chromium_useragent.patch
deleted file mode 100644 (file)
index 8af06f8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
----
- webkit/glue/webkit_glue.cc |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-Index: src/webkit/glue/webkit_glue.cc
-===================================================================
---- src.orig/webkit/glue/webkit_glue.cc
-+++ src/webkit/glue/webkit_glue.cc
-@@ -366,18 +366,24 @@
-   // Get the product name and version, and replace Safari's Version/X string
-   // with it.  This is done to expose our product name in a manner that is
-   // maximally compatible with Safari, we hope!!
-   std::string product;
-   if (!mimic_safari) {
-     scoped_ptr<FileVersionInfo> version_info(
-         FileVersionInfo::CreateFileVersionInfoForCurrentModule());
--    if (version_info.get())
-+    if (version_info.get()) {
-+      std::string product_name;
-+
-+      product_name = WideToASCII(version_info->product_name());
-       product = "Chrome/" + WideToASCII(version_info->product_version());
-+      if (LowerCaseEqualsASCII(product_name, "chromium"))
-+        product += " " + product_name + "/" + WideToASCII(version_info->product_version());
-+    }
-   }
-   if (product.empty())
-     product = "Version/3.2.1";
-   // Derived from Safari's UA string.
-   StringAppendF(
-       result,
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
deleted file mode 100644 (file)
index 7138504..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix build failure due to cups 1.5 header changes
-Author: Michael Gilbert <michael.s.gilbert@gmail.com>
-Index: sid/src/printing/backend/cups_helper.h
-===================================================================
---- sid.orig/src/printing/backend/cups_helper.h        2012-08-06 10:27:46.000000000 +0200
-+++ sid/src/printing/backend/cups_helper.h     2012-08-06 12:15:11.021549299 +0200
-@@ -7,6 +7,7 @@
- #pragma once
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include "printing/printing_export.h"
-Index: sid/src/chrome/service/cloud_print/print_system_cups.cc
-===================================================================
---- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc       2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/service/cloud_print/print_system_cups.cc    2012-08-06 12:15:11.021549299 +0200
-@@ -5,6 +5,7 @@
- #include "chrome/service/cloud_print/print_system.h"
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <dlfcn.h>
- #include <errno.h>
- #include <pthread.h>
diff --git a/debian/patches/disable-gn.patch b/debian/patches/disable-gn.patch
new file mode 100644 (file)
index 0000000..d9c1be5
--- /dev/null
@@ -0,0 +1,24 @@
+description: disable RunGN
+
+Index: chromium/src/build/gyp_chromium
+===================================================================
+--- chromium.orig/src/build/gyp_chromium       2014-04-11 01:47:45.796272377 +0000
++++ chromium/src/build/gyp_chromium    2014-04-11 01:57:42.008257029 +0000
+@@ -39,8 +39,6 @@
+ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
+     'Source', 'build', 'scripts'))
+-import find_depot_tools
+-
+ # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
+ # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
+ # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco
+@@ -477,8 +475,6 @@
+     args.append('--check')
+   supplemental_includes = GetSupplementalFiles()
+-  if not RunGN(supplemental_includes):
+-    sys.exit(1)
+   args.extend(
+       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
index e9332eb..dc1eae2 100644 (file)
@@ -1,8 +1,8 @@
 Include system copy of expat.h
 Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
 ===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2012-08-06 10:33:28.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h      2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h      2014-03-14 17:19:55.172905796 +0100
 @@ -32,9 +32,9 @@
  
  #include "talk/xmllite/xmlnsstack.h"
@@ -17,8 +17,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
  struct XML_ParserStruct;
 Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
 ===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc    2012-08-06 10:33:25.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc    2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2014-03-14 17:19:55.172905796 +0100
 @@ -31,9 +31,9 @@
  #include "talk/base/common.h"
  #include "talk/xmpp/constants.h"
@@ -33,8 +33,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
  namespace buzz {
 Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
 ===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp      2012-08-06 10:30:16.000000000 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp   2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp      2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp   2014-03-14 17:19:55.172905796 +0100
 @@ -11,7 +11,7 @@
  #include "SkString.h"
  #include "SkStream.h"
@@ -46,8 +46,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
  #define CHAR_16_TO_9
 Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
 ===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp  2012-08-06 10:30:16.000000000 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp       2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp  2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp       2014-03-14 17:19:55.172905796 +0100
 @@ -12,7 +12,7 @@
  #include "SkString.h"
  #include "SkStream.h"
@@ -59,8 +59,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
  {
 Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
 ===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h        2012-08-06 10:33:28.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h     2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h        2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h     2014-03-14 17:19:55.172905796 +0100
 @@ -33,11 +33,7 @@
  #include "talk/base/scoped_ptr.h"
  #include "talk/xmllite/xmlparser.h"
index 4a43f45..9712046 100644 (file)
@@ -1,27 +1,70 @@
 description: ffmpeg compatibility on the arm arch
 Index: sid/src/third_party/ffmpeg/ffmpeg_generated.gypi
 ===================================================================
---- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi      2012-08-06 10:29:43.000000000 +0200
-+++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi   2012-08-06 12:13:43.805552095 +0200
-@@ -168,21 +168,14 @@
-         'libavcodec/arm/dsputil_arm.S',
-         'libavcodec/arm/dsputil_armv6.S',
-         'libavcodec/arm/dsputil_init_arm.c',
--        'libavcodec/arm/dsputil_init_armv5te.c',
-         'libavcodec/arm/dsputil_init_armv6.c',
--        'libavcodec/arm/dsputil_init_vfp.c',
--        'libavcodec/arm/dsputil_vfp.S',
-         'libavcodec/arm/fft_fixed_init_arm.c',
-         'libavcodec/arm/fft_init_arm.c',
-         'libavcodec/arm/fmtconvert_init_arm.c',
--        'libavcodec/arm/fmtconvert_vfp.S',
-         'libavcodec/arm/h264pred_init_arm.c',
-         'libavcodec/arm/jrevdct_arm.S',
-         'libavcodec/arm/mpegvideo_arm.c',
--        'libavcodec/arm/mpegvideo_armv5te.c',
--        'libavcodec/arm/mpegvideo_armv5te_s.S',
-         'libavcodec/arm/simple_idct_arm.S',
--        'libavcodec/arm/simple_idct_armv5te.S',
-         'libavcodec/arm/simple_idct_armv6.S',
-         'libavcodec/arm/vp8_armv6.S',
-         'libavcodec/arm/vp8dsp_armv6.S',
+--- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi      2013-03-16 09:38:07.000000000 +0100
++++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi   2013-03-30 17:40:15.887737358 +0100
+@@ -114,19 +114,16 @@
+           'libavcodec/arm/h264dsp_init_arm.c',
+           'libavcodec/arm/mpegaudiodsp_init_arm.c',
+           'libavcodec/arm/mpegvideo_arm.c',
+-          'libavcodec/arm/mpegvideo_armv5te.c',
+           'libavcodec/arm/sbrdsp_init_arm.c',
+         ],
+         'asm_sources': [
+           'libavcodec/arm/mpegaudiodsp_fixed_armv6.S',
+-          'libavcodec/arm/mpegvideo_armv5te_s.S',
+         ],
+         'converter_outputs': [
+           '<(shared_generated_dir)/libavcodec/arm/aacpsdsp_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/h264dsp_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/mpegaudiodsp_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/mpegvideo_arm.c',
+-          '<(shared_generated_dir)/libavcodec/arm/mpegvideo_armv5te.c',
+           '<(shared_generated_dir)/libavcodec/arm/sbrdsp_init_arm.c',
+         ],
+       }],  # (target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromeOS") and (1)
+@@ -321,9 +318,7 @@
+       ['(target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)', {
+         'c_sources': [
+           'libavcodec/arm/dsputil_init_arm.c',
+-          'libavcodec/arm/dsputil_init_armv5te.c',
+           'libavcodec/arm/dsputil_init_armv6.c',
+-          'libavcodec/arm/dsputil_init_vfp.c',
+           'libavcodec/arm/fft_fixed_init_arm.c',
+           'libavcodec/arm/fft_init_arm.c',
+           'libavcodec/arm/fmtconvert_init_arm.c',
+@@ -333,26 +328,19 @@
+           'libavcodec/arm/vp8dsp_init_armv6.c',
+           'libavutil/arm/cpu.c',
+           'libavutil/arm/float_dsp_init_arm.c',
+-          'libavutil/arm/float_dsp_init_vfp.c',
+         ],
+         'asm_sources': [
+           'libavcodec/arm/dsputil_arm.S',
+           'libavcodec/arm/dsputil_armv6.S',
+-          'libavcodec/arm/dsputil_vfp.S',
+-          'libavcodec/arm/fmtconvert_vfp.S',
+           'libavcodec/arm/jrevdct_arm.S',
+           'libavcodec/arm/simple_idct_arm.S',
+-          'libavcodec/arm/simple_idct_armv5te.S',
+           'libavcodec/arm/simple_idct_armv6.S',
+           'libavcodec/arm/vp8_armv6.S',
+           'libavcodec/arm/vp8dsp_armv6.S',
+-          'libavutil/arm/float_dsp_vfp.S',
+         ],
+         'converter_outputs': [
+           '<(shared_generated_dir)/libavcodec/arm/dsputil_init_arm.c',
+-          '<(shared_generated_dir)/libavcodec/arm/dsputil_init_armv5te.c',
+           '<(shared_generated_dir)/libavcodec/arm/dsputil_init_armv6.c',
+-          '<(shared_generated_dir)/libavcodec/arm/dsputil_init_vfp.c',
+           '<(shared_generated_dir)/libavcodec/arm/fft_fixed_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/fft_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/fmtconvert_init_arm.c',
+@@ -362,7 +350,6 @@
+           '<(shared_generated_dir)/libavcodec/arm/vp8dsp_init_armv6.c',
+           '<(shared_generated_dir)/libavutil/arm/cpu.c',
+           '<(shared_generated_dir)/libavutil/arm/float_dsp_init_arm.c',
+-          '<(shared_generated_dir)/libavutil/arm/float_dsp_init_vfp.c',
+         ],
+       }],  # (target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)
+       ['(1) and (1) and (1)', {
diff --git a/debian/patches/file-5.17.patch b/debian/patches/file-5.17.patch
new file mode 100644 (file)
index 0000000..5d3848d
--- /dev/null
@@ -0,0 +1,16 @@
+description: file >= 5.17 needs -E option to error on non-existent files
+author: Christoph Beidl <debian.axhn@manchmal.in-ulm.de>
+
+Index: sid/src/build/linux/python_arch.sh
+===================================================================
+--- sid.orig/src/build/linux/python_arch.sh    2014-03-14 17:20:21.712905872 +0100
++++ sid/src/build/linux/python_arch.sh 2014-03-14 17:20:21.708905872 +0100
+@@ -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
index 04e07b0..4bc122d 100644 (file)
@@ -6,8 +6,8 @@ Last-Update: 2011-02-20
 
 Index: sid/src/chrome/app/resources/manpage.1.in
 ===================================================================
---- sid.orig/src/chrome/app/resources/manpage.1.in     2012-08-06 10:28:20.000000000 +0200
-+++ sid/src/chrome/app/resources/manpage.1.in  2012-08-06 12:15:05.973549461 +0200
+--- sid.orig/src/chrome/app/resources/manpage.1.in     2014-03-14 17:20:01.580905814 +0100
++++ sid/src/chrome/app/resources/manpage.1.in  2014-03-14 17:20:01.576905814 +0100
 @@ -1,5 +1,5 @@
 -." This file is processed by chrome.gyp to generate manpages in the
 -." build diretory.
diff --git a/debian/patches/fix_null_conversion.patch b/debian/patches/fix_null_conversion.patch
deleted file mode 100644 (file)
index 49fbe82..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/src/chrome/browser/gpu_process_host_ui_shim.cc
-+++ b/src/chrome/browser/gpu_process_host_ui_shim.cc
-@@ -102,7 +102,7 @@ RenderWidgetHostView* GpuProcessHostUISh
- GpuProcessHostUIShim::GpuProcessHostUIShim()
-     : host_id_(++g_last_host_id),
--      gpu_process_(NULL) {
-+      gpu_process_(0) {
-   g_hosts_by_id.AddWithID(this, host_id_);
-   gpu_data_manager_ = GpuDataManager::GetInstance();
-   DCHECK(gpu_data_manager_);
-@@ -236,7 +236,7 @@ void GpuProcessHostUIShim::SendOutstandi
-     channel_requests_.pop();
-     EstablishChannelError(callback.release(),
-                           IPC::ChannelHandle(),
--                          NULL,
-+                          0,
-                           GPUInfo());
-   }
-@@ -266,7 +266,7 @@ void GpuProcessHostUIShim::EstablishGpuC
-   // If GPU features are already blacklisted, no need to establish the channel.
-   if (gpu_data_manager_->GetGpuFeatureFlags().flags() != 0) {
-     EstablishChannelError(
--        wrapped_callback.release(), IPC::ChannelHandle(), NULL, GPUInfo());
-+        wrapped_callback.release(), IPC::ChannelHandle(), 0, GPUInfo());
-     return;
-   }
-@@ -274,7 +274,7 @@ void GpuProcessHostUIShim::EstablishGpuC
-     channel_requests_.push(wrapped_callback);
-   } else {
-     EstablishChannelError(
--        wrapped_callback.release(), IPC::ChannelHandle(), NULL, GPUInfo());
-+        wrapped_callback.release(), IPC::ChannelHandle(), 0, GPUInfo());
-   }
- }
-@@ -419,7 +419,7 @@ void GpuProcessHostUIShim::OnChannelEsta
-     Send(new GpuMsg_CloseChannel(channel_handle));
-     EstablishChannelError(callback.release(),
-                           IPC::ChannelHandle(),
--                          NULL,
-+                          0,
-                           gpu_info);
-     AddCustomLogMessage(logging::LOG_WARNING, "WARNING",
-         "Hardware acceleration is unavailable.");
---- a/src/chrome/gpu/gpu_channel.cc
-+++ b/src/chrome/gpu/gpu_channel.cc
-@@ -26,8 +26,8 @@ GpuChannel::GpuChannel(GpuThread* gpu_th
-                        int renderer_id)
-     : gpu_thread_(gpu_thread),
-       renderer_id_(renderer_id),
--      renderer_process_(NULL),
--      renderer_pid_(NULL) {
-+      renderer_process_(0),
-+      renderer_pid_(0) {
-   DCHECK(gpu_thread);
-   DCHECK(renderer_id);
-   const CommandLine* command_line = CommandLine::ForCurrentProcess();
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
deleted file mode 100644 (file)
index 3572c9e..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h
-===================================================================
---- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2012-08-06 10:28:37.000000000 +0200
-+++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h      2012-08-06 12:15:50.369548039 +0200
-@@ -9,6 +9,7 @@
- #include <stddef.h>
- #include <string>
- #include <vector>
-+#include <cstddef>
- #include "base/string16.h"
- #include "chrome/browser/search_engines/search_engine_type.h"
-Index: sid/src/gpu/command_buffer/common/types.h
-===================================================================
---- sid.orig/src/gpu/command_buffer/common/types.h     2012-08-06 10:27:47.000000000 +0200
-+++ sid/src/gpu/command_buffer/common/types.h  2012-08-06 12:15:50.369548039 +0200
-@@ -12,6 +12,7 @@
- #endif
- #include <cstddef>
- #include <string>
-+#include <cstddef>
- typedef signed char         schar;
- typedef signed char         int8;
-Index: sid/src/ipc/ipc_channel.h
-===================================================================
---- sid.orig/src/ipc/ipc_channel.h     2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/ipc/ipc_channel.h  2012-08-06 12:15:50.369548039 +0200
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- // Copyright (c) 2012 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-Index: sid/src/third_party/ots/src/os2.cc
-===================================================================
---- sid.orig/src/third_party/ots/src/os2.cc    2012-08-06 10:29:56.000000000 +0200
-+++ sid/src/third_party/ots/src/os2.cc 2012-08-06 12:15:50.369548039 +0200
-@@ -5,6 +5,7 @@
- #include "os2.h"
- #include "head.h"
-+#include <cstddef>
- // OS/2 - OS/2 and Windows Metrics
- // http://www.microsoft.com/opentype/otspec/os2.htm
-Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
-===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h        2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h     2012-08-06 12:15:50.373548039 +0200
-@@ -39,6 +39,7 @@
- #include <stddef.h>   // for std::ptrdiff_t
- #include <limits>
-+#include <cstddef>
- #include "base/logging.h"
-Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
-===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h      2012-08-06 12:15:50.373548039 +0200
-@@ -63,6 +63,7 @@
- #define HAVE_VDSO_SUPPORT 1
-+#include <cstddef>
- #include <stdlib.h>     // for NULL
- namespace base {
-Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
-===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc   2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/common.cc        2012-08-06 12:15:50.373548039 +0200
-@@ -33,6 +33,7 @@
- #include "config.h"
- #include "common.h"
- #include "system-alloc.h"
-+#include <cstddef>
- #if defined(HAVE_UNISTD_H) && defined(HAVE_GETPAGESIZE)
- #include <unistd.h>                     // for getpagesize
-Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
-===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2012-08-06 10:28:01.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h      2012-08-06 12:15:50.373548039 +0200
-@@ -40,6 +40,7 @@
- #endif
- #include <stddef.h>  // for NULL
- #include <map>
-+#include <cstddef>
- using std::map;
-Index: sid/src/ui/gfx/codec/jpeg_codec.h
-===================================================================
---- sid.orig/src/ui/gfx/codec/jpeg_codec.h     2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/ui/gfx/codec/jpeg_codec.h  2012-08-06 12:15:50.373548039 +0200
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <vector>
-+#include <cstddef>
- #include "ui/base/ui_export.h"
diff --git a/debian/patches/gcc46.patch b/debian/patches/gcc46.patch
deleted file mode 100644 (file)
index e78932c..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
---- a/src/gpu/command_buffer/common/cmd_buffer_common.h
-+++ b/src/gpu/command_buffer/common/cmd_buffer_common.h
-@@ -7,6 +7,8 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_
- #define GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_
-+
-+#include <cstddef>
- #include "../common/types.h"
- #include "../common/bitfield_helpers.h"
- #include "../common/logging.h"
---- a/src/gpu/command_buffer/common/gles2_cmd_format.h
-+++ b/src/gpu/command_buffer/common/gles2_cmd_format.h
-@@ -11,6 +11,7 @@
- #include <KHR/khrplatform.h>
- #include <string.h>
-+#include <cstddef>
- #include "../common/types.h"
- #include "../common/bitfield_helpers.h"
---- a/src/net/http/http_net_log_params.h
-+++ b/src/net/http/http_net_log_params.h
-@@ -12,6 +12,7 @@
- #include "base/memory/ref_counted.h"
- #include "net/base/net_log.h"
- #include "net/http/http_request_headers.h"
-+#include "net/http/http_response_headers.h"
- class Value;
---- a/src/net/spdy/spdy_http_stream.cc
-+++ b/src/net/spdy/spdy_http_stream.cc
-@@ -16,6 +16,7 @@
- #include "net/base/net_util.h"
- #include "net/http/http_request_headers.h"
- #include "net/http/http_request_info.h"
-+#include "net/http/http_response_headers.h"
- #include "net/http/http_response_info.h"
- #include "net/http/http_util.h"
- #include "net/spdy/spdy_http_utils.h"
---- a/src/third_party/ots/src/ots.h
-+++ b/src/third_party/ots/src/ots.h
-@@ -6,6 +6,7 @@
- #define OTS_H_
- #include <cstdarg>
-+#include <cstddef>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
---- a/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
-+++ b/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
-@@ -37,6 +37,7 @@
- #include <config.h>
-+#include <cstddef>
- #include <limits>
- #include "base/basictypes.h"
---- a/src/third_party/tcmalloc/chromium/src/base/vdso_support.cc
-+++ b/src/third_party/tcmalloc/chromium/src/base/vdso_support.cc
-@@ -39,6 +39,7 @@
- #ifdef HAVE_VDSO_SUPPORT     // defined in vdso_support.h
-+#include <cstddef>
- #include <fcntl.h>
- #include "base/atomicops.h"  // for MemoryBarrier
---- a/src/third_party/tcmalloc/chromium/src/symbolize.h
-+++ b/src/third_party/tcmalloc/chromium/src/symbolize.h
-@@ -48,7 +48,7 @@ using std::map;
- class SymbolTable {
-  public:
-   SymbolTable()
--    : symbol_buffer_(NULL) {}
-+    : symbol_buffer_(0) {}
-   ~SymbolTable() {
-     delete[] symbol_buffer_;
-   }
---- a/src/third_party/tcmalloc/chromium/src/system-alloc.cc
-+++ b/src/third_party/tcmalloc/chromium/src/system-alloc.cc
-@@ -31,6 +31,7 @@
- // Author: Sanjay Ghemawat
- #include <config.h>
-+#include <cstddef>
- #if defined HAVE_STDINT_H
- #include <stdint.h>
- #elif defined HAVE_INTTYPES_H
---- a/src/ui/gfx/codec/jpeg_codec.h
-+++ b/src/ui/gfx/codec/jpeg_codec.h
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <vector>
-+#include <cstdlib>
- class SkBitmap;
---- a/src/third_party/ots/src/os2.cc
-+++ b/src/third_party/ots/src/os2.cc
-@@ -5,6 +5,7 @@
- #include "os2.h"
- #include "head.h"
-+#include <cstddef>
- // OS/2 - OS/2 and Windows Metrics
- // http://www.microsoft.com/opentype/otspec/os2.htm
---- a/src/third_party/tcmalloc/chromium/src/common.cc
-+++ b/src/third_party/tcmalloc/chromium/src/common.cc
-@@ -30,6 +30,7 @@
- // ---
- // Author: Sanjay Ghemawat <opensource@google.com>
-+#include <cstddef>
- #include "config.h"
- #include "system-alloc.h"
- #include "config.h"
index 6651dda..4157740 100644 (file)
@@ -1,8 +1,8 @@
 description: use system glew library
 Index: sid/src/build/linux/system.gyp
 ===================================================================
---- sid.orig/src/build/linux/system.gyp        2012-08-06 12:13:54.125551763 +0200
-+++ sid/src/build/linux/system.gyp     2012-08-06 12:15:02.377549576 +0200
+--- sid.orig/src/build/linux/system.gyp        2012-11-13 10:38:43.396406253 +0100
++++ sid/src/build/linux/system.gyp     2012-11-13 10:38:47.172406163 +0100
 @@ -497,6 +497,23 @@
        },
      },
@@ -29,9 +29,9 @@ Index: sid/src/build/linux/system.gyp
        'type': 'none',
 Index: sid/src/chrome/chrome.gyp
 ===================================================================
---- sid.orig/src/chrome/chrome.gyp     2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/chrome.gyp  2012-08-06 12:15:02.377549576 +0200
-@@ -247,6 +247,7 @@
+--- sid.orig/src/chrome/chrome.gyp     2012-11-08 08:57:58.000000000 +0100
++++ sid/src/chrome/chrome.gyp  2012-11-13 10:38:47.192406163 +0100
+@@ -250,6 +250,7 @@
          '../base/base.gyp:base',
          '../content/content.gyp:content_utility',
          '../skia/skia.gyp:skia',
@@ -41,9 +41,9 @@ Index: sid/src/chrome/chrome.gyp
          'utility/chrome_content_utility_client.cc',
 Index: sid/src/build/common.gypi
 ===================================================================
---- sid.orig/src/build/common.gypi     2012-08-06 12:13:40.057552214 +0200
-+++ sid/src/build/common.gypi  2012-08-06 12:15:02.377549576 +0200
-@@ -1409,6 +1409,7 @@
+--- sid.orig/src/build/common.gypi     2012-11-13 10:38:38.452406372 +0100
++++ sid/src/build/common.gypi  2012-11-13 10:38:47.196406163 +0100
+@@ -1567,6 +1567,7 @@
        ['enable_gpu==1', {
          'defines': [
            'ENABLE_GPU=1',
index 532c6bd..558c706 100644 (file)
@@ -1,8 +1,8 @@
-Index: sid/src/chrome/browser/ui/gtk/gtk_util.cc
+Index: chromium/src/chrome/browser/ui/gtk/gtk_util.cc
 ===================================================================
---- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc     2012-08-06 10:28:32.000000000 +0200
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc  2012-08-06 12:19:22.081541256 +0200
-@@ -57,7 +57,7 @@
+--- chromium.orig/src/chrome/browser/ui/gtk/gtk_util.cc        2014-04-11 01:43:18.260279264 +0000
++++ chromium/src/chrome/browser/ui/gtk/gtk_util.cc     2014-04-11 01:43:18.256279264 +0000
+@@ -56,7 +56,7 @@
  #if defined(GOOGLE_CHROME_BUILD)
  static const char* kIconName = "google-chrome";
  #else
diff --git a/debian/patches/libav0.8.patch b/debian/patches/libav0.8.patch
deleted file mode 100644 (file)
index f4c836b..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/media/ffmpeg/ffmpeg_common.h
-+++ b/src/media/ffmpeg/ffmpeg_common.h
-@@ -23,6 +23,7 @@ MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/mathematics.h>
- #include <libavutil/log.h>
- MSVC_POP_WARNING();
- }  // extern "C"
diff --git a/debian/patches/linker-flags.patch b/debian/patches/linker-flags.patch
new file mode 100644 (file)
index 0000000..0363677
--- /dev/null
@@ -0,0 +1,13 @@
+description: flags to avoid memory exhaustion while linking on i386
+
+--- a/src/build/common.gypi
++++ a/src/build/common.gypi
+@@ -3153,6 +3153,8 @@
+         'ldflags': [
+           '-Wl,-z,now',
+           '-Wl,-z,relro',
++          '-Wl,--no-keep-memory',
++          '-Wl,--reduce-memory-overheads',
+         ],
+       },
+     }],
diff --git a/debian/patches/make-support/gyp.patch b/debian/patches/make-support/gyp.patch
new file mode 100644 (file)
index 0000000..6350de0
--- /dev/null
@@ -0,0 +1,17 @@
+description: restore support for building with make rather than ninja
+
+--- a/src/build/gyp_chromium
++++ a/src/build/gyp_chromium
+@@ -246,12 +246,6 @@ if __name__ == '__main__':
+   if sys.platform not in ('darwin',):
+     args.append('--no-circular-check')
+-  # We explicitly don't support the make gyp generator (crbug.com/348686). Be
+-  # nice and fail here, rather than choking in gyp.
+-  if 'make' in os.environ.get('GYP_GENERATORS', ''):
+-    print 'Error: make gyp generator not supported (check GYP_GENERATORS).'
+-    sys.exit(1)
+-
+   # Default to ninja on linux and windows, but only if no generator has
+   # explicitly been set.
+   # Also default to ninja on mac, but only when not building chrome/ios.
diff --git a/debian/patches/make-support/mojo.patch b/debian/patches/make-support/mojo.patch
new file mode 100644 (file)
index 0000000..f158aa1
--- /dev/null
@@ -0,0 +1,64 @@
+description: manually strip out mojo since use_mojo=0 by itself isn't enough
+
+--- a/src/build/all.gyp
++++ b/src/build/all.gyp
+@@ -79,7 +79,6 @@
+             '../jingle/jingle.gyp:*',
+             '../media/cast/cast.gyp:*',
+             '../media/media.gyp:*',
+-            '../mojo/mojo.gyp:*',
+             '../ppapi/ppapi.gyp:*',
+             '../ppapi/ppapi_internal.gyp:*',
+             '../ppapi/tools/ppapi_tools.gyp:*',
+@@ -283,7 +282,6 @@
+             '../jingle/jingle.gyp:jingle_unittests',
+             '../media/cast/cast.gyp:cast_unittests',
+             '../media/media.gyp:media_unittests',
+-            '../mojo/mojo.gyp:mojo',
+             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
+             '../remoting/remoting.gyp:remoting_unittests',
+             '../third_party/WebKit/public/all.gyp:all_blink',
+--- a/src/content/content.gyp
++++ b/src/content/content.gyp
+@@ -22,11 +22,6 @@
+     ],
+   },
+   'conditions': [
+-    ['use_mojo==1', {
+-      'includes': [
+-        'content_common_mojo_bindings.gypi',
+-      ],
+-    }],
+     ['OS != "ios"', {
+       'includes': [
+         '../build/win_precompile.gypi',
+--- a/src/content/content_tests.gypi
++++ b/src/content/content_tests.gypi
+@@ -923,27 +923,6 @@
+           ],
+         },
+         {
+-          'target_name': 'web_ui_test_mojo_bindings',
+-          'type': 'static_library',
+-          'dependencies': [
+-            '../mojo/mojo.gyp:mojo_bindings',
+-            '../mojo/mojo.gyp:mojo_system',
+-          ],
+-          'sources': [
+-            'test/data/web_ui_test_mojo_bindings.mojom',
+-          ],
+-          # TODO(sky): this shouldn't be necessary. It's working around a bug in
+-          # gyp.
+-          'variables': {
+-            'mojom_base_output_dir': 'content',
+-          },
+-          'includes': [ '../mojo/public/bindings/mojom_bindings_generator.gypi' ],
+-          'export_dependent_settings': [
+-            '../mojo/mojo.gyp:mojo_bindings',
+-            '../mojo/mojo.gyp:mojo_system',
+-          ],
+-        },
+-        {
+           'target_name': 'content_browsertests',
+           'type': '<(gtest_target_type)',
+           'dependencies': [
diff --git a/debian/patches/make-support/opus.patch b/debian/patches/make-support/opus.patch
new file mode 100644 (file)
index 0000000..8390e4a
--- /dev/null
@@ -0,0 +1,12 @@
+description: # gets interpreted as a comment, leading to compile errors (not a documented gcc option anyway)
+
+--- a/src/third_party/opus/opus.gyp
++++ b/src/third_party/opus/opus.gyp
+@@ -54,7 +54,6 @@
+           'cflags': [
+             # Suppress a warning given by opus_decoder.c that tells us
+             # optimizations are turned off.
+-            '-Wno-#pragma-messages',
+           ],
+         }],
+         ['use_opus_fixed_point==0', {
diff --git a/debian/patches/no-polymer.patch b/debian/patches/no-polymer.patch
new file mode 100644 (file)
index 0000000..60eaf03
--- /dev/null
@@ -0,0 +1,3 @@
+description: don't use sourceless polymer.js.min (bug #735355)
+author: Michael Gilbert <mgilbert@debian.org>
+
diff --git a/debian/patches/no-promo.patch b/debian/patches/no-promo.patch
new file mode 100644 (file)
index 0000000..8c31ea4
--- /dev/null
@@ -0,0 +1,16 @@
+author: Michael Gilbert <mgilbert@debian.org>
+description: disable the ad promo system by default
+bug-debian: http://bugs.debian.org/634101
+Index: chromium/src/chrome/browser/ui/app_list/app_list_service.cc
+===================================================================
+--- chromium.orig/src/chrome/browser/ui/app_list/app_list_service.cc
++++ chromium/src/chrome/browser/ui/app_list/app_list_service.cc
+@@ -103,7 +103,7 @@ void AppListService::RegisterPrefs(PrefR
+   // Identifies whether we should show the app launcher promo or not.
+   // Note that a field trial also controls the showing, so the promo won't show
+   // unless the pref is set AND the field trial is set to a proper group.
+-  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
++  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
+ }
+ // static
diff --git a/debian/patches/no-sse2.patch b/debian/patches/no-sse2.patch
new file mode 100644 (file)
index 0000000..45d831e
--- /dev/null
@@ -0,0 +1,26 @@
+description: don't set sse2 compiler flags on i386
+author: Michael Gilbert <mgilbert@debian.org>
+debian-bug: http://bugs.debian.org/750361
+
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -3391,7 +3391,7 @@
+                 # http://crbug.com/313032 for an example where this has "bit"
+                 # us in the past.
+                 'cflags': [
+-                  '-msse2',
++                  '-msse',
+                   '-mfpmath=sse',
+                   '-mmmx',  # Allows mmintrin.h for MMX intrinsics.
+                   '-m32',
+--- a/src/third_party/qcms/qcms.gyp
++++ b/src/third_party/qcms/qcms.gyp
+@@ -31,7 +31,7 @@
+       'msvs_disabled_warnings': [ 4018 ],
+       'conditions': [
+-        ['target_arch=="ia32" or target_arch=="x64"', {
++        ['target_arch=="x64"', {
+           'defines': [
+             'SSE2_ENABLE',
+           ],
diff --git a/debian/patches/no_tree_sink_v8.patch b/debian/patches/no_tree_sink_v8.patch
deleted file mode 100644 (file)
index 1e06025..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
----
- v8/tools/gyp/v8.gyp |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: src/v8/tools/gyp/v8.gyp
-===================================================================
---- src.orig/v8/tools/gyp/v8.gyp
-+++ src/v8/tools/gyp/v8.gyp
-@@ -86,16 +86,17 @@
-             'cflags': [
-               '-fomit-frame-pointer',
-               '-O3',
-             ],
-             'conditions': [
-               [ 'gcc_version==44', {
-                 'cflags': [
-                   # Avoid gcc 4.4 strict aliasing issues in dtoa.c
-+                  '-fno-tree-sink',
-                   '-fno-strict-aliasing',
-                   # Avoid crashes with gcc 4.4 in the v8 test suite.
-                   '-fno-tree-vrp',
-                 ],
-               }],
-             ],
-           }],
-           ['OS=="mac"', {
index e33d2a0..4e374b1 100644 (file)
@@ -1,78 +1,54 @@
 Include system copy of prtime.h
-Index: sid/src/base/pr_time_unittest.cc
+Index: chromium/src/chrome/browser/metrics/metrics_log.cc
 ===================================================================
---- sid.orig/src/base/pr_time_unittest.cc      2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/pr_time_unittest.cc   2012-08-06 12:12:18.157554839 +0200
-@@ -5,7 +5,7 @@
- #include <time.h>
- #include "base/compiler_specific.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
- #include "base/time.h"
- #include "testing/gtest/include/gtest/gtest.h"
-Index: sid/src/base/time.cc
-===================================================================
---- sid.orig/src/base/time.cc  2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/time.cc       2012-08-06 12:12:18.157554839 +0200
-@@ -10,7 +10,7 @@
- #endif
- #include "base/sys_string_conversions.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
- #include "base/logging.h"
-Index: sid/src/chrome/browser/metrics/metrics_log.cc
-===================================================================
---- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2012-08-06 10:28:30.000000000 +0200
-+++ sid/src/chrome/browser/metrics/metrics_log.cc      2012-08-06 12:12:18.161554837 +0200
-@@ -16,7 +16,7 @@
- #include "base/string_number_conversions.h"
- #include "base/string_util.h"
+--- chromium.orig/src/chrome/browser/metrics/metrics_log.cc
++++ chromium/src/chrome/browser/metrics/metrics_log.cc
+@@ -22,7 +22,7 @@
+ #include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
  #include "base/sys_info.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
- #include "base/time.h"
+ #include "base/time/time.h"
  #include "base/tracked_objects.h"
- #include "base/utf_string_conversions.h"
-Index: sid/src/base/base.gypi
+ #include "chrome/browser/autocomplete/autocomplete_input.h"
+Index: chromium/src/base/base.gypi
 ===================================================================
---- sid.orig/src/base/base.gypi        2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/base.gypi     2012-08-06 12:12:18.161554837 +0200
-@@ -17,7 +17,6 @@
+--- chromium.orig/src/base/base.gypi
++++ chromium/src/base/base.gypi
+@@ -18,8 +18,6 @@
            'third_party/dmg_fp/dtoa_wrapper.cc',
            'third_party/icu/icu_utf.cc',
            'third_party/icu/icu_utf.h',
 -          'third_party/nspr/prtime.cc',
-           'third_party/nspr/prtime.h',
-           'third_party/nspr/prcpucfg_linux.h',
+-          'third_party/nspr/prtime.h',
+           'third_party/superfasthash/superfasthash.c',
            'third_party/xdg_mime/xdgmime.h',
-Index: sid/src/crypto/nss_util.cc
+           'allocator/allocator_extension.cc',
+Index: chromium/src/base/time/pr_time_unittest.cc
 ===================================================================
---- sid.orig/src/crypto/nss_util.cc    2012-08-06 10:27:56.000000000 +0200
-+++ sid/src/crypto/nss_util.cc 2012-08-06 12:12:18.161554837 +0200
-@@ -9,7 +9,7 @@
- #include <plarena.h>
- #include <prerror.h>
- #include <prinit.h>
--#include <prtime.h>
+--- chromium.orig/src/base/time/pr_time_unittest.cc
++++ chromium/src/base/time/pr_time_unittest.cc
+@@ -5,7 +5,7 @@
+ #include <time.h>
+ #include "base/compiler_specific.h"
+-#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
- #include <pk11pub.h>
- #include <secmod.h>
+ #include "base/time/time.h"
+ #include "testing/gtest/include/gtest/gtest.h"
  
-Index: sid/src/net/base/x509_certificate_nss.cc
+Index: chromium/src/base/time/time.cc
 ===================================================================
---- sid.orig/src/net/base/x509_certificate_nss.cc      2012-08-06 10:27:59.000000000 +0200
-+++ sid/src/net/base/x509_certificate_nss.cc   2012-08-06 12:12:18.161554837 +0200
-@@ -9,7 +9,7 @@
- #include <keyhi.h>
- #include <nss.h>
- #include <pk11pub.h>
--#include <prtime.h>
+--- chromium.orig/src/base/time/time.cc
++++ chromium/src/base/time/time.cc
+@@ -10,7 +10,8 @@
+ #include "base/float_util.h"
+ #include "base/lazy_instance.h"
+ #include "base/logging.h"
+-#include "base/third_party/nspr/prtime.h"
++
 +#include <nspr/prtime.h>
- #include <secder.h>
- #include <sechash.h>
+ namespace base {
  
index 8374d6e..5be138b 100644 (file)
@@ -1,11 +1,11 @@
 webkit needs to call nss to pull in nspr headers
-Index: sid/src/chrome/chrome_common.gypi
+Index: chromium/src/chrome/chrome_common.gypi
 ===================================================================
---- sid.orig/src/chrome/chrome_common.gypi     2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/chrome_common.gypi  2012-08-06 12:12:25.157554613 +0200
-@@ -299,6 +299,11 @@
-             '<(DEPTH)/third_party/wtl/include',
-           ]
+--- chromium.orig/src/chrome/chrome_common.gypi
++++ chromium/src/chrome/chrome_common.gypi
+@@ -483,6 +483,11 @@
+               'common/local_discovery/local_discovery_messages.h',
+             ]
          }],
 +        ['OS=="linux"', {
 +          'include_dirs': [
index a949f4e..d52fce4 100644 (file)
@@ -1,16 +1,17 @@
 Author:  Raymond Wooninck (tittiatcoke)
 Source: OpenSUSE (chromium-master-prefs-path.patch)
-Index: sid/src/chrome/browser/first_run/first_run_linux.cc
+Index: sid/src/chrome/browser/first_run/first_run_internal_linux.cc
 ===================================================================
---- sid.orig/src/chrome/browser/first_run/first_run_linux.cc   2012-08-06 10:28:37.000000000 +0200
-+++ sid/src/chrome/browser/first_run/first_run_linux.cc        2012-08-06 12:13:35.981552344 +0200
-@@ -101,8 +101,7 @@
- FilePath MasterPrefsPath() {
+--- sid.orig/src/chrome/browser/first_run/first_run_internal_linux.cc  2014-03-14 17:19:57.308905802 +0100
++++ sid/src/chrome/browser/first_run/first_run_internal_linux.cc       2014-03-14 17:19:57.300905802 +0100
+@@ -19,9 +19,7 @@
+ base::FilePath MasterPrefsPath() {
    // The standard location of the master prefs is next to the chrome binary.
-   FilePath master_prefs;
+-  base::FilePath master_prefs;
 -  if (!PathService::Get(base::DIR_EXE, &master_prefs))
--    return FilePath();
-+  master_prefs = FilePath("/etc/chromium");
+-    return base::FilePath();
++  base::FilePath master_prefs = base::FilePath("/etc/chromium");
    return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
  }
  
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
new file mode 100644 (file)
index 0000000..2a3b0ae
--- /dev/null
@@ -0,0 +1,14 @@
+description: add ps printing capability
+author: Salvatore Bonaccorso
+Index: sid/src/chrome/browser/printing/print_dialog_gtk.cc
+===================================================================
+--- sid.orig/src/chrome/browser/printing/print_dialog_gtk.cc   2014-03-14 17:20:12.120905844 +0100
++++ sid/src/chrome/browser/printing/print_dialog_gtk.cc        2014-03-14 17:20:12.116905844 +0100
+@@ -245,6 +245,7 @@
+   // Since we only generate PDF, only show printers that support PDF.
+   // TODO(thestig) Add more capabilities to support?
+   GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
++      GTK_PRINT_CAPABILITY_GENERATE_PS |
+       GTK_PRINT_CAPABILITY_GENERATE_PDF |
+       GTK_PRINT_CAPABILITY_PAGE_SET |
+       GTK_PRINT_CAPABILITY_COPIES |
index dd6f193..7229eb8 100644 (file)
@@ -3,23 +3,26 @@ nspr.patch
 nss.patch
 expat.patch
 prefs.patch
-armv4.patch
-ffmpeg_arm.patch
+#ffmpeg_arm.patch
 system-speech.patch
-glew.patch
+#glew.patch
 fix-manpage.patch
-webkit-version.patch
 #ffmpeg.patch
-#gcc46.patch
 #vpx.patch
 #protobuf.patch
 #javascript-i18n.patch
 #icu.patch
-cups1.5.patch
 #system_v8.patch
-#protobuf.patch
-arm-no-float-abi.patch
-vpx.patch
-gcc4.7.patch
-arm.patch
 icon.patch
+third-party-cookies-off-by-default.patch
+ps-print.patch
+window-placement.patch
+no-promo.patch
+chromedriver-revision.patch
+
+linker-flags.patch
+no-sse2.patch
+
+make-support/gyp.patch
+make-support/mojo.patch
+make-support/opus.patch
index 2174a4f..75bec0f 100644 (file)
@@ -1,9 +1,9 @@
 Use system speex
-Index: sid/src/build/linux/system.gyp
+Index: chromium/src/build/linux/system.gyp
 ===================================================================
---- sid.orig/src/build/linux/system.gyp        2012-08-06 10:28:12.000000000 +0200
-+++ sid/src/build/linux/system.gyp     2012-08-06 12:13:54.125551763 +0200
-@@ -384,6 +384,26 @@
+--- chromium.orig/src/build/linux/system.gyp
++++ chromium/src/build/linux/system.gyp
+@@ -585,6 +585,26 @@
        ],
      },
      {
@@ -30,29 +30,29 @@ Index: sid/src/build/linux/system.gyp
        'target_name': 'gnome_keyring',
        'type': 'none',
        'conditions': [
-Index: sid/src/content/browser/speech/audio_encoder.cc
+Index: chromium/src/content/browser/speech/audio_encoder.cc
 ===================================================================
---- sid.orig/src/content/browser/speech/audio_encoder.cc       2012-08-06 10:27:52.000000000 +0200
-+++ sid/src/content/browser/speech/audio_encoder.cc    2012-08-06 12:13:54.125551763 +0200
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc
++++ chromium/src/content/browser/speech/audio_encoder.cc
 @@ -11,7 +11,7 @@
- #include "base/string_number_conversions.h"
+ #include "base/strings/string_number_conversions.h"
  #include "content/browser/speech/audio_buffer.h"
- #include "third_party/flac/flac.h"
--#include "third_party/speex/speex.h"
+ #include "third_party/flac/include/FLAC/stream_encoder.h"
+-#include "third_party/speex/include/speex/speex.h"
 +#include <speex/speex.h>
  
- using std::string;
- using speech::AudioChunk;
-Index: sid/src/content/content_browser.gypi
+ namespace content {
+ namespace {
+Index: chromium/src/content/content_browser.gypi
 ===================================================================
---- sid.orig/src/content/content_browser.gypi  2012-08-06 10:27:54.000000000 +0200
-+++ sid/src/content/content_browser.gypi       2012-08-06 12:14:55.985549781 +0200
-@@ -13,7 +13,7 @@
-     '../ppapi/ppapi_internal.gyp:ppapi_proxy',
-     '../skia/skia.gyp:skia',
-     '../third_party/flac/flac.gyp:libflac',
--    '../third_party/speex/speex.gyp:libspeex',
-+    '../build/linux/system.gyp:speex',
-     '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-     '../third_party/zlib/zlib.gyp:zlib',
-     '../ui/surface/surface.gyp:surface',
+--- chromium.orig/src/content/content_browser.gypi
++++ chromium/src/content/content_browser.gypi
+@@ -1729,7 +1729,7 @@
+     }, {  # input_speech==1
+       'dependencies': [
+         '../third_party/flac/flac.gyp:libflac',
+-        '../third_party/speex/speex.gyp:libspeex',
++        '../build/linux/system.gyp:speex',
+       ],
+     }],
+     ['OS == "win"', {
diff --git a/debian/patches/third-party-cookies-off-by-default.patch b/debian/patches/third-party-cookies-off-by-default.patch
new file mode 100644 (file)
index 0000000..f403ce8
--- /dev/null
@@ -0,0 +1,16 @@
+Description: Make default of third-party cookies the most secure for users.
+Author: Chad Miller <chad.miller@canonical.com>
+
+Index: sid/src/chrome/browser/content_settings/cookie_settings.cc
+===================================================================
+--- sid.orig/src/chrome/browser/content_settings/cookie_settings.cc    2014-03-14 17:20:09.640905837 +0100
++++ sid/src/chrome/browser/content_settings/cookie_settings.cc 2014-03-14 17:20:09.636905837 +0100
+@@ -70,7 +70,7 @@
+     user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(
+       prefs::kBlockThirdPartyCookies,
+-      false,
++      true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ }
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
deleted file mode 100644 (file)
index 602f38a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sid/src/remoting/remoting.gyp
-===================================================================
---- sid.orig/src/remoting/remoting.gyp 2012-08-06 10:27:44.000000000 +0200
-+++ sid/src/remoting/remoting.gyp      2012-08-06 12:15:16.629549120 +0200
-@@ -1031,7 +1031,7 @@
-         '../ui/ui.gyp:ui',
-         '../net/net.gyp:net',
-         '../skia/skia.gyp:skia',
--        '../third_party/libvpx/libvpx.gyp:libvpx',
-+        '../third_party/libvpx/libvpx.gyp:libvpx_include',
-         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-         '../third_party/zlib/zlib.gyp:zlib',
-         '../media/media.gyp:yuv_convert',
-Index: sid/src/third_party/libvpx/libvpx.gyp
-===================================================================
---- sid.orig/src/third_party/libvpx/libvpx.gyp 2012-08-06 10:30:05.000000000 +0200
-+++ sid/src/third_party/libvpx/libvpx.gyp      2012-08-06 12:15:16.665549120 +0200
-@@ -281,11 +281,17 @@
-     {
-       'target_name': 'libvpx_include',
-       'type': 'none',
--      'direct_dependent_settings': {
--        'include_dirs': [
--          'source/libvpx',
--        ],
--      },
-+      'conditions': [
-+        ['_toolset=="target"', {
-+          'link_settings': {
-+            'ldflags': [
-+              '<!@(pkg-config --libs-only-L --libs-only-other vpx)',
-+            ],
-+            'libraries': [
-+              '<!@(pkg-config --libs-only-l vpx)',
-+            ],
-+          },
-+      }]]
-     },
-     {
-       'target_name': 'libvpx_lib',
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
deleted file mode 100644 (file)
index acef7f5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-description: debian-specific version parsing (for about dialog)
-Index: sid/src/webkit/build/webkit_version.py
-===================================================================
---- sid.orig/src/webkit/build/webkit_version.py        2012-08-06 10:27:46.000000000 +0200
-+++ sid/src/webkit/build/webkit_version.py     2012-08-06 12:15:08.557549378 +0200
-@@ -61,6 +61,15 @@
-       default_lastchange=None,
-       directory=os.path.join(webkit_dir, version_file_dir),
-       directory_regex_prior_to_src_url='webkit')
-+  if version_info.url is None or version_info.url == 'unknown':
-+    # parse the DEPS file
-+    data = open("../../DEPS", "rb").read()
-+    x = re.search(r'"webkit_revision": "(\d+)",', data)
-+    rev = x.group(1) if x else "n-a"
-+    x = re.search(r'"webkit_trunk": "(.*?)",', data)
-+    branch = os.path.basename(x.group(1)) if x else "n-a"
-+    return "%s@%s" % (branch, rev)
-+
-   if version_info.url == None:
-     version_info.url = 'Unknown URL'
diff --git a/debian/patches/window-placement.patch b/debian/patches/window-placement.patch
new file mode 100644 (file)
index 0000000..7924bac
--- /dev/null
@@ -0,0 +1,17 @@
+Subject: Prevent windows from jumping to front for new tabs
+From: Tony Houghton <h@realh.co.uk>
+Bug: https://code.google.com/p/chromium/issues/detail?id=297679
+Bug-Debian: http://bugs.debian.org/725350
+Index: chromium/src/chrome/browser/ui/gtk/browser_window_gtk.cc
+===================================================================
+--- chromium.orig/src/chrome/browser/ui/gtk/browser_window_gtk.cc      2014-04-11 01:43:31.348278927 +0000
++++ chromium/src/chrome/browser/ui/gtk/browser_window_gtk.cc   2014-04-11 01:43:31.344278927 +0000
+@@ -577,7 +577,7 @@
+   // browser instead if we don't explicitly set it here.
+   BrowserList::SetLastActive(browser());
+-  gtk_window_present(window_);
++  gtk_widget_show(GTK_WIDGET(window_));
+   if (show_state_after_show_ == ui::SHOW_STATE_MAXIMIZED) {
+     gtk_window_maximize(window_);
+     show_state_after_show_ = ui::SHOW_STATE_NORMAL;
index c756de7..a6fd2ca 100755 (executable)
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
+export DH_VERBOSE = 1
 
 DEBIAN_NAME            := chromium
+SOURCE_NAME            := chromium-browser
 DEBIAN_VERSION         := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
 DEBIAN_UPSTREAM_VERSION        := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
 DEBIAN_REVISION                := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
@@ -20,19 +22,19 @@ DEB_TAR_SRCDIR := src
 SRC_DIR        := $(CURDIR)/$(DEB_TAR_SRCDIR)
 LIB_DIR        := usr/lib/$(DEBIAN_NAME)
 DEB_BUILDDIR   := $(SRC_DIR)
-#BUILD_ARGS     := --keep-going
 
-WANT_LZMA_SRC    ?= 0
-WANT_XZ_DEBS     ?= 1
 WANT_DEBUG       := 0
 WANT_SYSTEM_LIBS ?= 1
 WANT_SHARED_LIBS ?= 0
 WANT_TESTS       ?= 0
 WANT_SANDBOXING  ?= 1
 USE_SYSTEM_V8    ?= 0
-VERBOSE          ?= 0
 
-export DEB_BUILD_HARDENING=1
+# enable build hardening options (pie disabled due to ffmpeg linking issue)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 #use DEB_BUILD_OPTIONS's parallel=n option (see Policy 4.9.1)
 ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
 PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
@@ -50,9 +52,18 @@ ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 WANT_TESTS := 0
 endif
 
+# Hardcode gcc 4.8 to avoid issues caused by >= 4.9
+export CC=gcc-4.8
+export CXX=g++-4.8
+
 # Disable SSE2
 GYP_DEFINES = disable_sse2=1
 
+#Debian Chromium Api Key
+GYP_DEFINES += google_api_key='AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k'
+GYP_DEFINES += google_default_client_id='811574891467.apps.googleusercontent.com'
+GYP_DEFINES += google_default_client_secret='kdloedMFGdGla2P1zacGjAQh'
+
 # Enable all codecs for HTML5 in chromium, depending on which ffmpeg sumo lib
 # is installed, the set of usable codecs (at runtime) will still vary
 GYP_DEFINES += proprietary_codecs=1
@@ -64,19 +75,25 @@ GYP_DEFINES += use_gnome_keyring=1 linux_link_gnome_keyring=1
 # and GIO, which contains GSettings (the new GNOME config system)
 GYP_DEFINES += use_gconf=1 use_gio=1
 
-#Disable nacl
+# disable native client (nacl)
 GYP_DEFINES += disable_nacl=1
 
-# do not use third_party/gold as the linker.
+# do not use embedded third_party/gold as the linker.
 GYP_DEFINES += linux_use_gold_binary=0 linux_use_gold_flags=0
 
-# Only keep -Werror when building for the Debian or Ubuntu development branches
-ifeq (,$(filter unstable development,$(DEBIAN_DIST)))
-GYP_DEFINES += werror=$(NULL)
-endif
-
-#disable tcmalloc
+# disable tcmalloc
 GYP_DEFINES += linux_use_tcmalloc=0
+GYP_DEFINES += use_allocator=none
+
+# don't use ash or ozone
+GYP_DEFINES += use_ash=0 use_ozone=0
+
+# avoid mojo, which requires ninja to build
+GYP_DEFINES += use_mojo=0
+
+# Use explicit library dependencies instead of dlopen.
+# This makes breakages easier to detect by revdep-rebuild.
+GYP_DEFINES += linux_link_gsettings=1
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -90,7 +107,6 @@ GYP_DEFINES += \
        use_cups=1 \
        $(NULL)
 ifeq (armel,$(DEB_HOST_ARCH))
-AVOID_GCC_44 := 0
 GYP_DEFINES += \
        v8_use_arm_eabi_hardfloat=false \
        arm_float_abi=soft \
@@ -111,7 +127,6 @@ GYP_DEFINES += \
        $(NULL)
 endif
 
-WANT_LZMA_DEBS := 0
 WANT_TESTS     := 0
 else
 ifeq (amd64,$(DEB_HOST_ARCH_CPU))
@@ -131,11 +146,6 @@ DEB_DH_INSTALLINIT_ARGS += --noscripts --onlyscripts
 # don't miss installing newly added files in new upstream releases
 DEB_DH_INSTALL_ARGS += --list-missing
 
-# Use lzma instead of gzip inside the debs (passed to dpkg-deb)
-ifeq (1,$(WANT_XZ_DEBS))
-DEB_DH_BUILDDEB_ARGS += -- -Zxz
-endif
-
 ifeq (1,$(WANT_DEBUG))
 BUILD_TYPE := Debug
 else
@@ -146,7 +156,7 @@ endif
 BUILD_ARGS += BUILDTYPE=$(BUILD_TYPE)
 
 # Verbose?
-ifeq (1,$(VERBOSE))
+ifeq (1,$(DH_VERBOSE))
 BUILD_ARGS += V=1
 endif
 
@@ -155,58 +165,8 @@ ifeq (1,$(WANT_SHARED_LIBS))
 GYP_DEFINES += library=shared_library
 endif
 
-# Set this to use gcc 4.3 instead of 4.4
-AVOID_GCC_44 ?= 0
-
-# Set this to use gcc 4.5 instead of 4.6
-AVOID_GCC_46 ?= 0
-
-# Set this to use gcc 4.6 instead of 4.7
-AVOID_GCC_47 ?= 0
-
-CC_VERSION   := $(shell gcc -dumpversion | cut -d. -f-2)
-ifeq (1/4.4,$(AVOID_GCC_44)/$(CC_VERSION))
-CC  := gcc-4.3
-CXX := g++-4.3
-BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
-endif
-
-
-ifeq (1/4.6,$(AVOID_GCC_46)/$(CC_VERSION))
-CC  := gcc-4.5
-CXX := g++-4.5
-BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
-endif
-
-ifeq (1/4.7,$(AVOID_GCC_47)/$(CC_VERSION))
-CC  := gcc-4.6
-CXX := g++-4.6
-GYP_DEFINES += werror=$(NULL)
-GYP_DEFINES += gcc_version=46
-BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
-endif
-
-ifeq (0/4.6,$(AVOID_GCC_46)/$(CC_VERSION))
+# Always ignore compiler warnings
 GYP_DEFINES += werror=$(NULL)
-endif
-
-ifeq (0/4.7,$(AVOID_GCC_47)/$(CC_VERSION))
-GYP_DEFINES += werror=$(NULL)
-endif
-
-ifeq (4.4,$(CC_VERSION))
-GYP_DEFINES += no_strict_aliasing=1 gcc_version=44
-endif
-
-ifeq (1,$(WANT_LZMA_SRC))
-TAR_EXT   := lzma
-TAR_FLAGS := --lzma
-DEB_TARBALL = $(wildcard *.tar.bz2 *.tar.$(TAR_EXT))
-else
-TAR_EXT   := bz2
-TAR_FLAGS := -j
-endif
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
@@ -327,10 +287,8 @@ endif
 USE_SYSTEM_SQLITE := $(shell pkg-config 'sqlite3 >= 3.6.1' && echo 1 || echo 0)
 USE_SYSTEM_SQLITE := 0
 
-ifneq (,$(filter 8.10 9.04,$(DEBIAN_DIST)))
-# Don't build with system zlib on Intrepid/Jaunty. See http://crbug.com/38073
-GYP_DEFINES += use_system_zlib=0
-endif
+USE_SYSTEM_LIBWEBP := $(shell pkg-config 'libwebp >= 0.3.0' && echo 1 || echo 0)
+USE_SYSTEM_LIBWEBP := 0
 
 # System libs
 ifeq (1,$(WANT_SYSTEM_LIBS))
@@ -346,11 +304,12 @@ GYP_DEFINES += \
        use_system_icu=0 \
        use_system_yasm=1 \
        use_system_ffmpeg=$(USE_SYSTEM_FFMPEG) \
-       use_system_vpx=1 \
+       use_system_libvpx=1 \
        use_system_xdg_utils=1 \
        use_system_flac=1 \
-       use_system_libwebp=0 \
+       use_system_libwebp=$(USE_SYSTEM_LIBWEBP) \
        use_system_speex=1 \
+       linux_link_libspeechd=1 \
        $(NULL)
 endif
 
@@ -362,6 +321,7 @@ GYP_DEFINES += use_pulseaudio=1
 BUILD_TARGETS := \
        chrome \
        chrome_sandbox \
+       chromedriver \
        $(NULL)
 
 TESTS_TARGETS := \
@@ -386,7 +346,6 @@ TESTS_TARGETS := \
        wav_ola_test \
        $(NULL)
 
-ifeq (1,$(WANT_TESTS))
 INSTALL_EXCLUDE_FILES += \
        $(TESTS_TARGETS) \
        test_shell.pak \
@@ -396,7 +355,6 @@ INSTALL_EXCLUDE_FILES += \
 INSTALL_EXCLUDE_DIRS += \
        app_unittests_strings \
        $(NULL)
-endif
 
 ifeq (1,$(WANT_SANDBOXING))
 GYP_DEFINES += \
@@ -405,7 +363,7 @@ GYP_DEFINES += \
        $(NULL)
 
 # needed to preserve the suid and make the sandbox happy
-DEB_FIXPERMS_EXCLUDE := $(DEBIAN_NAME)-sandbox
+DEB_FIXPERMS_EXCLUDE := chrome-sandbox
 endif
 
 # use system v8
@@ -443,14 +401,32 @@ ifneq (,$(GYP_DEFINES))
 debian/configure-stamp: GYP_ENV += GYP_DEFINES="$(GYP_DEFINES)"
 endif
 debian/configure-stamp:
-       cd $(SRC_DIR) && $(GYP_ENV) python build/gyp_chromium --no-circular-check build/all.gyp
+       cd $(SRC_DIR) && $(GYP_ENV) python build/gyp_chromium --check --debug=includes
        touch $@
        # Populate the LASTCHANGE file template as we no longer have the VCS
        # files at this point
        echo "$(DEBIAN_REVISION)" > $(SRC_DIR)/build/LASTCHANGE.in
-       # BUILD_ARGS=$(BUILD_ARGS)
        cp -p /usr/share/misc/config.guess src/third_party/yasm/source/patched-yasm/config
        cp -p /usr/share/misc/config.sub src/third_party/yasm/source/patched-yasm/config
+       # replace sourceless libjs-flot files
+       ln -sf /usr/share/javascript/jquery/jquery.min.js src/third_party/flot/jquery.min.js
+       ln -sf /usr/share/javascript/excanvas/excanvas.min.js src/third_party/flot/excanvas.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.colorhelpers.min.js src/third_party/flot/jquery.colorhelpers.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.min.js src/third_party/flot/jquery.flot.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.canvas.min.js src/third_party/flot/jquery.flot.canvas.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.categories.min.js src/third_party/flot/jquery.flot.categories.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.crosshair.min.js src/third_party/flot/jquery.flot.crosshair.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.errorbars.min.js src/third_party/flot/jquery.flot.errorbars.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.fillbetween.min.js src/third_party/flot/jquery.flot.fillbetween.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.image.min.js src/third_party/flot/jquery.flot.image.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.pie.min.js src/third_party/flot/jquery.flot.pie.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.resize.min.js src/third_party/flot/jquery.flot.resize.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.selection.min.js src/third_party/flot/jquery.flot.selection.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.stack.min.js src/third_party/flot/jquery.flot.stack.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.min.js src/third_party/flot/jquery.flot.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.symbol.min.js src/third_party/flot/jquery.flot.symbol.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.threshold.min.js src/third_party/flot/jquery.flot.threshold.min.js
+       ln -sf /usr/share/javascript/jquery-flot/jquery.flot.time.min.js src/third_party/flot/jquery.flot.time.min.js
 
 common-build-arch common-build-indep:: debian/stamp-makefile-build-perf
 debian/stamp-makefile-build-perf: debian/stamp-makefile-build
@@ -479,6 +455,7 @@ clean::
        rm -f src/v8/tools/gyp/v8.log
        rm -f src/third_party/yasm/source/patched-yasm/config/config.guess
        rm -f src/third_party/yasm/source/patched-yasm/config/config.sub
+       rm -f src/third_party/flot/*.js
 
 # Install: there's no install rules in scons yet, do it manually
 common-install-prehook-impl::
@@ -500,13 +477,18 @@ endif
        # as chromium dereferences all symlinks before starting its children
        # making the Gnome System Monitor confused with icons
        mv debian/tmp/$(LIB_DIR)/chrome debian/tmp/$(LIB_DIR)/$(DEBIAN_NAME)
-       mv debian/tmp/$(LIB_DIR)/chrome_sandbox debian/tmp/$(LIB_DIR)/$(DEBIAN_NAME)-sandbox
+       mv debian/tmp/$(LIB_DIR)/chrome_sandbox debian/tmp/$(LIB_DIR)/chrome-sandbox
        # Manpage
        mv debian/tmp/$(LIB_DIR)/chrome.1 debian/tmp/$(LIB_DIR)/chromium.1
        dh_installman -pchromium debian/tmp/$(LIB_DIR)/chromium.1
        rm -f debian/tmp/$(LIB_DIR)/chromium.1
        strip debian/tmp/usr/lib/chromium/nacl_irt_x86_32.nexe || true
        strip debian/tmp/usr/lib/chromium/nacl_irt_x86_64.nexe || true
+       # move inspector files into /usr/share
+       mkdir -p $(CURDIR)/debian/tmp/usr/share
+       mv $(CURDIR)/debian/tmp/$(LIB_DIR)/resources/inspector $(CURDIR)/debian/tmp/usr/share/chromium-inspector
+       # remove unnecessary file
+       rm -f $(CURDIR)/debian/tmp/$(LIB_DIR)/.landmines
 
 binary-install/$(DEBIAN_NAME)::
        mkdir -p $(CURDIR)/debian/$(DEBIAN_NAME)/usr/share/pixmaps
@@ -519,9 +501,9 @@ binary-install/$(DEBIAN_NAME)::
        mkdir -p $(CURDIR)/debian/$(DEBIAN_NAME)/usr/share/icons/hicolor/scalable/apps
        cp -a $(CURDIR)/debian/$(DEBIAN_NAME).svg $(CURDIR)/debian/$(DEBIAN_NAME)/usr/share/icons/hicolor/scalable/apps
 ifeq (1,$(WANT_SANDBOXING))
-       chmod 4755 $(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(DEBIAN_NAME)-sandbox
+       chmod 4755 $(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/chrome-sandbox
 else
-       rm -vf $(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(DEBIAN_NAME)-sandbox
+       rm -vf $(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/chrome-sandbox
 endif
        # Locales: only keep en-US in the main deb
        cd $(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/locales && \
@@ -534,8 +516,6 @@ ifneq (i386,$(DEB_HOST_ARCH_CPU))
        # to drop the -l10n files from debian/tmp to make 'compare' happy
        cd $(CURDIR)/debian/tmp/$(LIB_DIR)/locales && \
          rm $(filter-out en-US.pak,$(notdir $(wildcard $(CURDIR)/debian/tmp/$(LIB_DIR)/locales/*)))
-       # same for inspector
-       rm -rf $(CURDIR)/debian/tmp/$(LIB_DIR)/resources/inspector/*
 endif
 ifeq (1,$(USE_SYSTEM_FFMPEG))
        # Install symlinks to system ffmpeg libs
@@ -596,7 +576,7 @@ compare:
        # Find missing
        @find $(PKG_DIRS) -type f -print | grep -v /DEBIAN/ | grep -vE '(/usr/lib/debug|/test-results/|/locales/|/inspector/)' | \
          grep $(LIB_DIR) | cut -d/ -f5- | sort > /tmp/pkg-$$$$.indebs ; \
-       find debian/tmp/$(LIB_DIR) -type f -print | cut -d/ -f5- | grep -vE '(\.log$$|/locales/|/inspector/)' | sort > /tmp/pkg-$$$$.inhammer ; \
+       find debian/tmp/$(LIB_DIR) -type f -print | cut -d/ -f5- | grep -vE '(\.log$$|/locales/|/inspector/|\.stamp$$)' | sort > /tmp/pkg-$$$$.inhammer ; \
        diff -u /tmp/pkg-$$$$.inhammer /tmp/pkg-$$$$.indebs ; \
        if [ $$? -eq 0 ] ; then \
          echo " => All fine" ; \
@@ -630,7 +610,7 @@ CHROMIUM_URL := http://src.chromium.org/svn/trunk/src
 CHROMIUM_RLZ := http://src.chromium.org/svn/releases
 DEPS_URL     := http://src.chromium.org/svn/trunk/deps/third_party
 GREEN_REV_URL := http://chromium-status.appspot.com/lkgr
-CHANNELS_URL  := http://omahaproxy.appspot.com/
+CHANNELS_URL  := http://omahaproxy.appspot.com/all
 
 # See Staying Green More Of The Time at http://dev.chromium.org/developers/how-tos/get-the-code
 USE_GREEN_REV ?= 0
@@ -638,7 +618,6 @@ USE_GREEN_REV ?= 0
 STRIP_TARBALL ?= 1
 
 STRIPPED_DIRS_FROM_CO := \
-       src/breakpad/src \
        src/tools/gyp \
        src/chrome/tools/test/reference_build \
        src/chrome/tools/test/reference_build/chrome_linux \
@@ -691,6 +670,13 @@ STRIPPED_DIRS := \
        tools/wine_valgrind \
        v8/test/cctest \
        webkit/data/layout_tests \
+       native_client/toolchain/linux_x86/info \
+       native_client/toolchain/linux_x86/man \
+       native_client/toolchain/linux_x86/share/info \
+       native_client/toolchain/linux_x86/x86_64-nacl/share/info \
+       native_client/toolchain/linux_x86_newlib/info \
+       native_client/toolchain/linux_x86_newlib/man \
+       native_client/toolchain/linux_x86_newlib/share/info \
        $(NULL)
 
 # There are directories we want to strip, but that are unnecessarily required by the build-system
@@ -700,19 +686,6 @@ ALMOST_STRIPPED_DIRS := \
        third_party/gles2_book \
        $(NULL)
 
-ifeq (1,$(WANT_SYSTEM_LIBS))
-# Directories that will be dropped if the corresponding system lib are enabled in GYP_DEFINES
-# We need to keep some files (like *.gyp) so we can't use STRIPPED_DIRS
-# We can't drop third_party/zlib because we don't have contrib/minizip/*zip.h, and
-# third_party/sqlite because it's a conditional build (see USE_SYSTEM_SQLITE)
-STRIPPED_SYSTEM_LIB_DIRS += \
-       third_party/bzip2 \
-       third_party/libjpeg \
-       third_party/libpng \
-       third_party/libxslt \
-       $(NULL)
-endif
-
 STRIP_SYSTEM_DIRS = \
        ($(foreach DIR,$(1),$(if $(findstring use_system_$(notdir $(DIR))=1,$(GYP_DEFINES)),\
          (cd $(2)/$(dir $(DIR)) && \
@@ -817,13 +790,51 @@ ifneq (,$(ALMOST_STRIPPED_DIRS))
        # Strip listed dirs almost completely (keep *.gyp and README.chromium)
        $(call ALMOST_STRIP_DIRS,$(ALMOST_STRIPPED_DIRS),$(TMP_DDIR)/src) | grep -vE '/\.svn(/|.$$)' >> $(TMP_DDIR)/src/REMOVED-stripped.txt
 endif
-ifneq (,$(STRIPPED_SYSTEM_LIB_DIRS))
-       $(call STRIP_SYSTEM_DIRS,$(STRIPPED_SYSTEM_LIB_DIRS),$(TMP_DDIR)/src) | grep -vE '/\.svn(/|.$$)' >> $(TMP_DDIR)/src/REMOVED-stripped.txt
-endif
 endif
        # Remove binaries
-       cd $(TMP_DDIR)/src && find . -type f \( -iname \*.exe -o -iname \*.dll -o -iname \*.pdb -o -name \*.o -o -name \*.a -o -name \*.dylib \) -exec rm -fv {} \; > REMOVED-bin_only.txt
+       cd $(TMP_DDIR)/src && find . -type f \( -iname \*.exe -o -iname \*.dll -o -iname \*.pdb -o -name \*.o -o -name \*.a -o -name \*.dylib -o -name \*.so -o -name \*.so.\* \) -ls -delete > REMOVED-bin_only.txt
        wc -l $(TMP_DDIR)/src/REMOVED-*.txt
+
+       # Remove cache files and backups
+       cd $(TMP_DDIR)/src && find . -type f \( -iname \*.bak -o -iname \*.orig -o -iname \*.cache \) -ls -delete > REMOVED-ephemera.txt
+       wc -l $(TMP_DDIR)/src/REMOVED-*.txt
+
+       # Remove known files that have non-free licenses
+       cd $(TMP_DDIR)/src && find . -name bfd.info -ls -delete > REMOVED-nonfree.txt
+       wc -l $(TMP_DDIR)/src/REMOVED-*.txt
+
+       # Remove unused webkit layout tests
+       rm -rf $(TMP_DDIR)/src/third_party/WebKit/LayoutTests
+
+       # Remove unsafe symlinks
+       rm -rf src/native_client/toolchain/pnacl_linux_x86/newlib/sysroot/sys-include
+       rm -rf src/third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
+
+       # 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
+       # remove sourceless polymer.min.js
+       rm -f src/third_party/polymer/polymer.min.js
+       rm -f src/ui/keyboard/resources/polymer.min.js
+       # remove sourceless bidichecker and trace
+       rm -rf src/third_party/bidichecker
+       rm -rf src/tools/trace
+       # remove sourceless chromeVox
+       rm -f src/chrome/third_party/chromevox/*.js
+       # remove non-free rfc
+       rm -f src/third_party/libsrtp/srtp/doc/rfc3711.txt
        
 gos-pack: TMP_DIR  = $(TMP_DDIR)
 ifneq (,$(DEBIAN_TAG))
@@ -835,16 +846,15 @@ gos-pack: REVISION = $(shell cd $(TMP_DIR)/src && svn log --xml --limit 1 | grep
 gos-pack: VERSION  = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')~svn$(REVISION)
 else
 gos-pack: REVISION = $(shell cd $(TMP_DIR)/src && svn log --xml --limit 1 | grep '^ *revision=' | cut -d'"' -f2)
-gos-pack: VERSION  = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')~r$(REVISION)
+gos-pack: VERSION  = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')
 endif
 endif
 gos-pack:
        # Pack
        if [ src != $(DEB_TAR_SRCDIR) ] ; then mv $(TMP_DIR)/src $(TMP_DIR)/$(DEB_TAR_SRCDIR) ; fi
        mv $(TMP_DIR)/tools/depot_tools $(TMP_DIR)/$(DEB_TAR_SRCDIR)/depot_tools
-       mkdir $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)
-       mv $(TMP_DIR)/$(DEB_TAR_SRCDIR) $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)/
-       cd $(TMP_DIR) && tar -c $(TAR_FLAGS) -f ../$(DEBIAN_NAME)_$(VERSION).orig.tar.$(TAR_EXT) --exclude=.svn --exclude=.git $(DEBIAN_NAME)-$(VERSION)
+       mkdir $(TMP_DIR)/$(SOURCE_NAME)-$(VERSION)
+       mv $(TMP_DIR)/$(DEB_TAR_SRCDIR) $(TMP_DIR)/$(SOURCE_NAME)-$(VERSION)/
+       cd $(TMP_DIR) && tar cJf ../../$(SOURCE_NAME)_$(VERSION).orig.tar.xz \
+               --exclude=.svn --exclude=.git $(SOURCE_NAME)-$(VERSION)
        rm -rf $(TMP_DIR)
-       @echo "# Done (created $(DEBIAN_NAME)_$(VERSION).orig.tar.$(TAR_EXT))"
-       @ls -l $(DEBIAN_NAME)_$(VERSION).orig.tar.$(TAR_EXT)
diff --git a/debian/run-test.sh b/debian/run-test.sh
deleted file mode 100644 (file)
index 7e005ab..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Authors:
-#  Fabien Tassin <fta@sofaraway.org>
-# License: GPLv2 or later
-
-usage () {
-  echo "Usage: "`basename $0`" [-x] [-t sec] test_file log_dir [filter]"
-  echo
-  echo "        -x               Run test_file under xvfb"
-  echo "        -t sec           Timeout in seconds after which we kill the test"
-}
-
-timeout=600
-want_x=0
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -h | --help | -help )
-      usage
-      exit 0 ;;
-    -t )
-      shift
-      if [ $# = 0 ] ; then
-        echo Error: -t needs an argument
-        exit 1
-      fi
-      timeout=$1
-      shift ;;
-    -x )
-      want_x=1
-      shift ;;
-    -- ) # Stop option prcessing
-      shift
-      break ;;
-    * )
-      break ;;
-  esac
-done
-
-TEST=$1
-LOGDIR=$2
-FILTER=$3
-
-if [ "Z$TEST" = "Z" ] ; then
-  usage
-  exit 1
-fi
-
-if  [ "Z$LOGDIR" = "Z" ] ; then
-  usage
-  exit 1
-fi
-
-if [ ! -x $TEST ] ; then
-  echo "Error: $TEST must be an executable"
-  exit 1
-fi
-
-if [ ! -d $LOGDIR ] ; then
-  echo "Error: $LOGDIR is not a directory"
-  exit 1
-fi
-
-if [ $want_x -eq 1 ] ; then
-  XVFB="/usr/bin/xvfb-run -a -e $LOGDIR/xvfb.log"
-  RTEST="$XVFB $TEST"
-  rm -f $LOGDIR/xvfb.log
-else
-  XVFB=""
-  RTEST=$TEST
-fi
-
-if [ "Z$FILTER" != Z ] ; then
-  FILTER="--gtest_filter=$FILTER"
-  echo "# Running '$RTEST $FILTER' ..."
-else
-  echo "# Running '$RTEST' ..."
-fi
-
-T1=$(date +%s)
-timeout $timeout $XVFB $TEST $FILTER > $LOGDIR/$TEST.txt 2>&1
-RET=$?
-DELTA=$(expr $(date +%s) - $T1)
-echo "# '$RTEST $FILTER' returned with error code $RET (after $DELTA sec)"
-
-if [ $(grep -c 'Global test environment tear-down' $LOGDIR/$TEST.txt) -eq 1 ] ; then
-  echo "## Results"
-  sed -e '1,/Global test environment tear-down/d' < $LOGDIR/$TEST.txt
-else
-  if [ $(grep -c ' FAILED  ' $LOGDIR/$TEST.txt) -ne 0 ] ; then
-    echo
-    echo "## list of FAILED tests:"
-    grep '  FAILED  ' $LOGDIR/$TEST.txt
-  fi
-fi
-echo
-if [ $RET -ne 0 ] ; then
-  echo "=== Logs ==="
-  cat $LOGDIR/$TEST.txt
-  if [ "Z$XVFB" != Z ] ; then
-    echo "=== xvfb logs ==="
-    cat $LOGDIR/xvfb.log
-  fi
-  echo "==== end of logs ==="
-  # debug in gdb
-  if [ $want_x -eq 1 ] ; then
-    GDB="/usr/bin/xvfb-run -a gdb"
-  else
-    GDB=gdb
-  fi
-  echo "run $FILTER\necho ------------------------------------------------\\\\n\necho (gdb) bt\\\\n\nbt\n" > /tmp/gdb-cmds-$$.txt
-  echo "echo ------------------------------------------------\\\\n\necho (gdb) bt f\\\\n\nbt f\n" >> /tmp/gdb-cmds-$$.txt
-  T2=$(date +%s)
-  timeout $timeout $GDB -n -batch -x /tmp/gdb-cmds-$$.txt $TEST > $LOGDIR/$TEST--gdb.txt 2>&1
-  RET=$?
-  DELTA=$(expr $(date +%s) - $T2)
-  echo "# '$GDB -n -batch -x /tmp/gdb-cmds-$$.txt $TEST' returned with error code $RET (after $DELTA sec)"
-  rm -f /tmp/gdb-cmds-$$.txt
-  echo "---- crash logs ----"
-  grep -E '^Program received signal' < $LOGDIR/$TEST--gdb.txt
-  sed -e '1,/^Program received signal/d' < $LOGDIR/$TEST--gdb.txt
-fi
-killall -q -v -9 $(basename $TEST) Xvfb timeout