[Pkg-chromium-commit] [pkg-chromium] 01/01: First attempt to Merge branch 'experimental'
Giuseppe Iuculano
iuculano at moszumanska.debian.org
Wed Aug 27 12:57:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
iuculano pushed a commit to branch master
in repository pkg-chromium.
commit 57e246d7e405fd827ebfc88ca4eaf446c0a57a06
Merge: 46eadea a745624
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Wed Aug 27 14:56:20 2014 +0200
First attempt to Merge branch 'experimental'
Conflicts:
debian/TODO
debian/changelog
debian/chromedriver.install
debian/chromium-inspector.install
debian/chromium-inspector.links
debian/chromium.install
debian/chromium.lintian-overrides
debian/control
debian/copyright
debian/patches/expat.patch
debian/patches/fix-manpage.patch
debian/patches/icon.patch
debian/patches/nspr.patch
debian/patches/nss.patch
debian/patches/prefs.patch
debian/patches/series
debian/patches/system-speech.patch
debian/rules
debian/NEWS | 9 -
debian/README | 10 +
debian/README.Debian | 15 -
debian/README.source | 102 -
debian/TODO | 63 +
debian/cdbs/scons.mk | 42 -
debian/cdbs/tarball.mk | 118 -
debian/changelog | 100 +
debian/chromedriver.install | 2 +-
debian/chromium-inspector.install | 2 +-
debian/chromium-inspector.links | 2 +-
debian/chromium-l10n.install | 2 +-
debian/chromium.default | 5 -
debian/chromium.dirs | 4 +-
debian/chromium.docs | 3 -
debian/chromium.install | 18 +-
debian/chromium.lintian-overrides | 8 +-
debian/chromium.manpages | 1 +
debian/chromium.menu | 3 +-
debian/chromium.postinst | 6 -
debian/chromium.postrm | 10 -
debian/chromium.preinst | 10 -
debian/chromium.svg | 277 -
debian/compat | 2 +-
debian/control | 174 +-
debian/copyright | 26303 +++++++------------
debian/copyright.dep5-head | 12 -
debian/copyright.problems | 473 -
debian/gbp.conf | 9 -
debian/licensecheck.pl | 392 -
debian/licensegen.sh | 15 -
debian/licenses/LICENSE.Apache (v2.0) | 2 -
debian/licenses/LICENSE.BSD (2 clause) | 24 -
debian/licenses/LICENSE.BSL (v1) | 24 -
debian/licenses/LICENSE.GPL-2-or-later | 17 -
debian/licenses/LICENSE.GPL-3-or-later | 15 -
debian/licenses/LICENSE.ICU-License | 23 -
debian/licenses/LICENSE.LGPL-2.0-or-later | 17 -
debian/licenses/LICENSE.LGPL-2.1-or-later | 16 -
debian/licenses/LICENSE.MPL-1.1 | 470 -
debian/licenses/LICENSE.Ms-PL | 64 -
.../LICENSE.Paul Hsieh's Public Domain Option | 9 -
.../LICENSE.SGI Free Software B License (v2.0) | 24 -
debian/licenses/LICENSE.global BSD-style Chromium | 26 -
debian/licenses/LICENSE.global BSD-style libjingle | 23 -
debian/licenses/LICENSE.harfbuzz-License | 18 -
debian/master_preferences | 35 +-
debian/patches/disable/google-api-warning.patch | 13 +
debian/patches/disable/sse2.patch | 26 +
debian/patches/expat.patch | 76 -
debian/patches/ffmpeg.patch | 10 -
debian/patches/ffmpeg_arm.patch | 70 -
debian/patches/ffmpegfix.patch | 56 -
debian/patches/fix-manpage.patch | 26 -
debian/patches/glew.patch | 53 -
debian/patches/icon.patch | 13 -
debian/patches/icu.patch | 650 -
debian/patches/javascript-i18n.patch | 11 -
debian/patches/manpage.patch | 10 +
debian/patches/no-android.patch | 516 +
debian/patches/no-ash.patch | 255 +
debian/patches/no-chromeos.patch | 199 +
debian/patches/no-flac.patch | 160 +
debian/patches/no-mac.patch | 154 +
debian/patches/no-perf.patch | 107 +
debian/patches/no-win.patch | 182 +
debian/patches/nss.patch | 17 -
debian/patches/prefs.patch | 17 -
debian/patches/protobuf.patch | 561 -
debian/patches/series | 44 +-
debian/patches/system-speech.patch | 58 -
debian/patches/system/jinja2.patch | 32 +
debian/patches/system/mesa.patch | 12 +
debian/patches/system/minizip.patch | 61 +
debian/patches/system/modpbase64.patch | 62 +
debian/patches/{ => system}/nspr.patch | 27 +-
debian/patches/system/valgrind.patch | 130 +
debian/patches/system_v8.patch | 1378 -
debian/patches/system_v8_i18n.patch | 13 -
debian/presubj | 12 +-
debian/rules | 1021 +-
debian/scripts/build-removals | 9 +
debian/{chromium.sh.in => scripts/chromium.in} | 41 +-
debian/scripts/upstream-removals | 203 +
debian/var_info | 24 -
85 files changed, 12247 insertions(+), 23061 deletions(-)
diff --cc debian/TODO
index 707dc65,9e8ab07..a8312cd
--- a/debian/TODO
+++ b/debian/TODO
@@@ -1,9 -1,63 +1,72 @@@
+* 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 libhunspell-dev
+ use system vpx (should be in sync now)
+
+ remove third_party/npapi
+
+ disable extensions?
+
+ webrtc seems to get built regardles of enable_webrtc=0?
+
+ remove sync
+
+ don't support breakpad (remove a lot of stuff from breakpad/src/third_party)
+
+ remove chrome_elf?
+ remove cloud_print (not available in printers anyway)?
+
+ disable bluetooth
+
+ remove third_party/WebKit/Source/wtf/unicode?
+
+ remove third_party/khronos (need to handle their changes, including gl2chromium.h from gl2.h)
+ remove third_party/mesa
+
+ remove third_party/liblouis (link liblouis2-dev)?
+ remove third_party/swig (use swig package)?
+ remove third_party/ply (use python-ply)?
+ remove third_party/lzma_sdk?
+ remove third_party/gpsd?
+ remove third_party/usb_ids (use usbutils)?
+ remove third_party/clang_format?
+ remove third_party/webpagereplay?
+ remove third_party/chromite?
+ remove third_party/libyuv (libmagickcore5: /usr/lib/x86_64-linux-gnu/ImageMagick-6.7.7/modules-Q16/coders/yuv.so)?
+ remove third_party/libmtp (link libmtp-dev)?
+ remove third_party/libc++ (link libc++-dev, maybe only needed for clang build)?
+ remove third_party/libc++abi (link libc++abi-dev, maybe only needed for clang build)?
+ remove third_party/libwebm (package libwebm http://www.webmproject.org/code)?
+ remove third_party/webgl (package webgl http://www.khronos.org/registry/webgl/sdk)?
+ remove third_party/pyftpdlib (use python-pyftpdlib)?
+ remove third_party/pywebsocket (disable or use python-mod/pywebsocket)?
+
+ follow instructions in third_party/webdriver/README.chromium to generate atoms.*,
+ remove third_party/webdriver/pylib/selenium, and use python-selenium
+
+ remove base/third_party/xdg_mime (use support in xdg-utils)?
+
+ package polymer and use it instead of third_party/polymer
+ package jstemplate and use it instead of third_party/jstemplate
+
+ use system libjingle, libcld2, libphonenumber, libadressinput, cacheinvalidation, dynamic_annotations, angle, smhasher, sfntly, mt19937ar, ...
+
+ remove third_party/libXNVCtrl (package currently in contrib, bug #747837)
+ remove third_party/iccjpeg (currently no library to link against, bug #747839)
+
+ remove crypto/third_party/nss?
+
+ net/third_party/nss is majorly patched an not likely easy to swap out for system version
+ base/third_party/icu reproduces stuff from system icu, but uses alternative namespace
+
+ remove chrome/test (gyp includes stuff that likely isn't needed from here)?
+ remove chrome/installer (gyp includes stuff that likely isn't needed from here)?
+
+ build with clang.
diff --cc debian/changelog
index 4fdc5c5,9843857..a63523a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,103 +1,129 @@@
+ chromium-browser (36.0.1985.125-0) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Disable Google API keys warning.
+ * Remove more files from the upstream tarball.
+
+ -- Michael Gilbert <mgilbert at debian.org> Wed, 16 Jul 2014 00:49:19 +0000
+
+ chromium-browser (36.0.1985.103-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Remove android folders.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 12 Jul 2014 21:38:26 +0000
+
+ chromium-browser (36.0.1985.98-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Remove more files from the upstream tarball.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 06 Jul 2014 04:05:56 +0000
+
+ chromium-browser (36.0.1985.97-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Use system srtp, modpbase64, zlib, and minizip.
+ * Remove srtp files from the upstream tarball (closes: #753826).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 06 Jul 2014 00:06:57 +0000
+
+ chromium-browser (36.0.1985.84-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Remove more files from the upstream tarball.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 21 Jun 2014 23:41:14 +0000
+
+ chromium-browser (36.0.1985.67-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * More verbose linking output.
+ * Fix unwanted output (closes: #751359).
+ * More robust fix for older processors (closes: #750361).
+
+ -- Michael Gilbert <mgilbert at debian.org> Wed, 18 Jun 2014 00:18:47 +0000
+
+ chromium-browser (36.0.1985.49-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Remove more files from the upstream tarball.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 08 Jun 2014 01:49:51 +0000
+
+ chromium-browser (36.0.1985.36-1) experimental; urgency=medium
+
+ * Use system libre2.
+ * Remove more files from the upstream tarball.
+ * Don't set sse2 compiler flags on i386 (closes: #750361).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 07 Jun 2014 22:00:14 +0000
+
+ chromium-browser (36.0.1985.35-1) experimental; urgency=medium
+
+ * Remove more files from the upstream tarball.
+ * Only include TODO.Debian once (closes: #750568).
+
+ -- Michael Gilbert <mgilbert at debian.org> Thu, 05 Jun 2014 20:21:28 +0000
+
+ chromium-browser (36.0.1985.32-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Add icon to menu entry (closes: #703307).
+ * Remove third_party/wtl (closes: #647529).
+ * Update package descriptions (closes: #749673).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 31 May 2014 19:05:32 +0000
+
+ chromium-browser (36.0.1985.18-2) experimental; urgency=medium
+
+ * Add libexif-dev build dependency.
+ * Add flags to avoid memory exhaustion while linking on i386.
+
+ -- Michael Gilbert <mgilbert at debian.org> Mon, 26 May 2014 23:43:25 +0000
+
+ chromium-browser (36.0.1985.18-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Build with gcc 4.9.
+ * Rebuild the packaging from scratch using the "lite" upstream packages,
+ ninja instead of make, debhelper 9 instead of cdbs, and simplified
+ debian/rules.
+ * Use system versions of icu, png, jpeg, opus, snappy, and jsoncpp.
+ * No longer provide get-current-source rule (closes: #585814).
+ * Add a README.debian document with information about chromium-inspector
+ and command-line flags (closes: #629505, #649812).
+ * Add protobuf-compiler, ninja-build, bison, and gperf build dependencies
+ (closes: #748673).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 25 May 2014 03:39:39 +0000
+
+chromium-browser (35.0.1916.153-2) unstable; urgency=medium
+
+ * Avoid gcc 4.9 (closes: #751294)
+
+ -- Michael Gilbert <mgilbert at 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 at 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 at debian.org> Tue, 27 May 2014 03:09:00 +0000
+
chromium-browser (35.0.1916.114-1) unstable; urgency=high
* New upstream stable release:
diff --cc debian/chromium.install
index 94fc434,9599895..ca34864
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@@ -1,23 -1,20 +1,39 @@@
+debian/tmp/etc
+debian/tmp/usr/bin
+
+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/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/presubj usr/share/bug/chromium
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
+ debian/master_preferences usr/lib/chromium
+ debian/initial_bookmarks.html usr/lib/chromium
+
+ out/Release/*.pak usr/lib/chromium
+ out/Release/pseudo_locales usr/lib/chromium
+ out/Release/resources/en-US.pak usr/lib/chromium/locales
+ out/Release/libvpx_obj_int_extract usr/lib/chromium
+
+ out/Release/*.so usr/lib/chromium
+
+ out/Release/chromium usr/lib/chromium
+ out/Release/chrome-sandbox usr/lib/chromium
+
+ out/Release/chromium.xpm usr/share/pixmaps
+
+ third_party/icu/icudtl.dat usr/lib/chromium
diff --cc debian/chromium.lintian-overrides
index ab64bed,fcf43fe..5ea6e8b
--- a/debian/chromium.lintian-overrides
+++ b/debian/chromium.lintian-overrides
@@@ -1,6 -1,8 +1,12 @@@
+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
+ # sandbox is intentionally suid
+ setuid-binary usr/lib/chromium/chrome-sandbox 4755 root/root
+ # ffmpeg doesn't support pic
shlib-with-non-pic-code usr/lib/chromium/libffmpegsumo.so
+ # currently unavoidable embedded libraries
+ embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
+ embedded-library usr/lib/chromium/libffmpegsumo.so: libavutil
+ embedded-library usr/lib/chromium/chromium: sqlite
diff --cc debian/control
index ae57078,cf65d47..47c98b8
--- a/debian/control
+++ b/debian/control
@@@ -88,12 -88,10 +88,11 @@@ Architecture: i386 amd6
Depends:
${misc:Depends},
${shlibs:Depends},
- libnspr4 (>= 2:4.9-2~),
xdg-utils,
- chromium-inspector,
Suggests:
+ mozplugger,
chromium-l10n,
+ chromium-inspector,
Provides:
www-browser,
gnome-www-browser,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list