Version 4.80.1

Hack reversion to state this version, for this branched build.
Adjust spec.xfpt.

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index ae1f7df03b339ddd88f4c27d0ea80d90645400bb..73dfe89c787b9e4f704a8eb8f4de23316967dbf5 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -46,7 +46,7 @@
 . /////////////////////////////////////////////////////////////////////////////
 
 .set previousversion "4.75"
-.set version "4.80"
+.set version "4.80.1"
 
 .set ACL "access control lists (ACLs)"
 .set I   "    "
@@ -174,8 +174,8 @@
 <author><firstname>Exim</firstname><surname>Maintainers</surname></author>
 <authorinitials>EM</authorinitials>
 <revhistory><revision>
-  <revnumber>4.80</revnumber>
-  <date>17 May 2012</date>
+  <revnumber>4.80.1</revnumber>
+  <date>24 Oct 2012</date>
   <authorinitials>EM</authorinitials>
 </revision></revhistory>
 <copyright><year>2012</year><holder>University of Cambridge</holder></copyright>

diff --git a/src/scripts/reversion b/src/scripts/reversion
index c4618868ec52e4026c6c21422d8968a9752d7696..b023a2faf29b3b56b6132dd816bbc16bf7eef2c4 100755 (executable)
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -32,21 +32,23 @@ fi
 
 # If this tree is a git working directory, use that to get version information.
 
-if [ -d ../../.git ] || [ "$1" = "release" ]
-then
-       # Modify the output of git describe into separate parts for
-       # the name "exim" and the release and variant versions.
-       # Put a dot in the version number and remove a spurious g.
-       set $(git describe --dirty=-XX --match 'exim-4*' |
-               sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
-       # Only update if we need to
-       if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ]
-       then
-               EXIM_RELEASE_VERSION="$2"
-               EXIM_VARIANT_VERSION="$3"
-               rm -f version.h
-       fi
-fi
+#if [ -d ../../.git ] || [ "$1" = "release" ]
+#then
+#      # Modify the output of git describe into separate parts for
+#      # the name "exim" and the release and variant versions.
+#      # Put a dot in the version number and remove a spurious g.
+#      set $(git describe --dirty=-XX --match 'exim-4*' |
+#              sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
+#      # Only update if we need to
+#      if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ]
+#      then
+#              EXIM_RELEASE_VERSION="$2"
+#              EXIM_VARIANT_VERSION="$3"
+#              rm -f version.h
+#      fi
+#fi
+EXIM_RELEASE_VERSION="4.80.1"
+EXIM_VARIANT_VERSION=""
 
 # If you are maintaining a patched version of Exim, you can either
 # create your own version.sh as part of your release process, or you