[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/15.0.874.106_r107270-1-4-gaa996fe

[Jonathan Nieder]

The following commit has been merged in the master branch:
commit aa996fe7304f550448673ae558e3a10970e6d1e9
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Tue Dec 6 04:04:20 2011 -0600

    Unbreak get-orig-source in non-C locales by using "svn log --xml" instead of "svn info"
    
    Without this change, "debian/rules get-orig-source CHANNEL=beta"
    with LANG=fr produces a tarball named like
    chromium_16.0.912.59~r.orig.tar.bz2 (with no revision number) because
    the "svn info" output
    
    	Révision : 1210826
    
    does not contain the string "Revision:".
    
    Avoid trouble by using "svn log --xml" output, which is already used
    in the !CHANNEL case on the assumption that it should be more
    convenient to parse.

diff --git a/debian/rules b/debian/rules
index d095b7f..d5cc4bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -786,7 +786,7 @@ gos-pack: REVISION = $(shell cd $(TMP_DIR)/src && svn log --xml --limit 1 | grep
 	             sed -e 's/.*"\([0-9]*\)".*>\(....\)-\(..\)-\(..\)T.*/\2\3\4r\1/')
 gos-pack: VERSION  = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')~svn$(REVISION)
 else
-gos-pack: REVISION = $(shell cd $(TMP_DIR)/src && svn info | grep ^Revision: | cut -d' ' -f2)
+gos-pack: REVISION = $(shell cd $(TMP_DIR)/src && svn log --xml --limit 1 | grep '^ *revision=' | cut -d'"' -f2)
 gos-pack: VERSION  = $(shell cut -d= -f2 $(TMP_DIR)/src/chrome/VERSION | sed -e 's,$$,.,' | tr -d '\n' | sed -e 's/.$$//')~r$(REVISION)
 endif
 endif

-- 
Git repository for pkg-chromium