[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 716 Fixed the webkit version parser. Patch from Ubuntu, thanks to Fabien Tassin

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 716
Revision Id: iuculano at debian.org-20110225094153-sl7mtdxynwf6bu93
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Fixed the webkit version parser. Patch from Ubuntu, thanks to Fabien Tassin


--------------------------------------------------------
  ** Added :
        - debian/patches/webkit-version.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2011-02-24 20:23:15 +0000
+++ b/debian/changelog	2011-02-25 09:41:53 +0000
@@ -1,4 +1,4 @@
-chromium-browser (10.0.648.82~r75062-1) UNRELEASED; urgency=low
+chromium-browser (10.0.648.114~r75702-1) UNRELEASED; urgency=low
 
   * New beta version
   * Refreshed pathces
@@ -11,8 +11,9 @@
   * Use in-source v8
   * Added binutils-gold in build-depends to use the experimental gold linker
   * debian/rules: Force $DEBIAN_NAME to chromium
+  * Fixed the webkit version parser. Patch from Ubuntu, thanks to Fabien Tassin
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Thu, 24 Feb 2011 21:22:49 +0100
+ -- Giuseppe Iuculano <iuculano at debian.org>  Fri, 25 Feb 2011 10:40:33 +0100
 
 chromium-browser (9.0.597.98~r74359-1) unstable; urgency=low
 

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2011-02-23 10:43:46 +0000
+++ b/debian/patches/series	2011-02-25 09:41:53 +0000
@@ -15,3 +15,4 @@
 icu.patch
 #vpx.patch
 glew.patch
+webkit-version.patch

=== added file 'debian/patches/webkit-version.patch'
--- a/debian/patches/webkit-version.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/webkit-version.patch	2011-02-25 09:41:53 +0000
@@ -0,0 +1,18 @@
+--- a/src/webkit/build/webkit_version.py
++++ b/src/webkit/build/webkit_version.py
+@@ -52,6 +52,15 @@ def GetWebKitRevision(webkit_dir, versio
+       default_lastchange=None,
+       directory=os.path.join(webkit_dir, version_file_dir))
+ 
++  if version_info.url is None or version_info.url == 'unknown':
++    # parse the DEPS file
++    data = open("../../DEPS", "rb").read()
++    x = re.search(r'"webkit_revision": "(\d+)",', data)
++    rev = x.group(1) if x else "n-a"
++    x = re.search(r'"webkit_trunk": "(.*?)",', data)
++    branch = os.path.basename(x.group(1)) if x else "n-a"
++    return "%s@%s" % (branch, rev)
++
+   # Now compute the real WebKit URL by stripping off the version file
+   # directory from the URL we get out of version_info.
+   # Further, we want to strip off the "http://svn..." from the left.