[svn-commits] qwell: trunk r603 - in /trunk: ./ build_tools/make_version

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Jul 29 17:48:00 2008
New Revision: 603

URL: http://svn.digium.com/view/libpri?view=rev&rev=603
Log:
Merged revisions 602 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

........
r602 | qwell | 2008-07-29 17:47:37 -0500 (Tue, 29 Jul 2008) | 1 line

I believe this is what was meant.  (it matches how Asterisk does it)
........

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_version

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jul 29 17:48:00 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-372,386,390,416,424,427,441,446,462,465,470,479,514,528,598
+/branches/1.4:1-372,386,390,416,424,427,441,446,462,465,470,479,514,528,598,602

Modified: trunk/build_tools/make_version
URL: http://svn.digium.com/view/libpri/trunk/build_tools/make_version?view=diff&rev=603&r1=602&r2=603
==============================================================================
--- trunk/build_tools/make_version (original)
+++ trunk/build_tools/make_version Tue Jul 29 17:48:00 2008
@@ -31,18 +31,18 @@
 
       if [ ${BRANCH} != 0 ] ; then
         if [ -z ${RESULT} ] ; then
-          RESULT="2${PART}"
+          RESULT="${PART}"
         else
-          RESULT="3${RESULT}-${PART}"
+          RESULT="${RESULT}-${PART}"
         fi
 	    break
       fi
 
       if [ ${TEAM} != 0 ] ; then
         if [ -z ${RESULT} ] ; then
-           RESULT="4${PART}"
+           RESULT="${PART}"
         else
-          RESULT="5${RESULT}-${PART}"
+          RESULT="${RESULT}-${PART}"
         fi
         continue
       fi
@@ -64,8 +64,6 @@
       fi
     done
 
- 	RESULT="libpri"
-
     if [ ${TAG} != 0 ] ; then
 	echo ${RESULT}
     else