[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 616 [ Fabien Tassin ]

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 616
Revision Id: iuculano at debian.org-20100625080725-52ew00ekamx6661b
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : [ Fabien Tassin ]
* Show in about:version when chromium is running on a different
  distribution that it has been built on
  - udpate debian/rules
  - rename and update debian/chromium-browser.sh => debian/chromium-browser.sh.in


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/rules

  ** Renamed :
        - debian/chromium-browser.sh => debian/chromium-browser.sh.in

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-06-25 08:01:55 +0000
+++ b/debian/changelog	2010-06-25 08:07:25 +0000
@@ -23,6 +23,12 @@
     - Drop the XLIB_SKIP_ARGB_VISUALS workaround as it creates regressions.
       See http://crbug.com/46439 
 
+  [ Fabien Tassin ]
+  * Show in about:version when chromium is running on a different
+    distribution that it has been built on
+    - udpate debian/rules
+    - rename and update debian/chromium-browser.sh => debian/chromium-browser.sh.in
+
  -- Giuseppe Iuculano <iuculano at debian.org>  Fri, 25 Jun 2010 09:36:58 +0200
 
 chromium-browser (5.0.375.70~r48679-2) unstable; urgency=low

=== renamed file 'debian/chromium-browser.sh' => 'debian/chromium-browser.sh.in'
--- a/debian/chromium-browser.sh	2010-06-25 08:01:55 +0000
+++ b/debian/chromium-browser.sh.in	2010-06-25 08:07:25 +0000
@@ -9,6 +9,7 @@
 APPNAME=chromium-browser
 LIBDIR=/usr/lib/chromium-browser
 GDB=/usr/bin/gdb
+BUILD_DIST="@BUILD_DIST@"
 
 usage () {
   echo "$APPNAME [-h|--help] [-g|--debug] [--temp-profile] [options] [URL]"
@@ -48,7 +49,11 @@
 RELEASE=`lsb_release -sr`
 
 # Set CHROME_VERSION_EXTRA visible in the About dialog and in about:version
-export CHROME_VERSION_EXTRA=$DIST
+if [ "$DIST $RELEASE" = "$BUILD_DIST" ] ; then
+  export CHROME_VERSION_EXTRA="$DIST $RELEASE"
+else
+  export CHROME_VERSION_EXTRA="Built on $BUILD_DIST, running on $DIST $RELEASE"
+fi
 
 want_debug=0
 want_temp_profile=0

=== modified file 'debian/rules'
--- a/debian/rules	2010-06-14 12:33:48 +0000
+++ b/debian/rules	2010-06-25 08:07:25 +0000
@@ -5,6 +5,8 @@
 DEBIAN_UPSTREAM_VERSION	:= $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
 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)
 LIBAVCODEC_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavcodec.so.* | cut -d ' ' -f 1))
 LIBAVFORMAT_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavformat.so.* | cut -d ' ' -f 1))
 LIBAVUTIL_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavutil.so.* | cut -d ' ' -f 1))
@@ -323,7 +325,17 @@
 ######
 DO = (touch r1; echo '$(1)'; $(1); touch r2 ; T1=`date -r r1 +%s` ; T2=`date -r r2 +%s`; echo "PERF: '$(2)' built in "`expr $$T2 - $$T1`" sec"; rm -f r1 r2;)
 
-pre-build::
+subst_files = \
+	debian/$(DEBIAN_NAME).sh \
+	$(NULL)
+
+%:: %.in
+	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' \
+	    < $< > $@
+
+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
@@ -361,7 +373,7 @@
 
 clean::
 	rm -f debian/configure-stamp debian/stamp-makefile-build-*
-	rm -f *.cdbs-config_list
+	rm -f *.cdbs-config_list $(subst_files)
 
 # Install: there's no install rules in scons yet, do it manually
 common-install-prehook-impl::