[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 614 [ 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: 614
Revision Id: iuculano at debian.org-20100625075629-3dz9b6266ywxtd0n
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : [ Fabien Tassin ]
* Limit the XLIB_SKIP_ARGB_VISUALS workaround to Ubuntu/Maverick as it
  creates regressions. See http://crbug.com/46439
  - update debian/chromium-browser.sh


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/chromium-browser.sh

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-06-25 07:47:00 +0000
+++ b/debian/changelog	2010-06-25 07:56:29 +0000
@@ -21,6 +21,11 @@
     - [46126] High Stale pointer in x509-user-cert response. Credit to Rodrigo
       Marcos of SECFORCE. 
      
+  [ Fabien Tassin ]
+  * Limit the XLIB_SKIP_ARGB_VISUALS workaround to Ubuntu/Maverick as it
+    creates regressions. See http://crbug.com/46439
+    - update debian/chromium-browser.sh
+
  -- 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

=== modified file 'debian/chromium-browser.sh'
--- a/debian/chromium-browser.sh	2010-06-09 09:59:35 +0000
+++ b/debian/chromium-browser.sh	2010-06-25 07:56:29 +0000
@@ -44,12 +44,17 @@
 export PATH="$LIBDIR:$PATH"
 export CHROME_WRAPPER=true
 
+DIST=`lsb_release -si`
+RELEASE=`lsb_release -sr`
+
 # Set CHROME_VERSION_EXTRA visible in the About dialog and in about:version
-export CHROME_VERSION_EXTRA=Ubuntu
+export CHROME_VERSION_EXTRA=$DIST
 
 # Set this to prevent flash from dying with a Gdk-ERROR when gtk2 is
 # built with RGBA support (like in Maverick). See LP #584959
-export XLIB_SKIP_ARGB_VISUALS=1
+if [ $DIST = "Ubuntu" ] && [ $RELEASE = 10.10 ] ; then
+  export XLIB_SKIP_ARGB_VISUALS=1
+fi
 
 want_debug=0
 want_temp_profile=0