[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, squeeze-backports, updated. debian/14.0.835.202_r103287-1-1-g4a8c9ad
Michael Gilbert
michael.s.gilbert at gmail.com
Mon Oct 10 16:14:52 UTC 2011
The following commit has been merged in the squeeze-backports branch:
commit 4a8c9ad2017283652d7a029861fdbbaa3e2c264c
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Mon Oct 10 12:11:35 2011 -0400
backport 14.0.835.202~r103287-1 to squeeze
diff --git a/debian/changelog b/debian/changelog
index e4e908d..2f3733e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+chromium-browser (14.0.835.202~r103287-1~bpo60+1) squeeze-backports; urgency=low
+
+ * Rebuild for squeeze-backports.
+ * Drop cups 1.5 support patch.
+ * Don't use experimental gold linker.
+ * Use chromium-browser naming to adhere to squeeze scheme.
+ * Use embedded libwebp, libvpx, icu, v8, and ffmpeg libraries.
+ * Use "--single-process" argument by default.
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com> Wed, 21 Sep 2011 21:16:29 -0400
+
chromium-browser (14.0.835.202~r103287-1) unstable; urgency=low
[ Michael Gilbert ]
diff --git a/debian/chromium-browser.links b/debian/chromium-browser.links
deleted file mode 100644
index 6b1b72e..0000000
--- a/debian/chromium-browser.links
+++ /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
diff --git a/debian/chromium.install b/debian/chromium.install
index c6f06dc..a16c959 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -3,9 +3,9 @@ debian/tmp/usr/bin
debian/tmp/usr/lib/chromium/chrom*
debian/tmp/usr/lib/chromium/resources.pak
debian/tmp/usr/lib/chromium/locales/*
-#debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
+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/libffmpegsumo.so
debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
debian/tmp/usr/lib/chromium/nacl_irt_*
debian/chromium.desktop usr/share/applications
diff --git a/debian/chromium.sh.in b/debian/chromium.sh.in
index e5507e2..effdf92 100644
--- a/debian/chromium.sh.in
+++ b/debian/chromium.sh.in
@@ -107,10 +107,10 @@ if [ $want_debug -eq 1 ] ; then
exit $?
else
if [ $want_temp_profile -eq 0 ] ; then
- exec $LIBDIR/$APPNAME $CHROMIUM_FLAGS "$@"
+ exec $LIBDIR/$APPNAME --single-process $CHROMIUM_FLAGS "$@"
else
# we can't exec here as we need to clean-up the temporary profile
- $LIBDIR/$APPNAME $CHROMIUM_FLAGS "$@"
+ $LIBDIR/$APPNAME --single-process $CHROMIUM_FLAGS "$@"
rm -rf $TEMP_PROFILE
fi
fi
diff --git a/debian/control b/debian/control
index 1d1046d..7c28e4b 100644
--- a/debian/control
+++ b/debian/control
@@ -47,14 +47,12 @@ Build-Depends: cdbs,
libgtk2.0-dev,
libdbus-glib-1-dev,
libgconf2-dev,
- libicu-dev (>= 4.2.1),
libevent-dev (>= 1.4.13),
yasm,
libprotobuf-dev,
protobuf-compiler,
libglewmx1.5-dev,
- libvpx-dev,
- libcups2-dev (>= 1.5.0),
+ libcups2-dev,
libgnome-keyring-dev,
libgconf2-dev,
libspeex-dev,
@@ -62,76 +60,18 @@ Build-Depends: cdbs,
libxt-dev,
libxtst-dev,
libpam0g-dev,
- binutils-gold,
libflac-dev,
- libwebp-dev,
autotools-dev,
- libv8-dev (>= 3.4.14.13),
libpulse-dev,
- libavcodec-dev (>= 4:0.7.1),
- libavformat-dev (>= 4:0.7.1),
- libavutil-dev (>= 4:0.7.1)
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
-
-Package: chromium
Architecture: i386 amd64 armel
Depends: ${shlibs:Depends}, ${misc:Depends},
libnss3-1d (>= 3.12.3),
- libvpx0 (>= 0.9.6),
xdg-utils,
- chromium-inspector
-Suggests: chromium-l10n
+ chromium-browser-inspector
+Suggests: chromium-browser-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~)
@@ -145,11 +85,11 @@ Description: Google's open source chromium web browser
.
This package contains the Chromium browser
-Package: chromium-dbg
+Package: chromium-browser-dbg
Architecture: i386 amd64 armel
Section: debug
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, chromium (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, chromium-browser (= ${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~)
@@ -159,9 +99,9 @@ Description: Debugging symbols for the 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.
-Package: chromium-l10n
+Package: chromium-browser-l10n
Architecture: all
-Depends: ${misc:Depends}, chromium (>= ${source:Version}), chromium (<< ${source:Version}.1~)
+Depends: ${misc:Depends}, chromium-browser (>= ${source:Version}), chromium-browser (<< ${source:Version}.1~)
Replaces: chromium-browser-l10n (<< 10.0.648.82~r75062-1~)
Conflicts: chromium-browser-l10n (<< 10.0.648.82~r75062-1~)
Description: chromium-browser language packages
@@ -173,11 +113,11 @@ Description: chromium-browser language packages
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
+Package: chromium-browser-inspector
Architecture: all
Depends: ${misc:Depends}
Recommends: chromium
-Conflicts: chromium (<< ${source:Version}), chromium-browser-inspector (<< 10.0.648.82~r75062-1~)
+Conflicts: chromium-browser (<< ${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
Chromium is an open-source browser project that aims to build a safer, faster,
diff --git a/debian/patches/series b/debian/patches/series
index 35bfb2f..a14f5f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,4 @@ webkit-version.patch
#protobuf.patch
#javascript-i18n.patch
#icu.patch
-cups1.5.patch
-system_v8.patch
-system_v8_i18n.patch
#protobuf.patch
diff --git a/debian/rules b/debian/rules
index ca4599e..219c4e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEBIAN_NAME := chromium
+DEBIAN_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/')
@@ -8,7 +8,7 @@ DEBIAN_DIST := $(shell lsb_release -ds | tr -d '()')
DEBIAN_DIST_NAME := $(shell lsb_release -si)
DEBIAN_DIST_VERSION := $(shell lsb_release -sr)
MULTIARCH := $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-USE_SYSTEM_FFMPEG := 1
+USE_SYSTEM_FFMPEG := 0
ifeq (1,$(USE_SYSTEM_FFMPEG))
LIBAVCODEC_BASENAME := $(shell basename $$(ls -x /usr/lib/$(MULTIARCH)/libavcodec.so.* | cut -d ' ' -f 1))
LIBAVFORMAT_BASENAME := $(shell basename $$(ls -x /usr/lib/$(MULTIARCH)/libavformat.so.* | cut -d ' ' -f 1))
@@ -33,7 +33,7 @@ WANT_SYSTEM_LIBS ?= 1
WANT_SHARED_LIBS ?= 0
WANT_TESTS ?= 0
WANT_SANDBOXING ?= 1
-USE_SYSTEM_V8 ?= 1
+USE_SYSTEM_V8 ?= 0
VERBOSE ?= 0
export DEB_BUILD_HARDENING=1
@@ -297,13 +297,13 @@ GYP_DEFINES += \
use_system_libxslt=1 \
use_system_zlib=1 \
use_system_libevent=1 \
- use_system_icu=1 \
+ use_system_icu=0 \
use_system_yasm=1 \
use_system_ffmpeg=$(USE_SYSTEM_FFMPEG) \
- use_system_vpx=1 \
+ use_system_vpx=0 \
use_system_xdg_utils=1 \
use_system_flac=1 \
- use_system_libwebp=1 \
+ use_system_libwebp=0 \
use_system_speex=1 \
$(NULL)
endif
@@ -373,10 +373,15 @@ subst_files = \
debian/$(DEBIAN_NAME).sh \
$(NULL)
-%:: %.in
+debian/chromium-browser.sh:: debian/chromium.sh.in
+ for file in debian/chromium*; do \
+ fnew=$$(echo $$file | sed s/chromium/chromium-browser/g); \
+ sed s/chromium/chromium-browser/g < $$file > $$fnew; \
+ done
sed -e 's/@BUILD_DIST@/$(DEBIAN_DIST_NAME) $(DEBIAN_DIST_VERSION)/g' \
-e 's/@BUILD_DIST_NAME@/$(DEBIAN_DIST_NAME)/g' \
-e 's/@BUILD_DIST_VERSION)@/$(DEBIAN_DIST_VERSION)/g' \
+ -e 's/chromium/chromium-browser/g' \
< $< > $@
pre-build:: $(subst_files)
@@ -424,6 +429,7 @@ clean::
find src -name *.pyc -execdir rm -f {} \;
find src -name *.mk -execdir rm -f {} \;
find src -name *.Makefile -execdir rm -f {} \;
+ find debian -name chromium-browse* -execdir rm -f {} \;
rm -f src/build/LASTCHANGE.in
rm -f src/third_party/WebKit/Source/WebCore/WebCore.gyp/idls_list_temp_file.tmp
rm -f src/v8/tools/gyp/v8.log
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list