[Pkg-voip-commits] r3541 - wengophone/trunk/debian/patches/debian

[Marco Nenciarini]

Author: mnencia
Date: 2007-05-13 10:13:32 +0000 (Sun, 13 May 2007)
New Revision: 3541

Modified:
   wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
Log:
Try to solve #423517 and build problems on buildserver.net


Modified: wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch	2007-05-13 04:34:36 UTC (rev 3540)
+++ wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch	2007-05-13 10:13:32 UTC (rev 3541)
@@ -1,8 +1,8 @@
-Index: wengophone-2.1.0~beta1-svn9961/owbuild/owbuild/OWGetSvnRevision.cmake
+Index: wengophone-2.1.0~rc2-svn10386/owbuild/owbuild/OWGetSvnRevision.cmake
 ===================================================================
---- wengophone-2.1.0~beta1-svn9961.orig/owbuild/owbuild/OWGetSvnRevision.cmake	2007-02-19 13:53:54.000000000 +0100
-+++ wengophone-2.1.0~beta1-svn9961/owbuild/owbuild/OWGetSvnRevision.cmake	2007-02-26 17:03:51.000000000 +0100
-@@ -53,7 +53,34 @@
+--- wengophone-2.1.0~rc2-svn10386.orig/owbuild/owbuild/OWGetSvnRevision.cmake	2007-05-13 11:23:24.000000000 +0200
++++ wengophone-2.1.0~rc2-svn10386/owbuild/owbuild/OWGetSvnRevision.cmake	2007-05-13 12:10:33.000000000 +0200
+@@ -53,7 +53,32 @@
  			set(${revision} 0)
  		endif (SVN_REVISION_RESULT_VARIABLE EQUAL 0)
  	else (SVNVERSION_EXECUTABLE AND SVN_DOT_DIR)
@@ -18,9 +18,7 @@
 +			message("-- Generating subversion revison using debian/changelog")
 +				execute_process(
 +					COMMAND
-+						sed -ne "1s/^[^(]*([^)]*svn\\([^)]\\+\\)-[0-9]\\+).*$/\\1/p" ${DEBIAN_CHANGELOG}
-+					COMMAND
-+						tr -d "\\n"
++						/usr/bin/perl -e '$_=<>;$_=~/^.*svn(.*?)-.*$/;print $1' ${DEBIAN_CHANGELOG}
 +					RESULT_VARIABLE
 +						SVN_REVISION_RESULT_VARIABLE
 +					OUTPUT_VARIABLE