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

[Marco Nenciarini]

Author: mnencia
Date: 2006-12-29 00:37:23 +0100 (Fri, 29 Dec 2006)
New Revision: 2884

Modified:
   wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
Log:
* MacroGetSubversionRevision.cmake now exit imediately if SVN_REVISION is empty


Modified: wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch	2006-12-28 18:49:34 UTC (rev 2883)
+++ wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch	2006-12-28 23:37:23 UTC (rev 2884)
@@ -1,7 +1,7 @@
-Index: wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake
+Index: wengophone-2.0.0~rc5-svn8768/cmake/Modules/MacroGetSubversionRevision.cmake
 ===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/cmake/Modules/MacroGetSubversionRevision.cmake	2006-10-06 13:33:32.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake	2006-10-06 15:29:45.000000000 +0000
+--- wengophone-2.0.0~rc5-svn8768.orig/cmake/Modules/MacroGetSubversionRevision.cmake	2006-12-29 00:33:42.000000000 +0100
++++ wengophone-2.0.0~rc5-svn8768/cmake/Modules/MacroGetSubversionRevision.cmake	2006-12-29 00:34:38.000000000 +0100
 @@ -32,6 +32,35 @@
      else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
        set(_SVN_REVISION 0)
@@ -27,11 +27,11 @@
 +          _SVN_REVISION_OUTPUT_VARIABLE
 +      )
 +
-+      if (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++      if (_SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND _SVN_REVISION_OUTPUT_VARIABLE)
 +        set(_SVN_REVISION ${_SVN_REVISION_OUTPUT_VARIABLE})
-+      else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
-+        set(_SVN_REVISION 0)
-+      endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++      else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND _SVN_REVISION_OUTPUT_VARIABLE)
++        message(FATAL_ERROR "FATAL: cannot generate svn revision number from debian/changelog")
++      endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND _SVN_REVISION_OUTPUT_VARIABLE)
 +
 +    endif (_DEBIAN_CHANGELOG)
 +