Hi,
Michael Kuhn wrote:
> --- chromium-browser-16.0.912.63~r113337/debian/rules 2012-01-01
> 12:46:32.000000000 +0000
> +++ chromium-browser-16.0.912.63~r113337/debian/rules 2012-01-01
> 22:40:37.000000000 +0000
> @@ -6,7 +6,7 @@
> DEBIAN_REVISION := $(shell echo $(DEBIAN_VERSION) | sed
> 's/^.*r\([^-]*\)-.*/\1/')
> DEBIAN_DIST := $(shell lsb_release -ds | tr -d '()')
> DEBIAN_DIST_NAME := $(shell lsb_release -si)
> -DEBIAN_DIST_VERSION := $(shell cat /etc/debian_version)
> +DEBIAN_DIST_VERSION := $(shell lsb_release -sr)
This uses /etc/debian_version so it can give the same answer as the
/usr/bin/chromium script, which uses /etc/debian_version to avoid
depending on lsb-release at runtime.
Is this hunk needed for your patch to work? If it is just for the
about: screen, have you checked the result, and does it look as you'd
like it to?
> @@ -385,7 +385,7 @@
> pre-build:: $(subst_files)
> ifneq (,$(findstring Ubuntu,$(DEBIAN_DIST)))
> sed -ri '/const PrepopulatedEngine google = \{/,/\}\;/ {
> s/sourceid=chrome\&/&client=ubuntu\&channel=cs\&/g; }' \
> -
> build-tree/src/chrome/browser/search_engines/template_url_prepopulate_data.cc
> +
> src/chrome/browser/search_engines/template_url_prepopulate_data.cc
This part is Ubuntu-specific, so it can't break anything on Debian.
Applied.
Thanks for your contribution,
Jonathan
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
