From 9e745473dca51f78ed4c10565b34213159fcf3b8 Mon Sep 17 00:00:00 2001
From: Gilles Dubochet <gilles.dubochet@epfl.ch>
Date: Mon, 13 Mar 2006 10:36:32 +0000
Subject: Reverted back Stephane's incorrect changes to t...

Reverted back Stephane's incorrect changes to the versioning scheme. It
needs to REMAIN THAT WAY to be compatible with SBaz.
---
 build.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index bac5a02136..e714da7345 100644
--- a/build.xml
+++ b/build.xml
@@ -875,26 +875,21 @@ GENERATES A DISTRIBUTION
   </target>
   
   <target name="dist.patch" depends="init">
-    <property file="${number.file}"/>
-    <property
-      name="version.number"
-      value="${version.major}.${version.minor}.${version.patch}"
-    />
     <propertyfile
       file="${number.file}"
       comment="Version last updated on ${time.human}"
     >
       <entry key="version.patch" type="int" default="0" operation="+"/>
     </propertyfile>
-    <runtarget target="dist"/>
-  </target>
-  
-  <target name="dist.minor" depends="init">
     <property file="${number.file}"/>
     <property
       name="version.number"
       value="${version.major}.${version.minor}.${version.patch}"
     />
+    <runtarget target="dist"/>
+  </target>
+  
+  <target name="dist.minor" depends="init">
     <propertyfile
       file="${number.file}"
       comment="Version last updated on ${time.human}"
@@ -902,6 +897,11 @@ GENERATES A DISTRIBUTION
       <entry key="version.minor" type="int" default="0" operation="+"/>
       <entry key="version.patch" type="int" value="0"/>
     </propertyfile>
+    <property file="${number.file}"/>
+    <property
+      name="version.number"
+      value="${version.major}.${version.minor}.${version.patch}"
+    />
     <runtarget target="dist"/>
   </target>
 
-- 
cgit v1.2.3