[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/15.0.874.106_r107270-1-3-g7dba3cb
Jonathan Nieder
jrnieder at gmail.com
Mon Nov 14 06:04:59 UTC 2011
The following commit has been merged in the master branch:
commit 4de64d5fc671331ee4ba3267008983061d8c3818
Author: Jonathan Nieder <jrnieder at gmail.com>
Date: Sun Nov 13 23:53:48 2011 -0600
Use /etc/debian_version, not `lsb_release -sr`, to populate BUILD_DIST
To avoid a dependency on lsb-release, the chromium.sh script already
hardcodes the distro and reads /etc/debian_version to get the OS
version at run time.
Tweak the rules in debian/rules used to describe the build system to
do the same. Otherwise, we get spurious mismatches, resulting in an
unnecessarily verbose CHROME_EXTRA_VERSION string:
Built on Debian testing/unstable, running on Debian wheezy/sid
instead of "Debian wheezy/sid".
diff --git a/debian/rules b/debian/rules
index d72f2d3..66c9849 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*
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 lsb_release -sr)
+DEBIAN_DIST_VERSION := $(shell cat /etc/debian_version)
MULTIARCH := $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
USE_SYSTEM_FFMPEG := 1
ifeq (1,$(USE_SYSTEM_FFMPEG))
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list