[asterisk-commits] russell: trunk r50229 - in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Jan  9 20:19:47 2007
New Revision: 50229

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50229
Log:
Merged revisions 50228 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r50228 | russell | 2007-01-09 21:17:46 -0500 (Tue, 09 Jan 2007) | 14 lines

Merged revisions 50227 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r50227 | russell | 2007-01-09 21:16:45 -0500 (Tue, 09 Jan 2007) | 6 lines

Make the number that represents the major version number a single digit instead
of 2.  Using two digits makes it an octal number when put into version.h, which
breaks the compilation of any out of tree module that checks the version for
any version after 1.2.7 (reported by Matteo Brancaleoni on the asterisk-dev
mailing list, who gave credit to vihai for pointing it out)

........

................

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=50229&r1=50228&r2=50229
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Jan  9 20:19:47 2007
@@ -223,7 +223,7 @@
 ASTERISKVERSION:=$(shell build_tools/make_version .)
 
 ifneq ($(wildcard .version),)
-  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
+  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
   RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
 else
   RPMVERSION=unknown