Package: chromium-browser
Version: 16.0.912.75~r116452-1
Severity: normal
Tags: patch

chromium-browser does not build from source on Ubuntu, even though
debian/rules includes code to do so.

The attached patch fixes the problem.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-14-server (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru chromium-browser-16.0.912.63~r113337/debian/rules chromium-browser-16.0.912.63~r113337/debian/rules
--- 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)
 MULTIARCH		:= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 USE_SYSTEM_FFMPEG	:= 1
 ifeq (1,$(USE_SYSTEM_FFMPEG))
@@ -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
 endif
 
 DEB_MAKE_BUILD_TARGET := $(BUILD_ARGS) $(BUILD_TARGETS)

Reply via email to