[Pkg-chromium-commit] [pkg-chromium] 01/01: release 38.0.2125.101-2
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Oct 13 04:58:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit 3cf3dc67fe7c67a6ee45139a8e7d169bd9f64193
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Oct 13 00:58:01 2014 -0400
release 38.0.2125.101-2
---
debian/README | 10 ++
debian/changelog | 10 ++
debian/chromium.install | 10 +-
debian/chromium.links | 2 +
debian/chromium.maintscript | 4 +
debian/chromium.manpages | 1 +
debian/chromium.postinst | 7 --
debian/control | 6 +-
debian/patches/manpage.patch | 53 +++++++++
debian/patches/missing-include.patch | 10 ++
debian/rules | 21 +++-
debian/scripts/build-removals | 9 ++
debian/scripts/chromium | 92 ++++++++++++++++
debian/scripts/upstream-removals | 203 +++++++++++++++++++++++++++++++++++
14 files changed, 413 insertions(+), 25 deletions(-)
diff --git a/debian/README b/debian/README
new file mode 100644
index 0000000..247d0ce
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,10 @@
+Chromium has an extensive set of command-line flags that change rapidly, so
+it's not really practical to include documentation in the package. This page
+is kept relatively up to date with that information:
+
+http://peter.sh/experiments/chromium-command-line-switches
+
+The chromium-inspector package provides access to additional web developer
+tools. Up-to-date documentation is available at:
+
+https://developer.chrome.com/devtools/index
diff --git a/debian/changelog b/debian/changelog
index c5c1b05..80fd6cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+chromium-browser (38.0.2125.101-2) unstable; urgency=medium
+
+ * Disable HiDPI (closes: #764883).
+ * Fix conffile handling (closes: #764769).
+ * Correct icon installation logic (closes: #764828).
+ * Use embedded protobuf code copy (closes: #764911).
+ * Support larger set of html5 video formats again (closes: #764793).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 12 Oct 2014 21:34:26 +0000
+
chromium-browser (38.0.2125.101-1) unstable; urgency=medium
* New upstream stable release:
diff --git a/debian/chromium.install b/debian/chromium.install
index 8dd3de4..b831f85 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -9,17 +9,9 @@ out/Release/resources/*.pak usr/lib/chromium/locales
debian/presubj usr/share/bug/chromium
-debian/initial_bookmarks.html usr/lib/chromium
debian/master_preferences usr/lib/chromium
+debian/initial_bookmarks.html usr/lib/chromium
debian/chromium.xml usr/share/gnome-control-center/default-apps
debian/chromium.desktop usr/share/applications
-
-chrome/app/theme/chromium/product_logo_48.png usr/share/pixmaps/chromium.png
-chrome/app/theme/chromium/product_logo_22.png usr/share/icons/hicolor/22x22/apps
-chrome/app/theme/chromium/product_logo_24.png usr/share/icons/hicolor/24x24/apps
-chrome/app/theme/chromium/product_logo_48.png usr/share/icons/hicolor/48x48/apps
-chrome/app/theme/chromium/product_logo_64.png usr/share/icons/hicolor/64x64/apps
-chrome/app/theme/chromium/product_logo_128.png usr/share/icons/hicolor/128x128/apps
-chrome/app/theme/chromium/product_logo_256.png usr/share/icons/hicolor/256x256/apps
diff --git a/debian/chromium.links b/debian/chromium.links
new file mode 100644
index 0000000..fe0fba3
--- /dev/null
+++ b/debian/chromium.links
@@ -0,0 +1,2 @@
+usr/share/icons/hicolor/32x32/chromium.xpm usr/share/pixmaps/chromium.xpm
+usr/share/icons/hicolor/48x48/chromium.png usr/share/pixmaps/chromium.png
diff --git a/debian/chromium.maintscript b/debian/chromium.maintscript
new file mode 100644
index 0000000..fb60277
--- /dev/null
+++ b/debian/chromium.maintscript
@@ -0,0 +1,4 @@
+# remove wheezy era conffiles (can be removed post-jessie)
+rm_conffile /etc/chromium/default 37.0.2062.120-3~ -- "$@"
+rm_conffile /etc/chromium/master_preferences 37.0.2062.120-3~ -- "$@"
+rm_conffile /etc/chromium/initial_bookmarks.html 37.0.2062.120-3~ -- "$@"
diff --git a/debian/chromium.manpages b/debian/chromium.manpages
new file mode 100644
index 0000000..8026ed0
--- /dev/null
+++ b/debian/chromium.manpages
@@ -0,0 +1 @@
+out/Release/chromium.1
diff --git a/debian/chromium.postinst b/debian/chromium.postinst
index 6bc2c1e..74bc109 100644
--- a/debian/chromium.postinst
+++ b/debian/chromium.postinst
@@ -9,11 +9,4 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then
gnome-www-browser /usr/bin/chromium 40
fi
-# remove wheezy era conffiles (can be removed post-jessie)
-dpkg-maintscript-helper rm_conffile \
- /etc/chromium/default \
- /etc/chromium/master_preferences \
- /etc/chromium/initial_bookmarks.html \
- 37.0.2062.120-3~ -- "$@"
-
#DEBHELPER#
diff --git a/debian/control b/debian/control
index 8c48c4e..4d365bc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
ninja-build,
python-jinja2,
ca-certificates,
- protobuf-compiler,
wget,
flex,
yasm,
@@ -68,7 +67,6 @@ Build-Depends:
libjsoncpp-dev,
libspeechd-dev,
libminizip-dev,
- libprotobuf-dev,
libhunspell-dev,
libmodpbase64-dev,
libgnome-keyring-dev,
@@ -79,13 +77,13 @@ Build-Depends:
libjs-jquery,
libjs-excanvas,
libjs-jquery-flot,
- libgcrypt11-dev | libgcrypt20-dev,
+ libgcrypt20-dev,
fonts-ipafont-gothic,
fonts-ipafont-mincho,
Built-Using:
libjs-jquery,
libjs-jquery-flot,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Package: chromium
Architecture: i386 amd64
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
new file mode 100644
index 0000000..dfaec75
--- /dev/null
+++ b/debian/patches/manpage.patch
@@ -0,0 +1,53 @@
+Description: manpage updates/fixes
+Forwarded: http://code.google.com/p/chromium/issues/detail?id=73591
+Author: Daniel Echeverry <epsilon77 at gmail.com>
+
+--- a/chrome/app/resources/manpage.1.in
++++ b/chrome/app/resources/manpage.1.in
+@@ -1,5 +1,5 @@
+-." This file is processed by chrome.gyp to generate manpages in the
+-." build diretory.
++.\" This file is processed by chrome.gyp to generate manpages in the
++.\" build diretory.
+ .TH @@FILENAME@@ 1 "" "" "USER COMMANDS"
+
+ .SH NAME
+@@ -20,6 +20,19 @@ This manpage only describes invocation,
+ @@NAME@@ has hundreds of undocumented command-line flags that are added
+ and removed at the whim of the developers. Here, we document relatively
+ stable flags.
++
++.TP
++\fB\-h \fRor\fB \-\-help\fR
++Show help output.
++
++.TP
++\fB\-g \fRor\fB \-\-debug\fR
++Start a debugging session within /usr/bin/gdb.
++
++.TP
++\fB\-\-temp-profile\fR
++Use a throw-away/temporary profile for this session.
++
+ .TP
+ \fB\-\-user\-data\-dir\fR=\fIDIR\fR
+ Specifies the directory that user data (your "profile") is kept in.
+@@ -110,6 +123,7 @@ as
+ See the GTK documentation for more:
+ .IP
+ <http://library.gnome.org/devel/gtk/stable/gtk-running.html>
++.IP
+ <http://library.gnome.org/devel/gtk/stable/gtk-x11.html>
+
+ .SH ENVIRONMENT
+--- a/chrome/chrome_exe.gypi
++++ b/chrome/chrome_exe.gypi
+@@ -122,7 +122,7 @@
+ }, { # else branding!="Chrome"
+ 'variables': {
+ 'name': 'Chromium',
+- 'filename': 'chromium-browser',
++ 'filename': 'chromium',
+ 'confdir': 'chromium',
+ },
+ }],
diff --git a/debian/patches/missing-include.patch b/debian/patches/missing-include.patch
new file mode 100644
index 0000000..6dae7a8
--- /dev/null
+++ b/debian/patches/missing-include.patch
@@ -0,0 +1,10 @@
+--- a/media/cast/logging/encoding_event_subscriber.cc
++++ b/media/cast/logging/encoding_event_subscriber.cc
+@@ -6,6 +6,7 @@
+
+ #include <cstring>
+ #include <utility>
++#include <algorithm>
+
+ #include "base/logging.h"
+ #include "media/cast/logging/proto/proto_utils.h"
diff --git a/debian/rules b/debian/rules
index 142257b..f22616a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,8 @@ defines+=use_ozone=0 \
enable_remoting_host=0 \
# enabled features
-defines+=enable_hidpi=1 \
- enable_webrtc=1 \
+defines+=enable_webrtc=1 \
+ use_gio=1 \
use_pulseaudio=1 \
use_gnome_keyring=1 \
linux_link_libpci=1 \
@@ -58,12 +58,15 @@ defines+=use_system_re2=1 \
use_system_libsrtp=1 \
use_system_jsoncpp=1 \
use_system_libevent=1 \
- use_system_protobuf=1 \
use_system_harfbuzz=1 \
use_system_xdg_utils=1 \
# enable proprietary codecs
defines+=proprietary_codecs=1 \
+ ffmpeg_branding=Chrome \
+
+# use embedded protobuf for now (bug #764911)
+defines+=use_system_protobuf=0 \
# icu
defines+=use_system_icu=0 \
@@ -108,15 +111,23 @@ override_dh_auto_build:
mv out/Release/chrome.1 out/Release/chromium.1 || true
mv out/Release/locales/en-US.pak out/Release/resources || true
mv out/Release/chrome_sandbox out/Release/chrome-sandbox || true
- cp chrome/app/theme/chromium/product_logo_32.xpm out/Release/chromium.xpm || true
chmod 4755 out/Release/chrome-sandbox # suid sandbox
override_dh_auto_install:
dh_auto_install
echo "Any files placed in this directory will be sourced prior to executing chromium." \
> debian/chromium/etc/chromium.d/README
+ # update launcher script with build information
sed 's|@BUILD_DIST@|$(shell cat /etc/debian_version)|' \
- < debian/scripts/chromium.in > debian/chromium/usr/bin/chromium
+ < debian/scripts/chromium > debian/chromium/usr/bin/chromium
+ # move icons into /usr/share
+ for file in $(shell find chrome/app/theme/chromium -name product_logo_[0-9]* -a ! -name *mono*); do \
+ ext=$$(echo $$file | cut -d\. -f2); \
+ siz=$$(echo $$file | cut -d_ -f3 | sed s/\.$$ext//); \
+ dst=debian/chromium/usr/share/icons/hicolor/$$siz\x$$siz; \
+ mkdir -p $$dst; \
+ cp $$file $$dst/chromium.$$ext; \
+ done
override_dh_fixperms:
dh_fixperms --exclude chrome-sandbox
diff --git a/debian/scripts/build-removals b/debian/scripts/build-removals
new file mode 100755
index 0000000..1be14a1
--- /dev/null
+++ b/debian/scripts/build-removals
@@ -0,0 +1,9 @@
+#!/bin/sh -xe
+
+rm -rf out
+
+rm -rf third_party/flot/*
+
+find . -name Makefile -execdir rm -f {} \;
+find . -name \*.pyc -execdir rm -f {} \;
+find . -name \*.mk -execdir rm -f {} \;
diff --git a/debian/scripts/chromium b/debian/scripts/chromium
new file mode 100644
index 0000000..a5a4d42
--- /dev/null
+++ b/debian/scripts/chromium
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Chromium launcher
+
+# Authors:
+# Fabien Tassin <fta at sofaraway.org>
+# License: GPLv2 or later
+
+APPNAME=chromium
+LIBDIR=/usr/lib/chromium
+GDB=/usr/bin/gdb
+BUILD_DIST="@BUILD_DIST@"
+
+usage () {
+ echo "$APPNAME [-h|--help] [-g|--debug] [--temp-profile] [options] [URL]"
+ echo
+ echo " -g or --debug Start within $GDB"
+ echo " -h or --help This help screen"
+ echo " --temp-profile Start with a new and temporary profile"
+ echo
+ echo " Other supported options are:"
+ MANWIDTH=80 man chromium | sed -e '1,/OPTIONS/d; /ENVIRONMENT/,$d'
+ echo " See 'man chromium' for more details"
+}
+
+# Source additional settings
+for file in /etc/chromium.d/*; do
+ test $file = /etc/chromium.d/README || . $file
+done
+
+# Set CHROME_VERSION_EXTRA visible in the About dialog and in about:version
+DIST="Debian `cat /etc/debian_version`"
+if [ "$DIST" = "$BUILD_DIST" ] ; then
+ export CHROME_VERSION_EXTRA="$DIST"
+else
+ export CHROME_VERSION_EXTRA="Built on $BUILD_DIST, running on $DIST"
+fi
+
+want_debug=0
+want_temp_profile=0
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -h | --help | -help )
+ usage
+ exit 0 ;;
+ -g | --debug )
+ want_debug=1
+ shift ;;
+ --temp-profile )
+ want_temp_profile=1
+ shift ;;
+ -- ) # Stop option prcessing
+ shift
+ break ;;
+ * )
+ break ;;
+ esac
+done
+
+if [ $want_temp_profile -eq 1 ] ; then
+ TEMP_PROFILE=`mktemp -d`
+ CHROMIUM_FLAGS="$CHROMIUM_FLAGS --user-data-dir=$TEMP_PROFILE"
+fi
+
+if [ $want_debug -eq 1 ] ; then
+ if [ ! -x $GDB ] ; then
+ echo "Sorry, can't find usable $GDB. Please install it."
+ exit 1
+ fi
+ tmpfile=`mktemp /tmp/chromiumargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
+ trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
+ echo "set args $CHROMIUM_FLAGS ${1+"$@"}" > $tmpfile
+ echo "# Env:"
+ echo "# LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+ echo "# PATH=$PATH"
+ echo "# GTK_PATH=$GTK_PATH"
+ echo "# CHROMIUM_FLAGS=$CHROMIUM_FLAGS"
+ echo "$GDB $LIBDIR/$APPNAME -x $tmpfile"
+ $GDB "$LIBDIR/$APPNAME" -x $tmpfile
+ if [ $want_temp_profile -eq 1 ] ; then
+ rm -rf $TEMP_PROFILE
+ fi
+ exit $?
+else
+ if [ $want_temp_profile -eq 0 ] ; then
+ exec $LIBDIR/$APPNAME $CHROMIUM_FLAGS "$@"
+ else
+ # we can't exec here as we need to clean-up the temporary profile
+ $LIBDIR/$APPNAME $CHROMIUM_FLAGS "$@"
+ rm -rf $TEMP_PROFILE
+ fi
+fi
diff --git a/debian/scripts/upstream-removals b/debian/scripts/upstream-removals
new file mode 100755
index 0000000..358a0f4
--- /dev/null
+++ b/debian/scripts/upstream-removals
@@ -0,0 +1,203 @@
+#!/bin/sh -xe
+
+# remove cruft
+rm -f .clang-format .DEPS.git .gn LICENSE.chromium_os OWNERS
+
+# remove more cruft
+find . -name PRESUB\* -execdir rm -f {} \;
+find . -name upload.py -execdir rm -f {} \;
+find . -name WATCHLISTS -execdir rm -f {} \;
+find . -name .gitignore -execdir rm -f {} \;
+find . -name .gitmodules -execdir rm -f {} \;
+find . -name .gitattributes -execdir rm -f {} \;
+find . -name config.sub -execdir rm -f {} \;
+find . -name config.guess -execdir rm -f {} \;
+find . -name codereview.settings -execdir rm -f {} \;
+
+# remove unused webkit stuff
+rm -rf webkit/data
+rm -rf webkit/tools
+rm -rf third_party/WebKit/Tools
+rm -rf third_party/WebKit/ManualTests
+rm -rf third_party/WebKit/LayoutTests
+rm -rf third_party/WebKit/PerformanceTests
+
+# remove unused media stuff
+rm -rf media/tests
+rm -rf media/tools
+
+# remove android directories
+find . -name android | xargs rm -rf
+rm -rf android_webview
+rm -rf third_party/android_opengl
+rm -rf third_party/android_platform
+rm -rf third_party/android_testrunner
+rm -f build/protoc_java.gypi \
+ build/uiautomator_test.gypi \
+ components/web_contents_delegate_android.gypi \
+
+# remove chromeos directories
+rm -rf chromeos
+rm -rf rlz/chromeos
+rm -rf chrome/browser/chromeos
+
+# remove windows directories
+rm -rf win8
+rm -rf rlz/win
+rm -rf sdch/win
+rm -rf base/win
+rm -rf tools/win
+rm -rf ui/gfx/win
+rm -rf ui/base/win
+rm -rf media/audio/win
+rm -rf build/toolchain/win
+rm -rf chrome/tools/build/win
+rm -rf third_party/win_toolchain
+
+# remove mac directories
+find . -name mac | xargs rm -rf
+rm -rf third_party/apple*
+rm -rf third_party/sudden_motion_sensor
+rm -rf third_party/google_toolbox_for_mac
+
+# remove ios directories
+rm -rf ios
+rm -rf rlz/ios
+rm -rf sdch/ios
+rm -rf base/ios
+rm -rf build/ios
+rm -rf media/audio/ios
+rm -rf build/config/ios
+rm -rf build/toolchain/ios
+
+# these would be useful to remove, but the linux build includes stuff here when it probably shouldn't
+# rm -rf sandbox/win
+# rm -rf build/win
+# rm -rf third_party/JSON
+
+# remove wtl (only used in windows build, also incompatible MS-PL license)
+rm -rf third_party/wtl
+
+# automatic updater isn't used
+rm -rf google_update
+
+# unused third party stuff
+rm -rf third_party/d3
+rm -rf third_party/cld
+rm -rf third_party/gtk+
+rm -rf third_party/flac
+rm -rf third_party/mozc
+rm -rf third_party/gpsd
+rm -rf third_party/swig
+rm -rf third_party/mtpd
+rm -rf third_party/lcov*
+rm -rf third_party/libva
+rm -rf third_party/jinja2
+rm -rf third_party/talloc
+rm -rf third_party/ashmem
+rm -rf third_party/scons*
+rm -rf third_party/bsdiff
+rm -rf third_party/bspatch
+rm -rf third_party/tlslite
+rm -rf third_party/jsr-305
+rm -rf third_party/openmax*
+rm -rf third_party/eyesfree
+rm -rf third_party/binutils
+rm -rf third_party/bintrees
+rm -rf third_party/mongoose
+rm -rf third_party/tcmalloc
+rm -rf third_party/jemalloc
+rm -rf third_party/chromite
+rm -rf third_party/chromevox
+rm -rf third_party/pyftpdlib
+rm -rf third_party/pyelftools
+rm -rf third_party/webtreemap
+rm -rf third_party/simplejson
+rm -rf third_party/devscripts
+rm -rf third_party/markupsafe
+rm -rf third_party/active_doc
+rm -rf third_party/icon_match
+rm -rf third_party/fuzzymatch
+rm -rf third_party/v4l2capture
+rm -rf third_party/bidichecker
+rm -rf third_party/clang_format
+rm -rf third_party/libjpeg_turbo
+rm -rf third_party/python_gflags
+rm -rf third_party/closure_linter
+rm -rf third_party/speech-dispatcher
+rm -rf third_party/cros_dbus_cplusplus
+rm -rf third_party/accessibility-audit
+rm -rf third_party/launchpad_translations
+rm -rf third_party/instrumented_libraries
+rm -rf third_party/google_appengine_cloudstorage
+rm -rf third_party/README.chromium.template
+
+# remove trace-viewer cruft
+rm -rf third_party/trace-viewer/examples
+rm -rf third_party/trace-viewer/test_data
+rm -rf third_party/trace-viewer/third_party/gl-matrix
+rm -rf third_party/trace-viewer/third_party/polymer
+rm -rf third_party/trace-viewer/third_party/Promises
+rm -rf third_party/trace-viewer/third_party/pywebsocket
+rm -rf third_party/trace-viewer/third_party/tvcm/third_party/polymer
+rm -rf third_party/trace-viewer/third_party/tvcm/third_party/closure_linter
+rm -rf third_party/trace-viewer/third_party/tvcm/third_party/python_gflags
+
+# remove chrome/third_party stuff
+rm -rf chrome/third_party/chromevox
+
+# remove base/third_party stuff
+rm -rf base/third_party/nspr
+rm -rf base/third_party/valgrind
+
+# remove duplicate third party stuff in the v8 tree
+rm -rf v8/third_party
+rm -rf v8/src/third_party
+
+# remove ash
+rm -rf chrome/browser/ui/ash
+rm -rf chrome/browser/ui/views/ash
+
+# remove empty dirs
+rm -rf athena
+rm -rf chromecast
+
+# remove unused tools
+find tools v8/tools -mindepth 1 -maxdepth 1 \
+ ! -name generate-trig-table.py \
+ ! -name protoc_wrapper \
+ ! -name xdisplaycheck \
+ ! -name compile_test \
+ ! -name licenses.py \
+ ! -name generate_* \
+ ! -name idl_parser \
+ ! -name imagediff \
+ ! -name usb_ids \
+ ! -name jsmin.py \
+ ! -name js2c.py \
+ ! -name clang \
+ ! -name grit* \
+ ! -name json* \
+ ! -name gyp \
+ ! -name gn \
+ -execdir rm -rf {} \;
+
+# remove documentation that isn't included in the binary packages
+rm -rf chrome/common/extensions/docs
+
+# remove unsafe symlinks
+rm -f third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
+
+# put a reminder here
+echo "This directory is needed for flot at build time." > third_party/flot/README
+
+# remove unwanted base stuff
+for dir in ash; do
+ find $dir -mindepth 1 -maxdepth 1 ! -name \*.gyp\* -and ! -name chromium -execdir rm -rf {} \; 2>/dev/null;
+ done
+
+# remove unused third_party stuff
+cd third_party
+for dir in modp_b64 openssl harfbuzz-ng fontconfig freetype2; do
+ find $dir -mindepth 1 -maxdepth 1 ! -name \*.gyp\* -and ! -name chromium -execdir rm -rf {} \; 2>/dev/null;
+ done
--
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