From 1200172d16d34fef2cfe02a8b2ce59b60a66844f Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@lyx.org>
Date: Tue, 16 Sep 2014 12:30:15 -0400
Subject: [PATCH] Something weird happened to the patch preamble.

---
 development/tools/lyx-build      | 27 +++++++++++++--------------
 development/tools/patch-preamble |  8 ++++----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/development/tools/lyx-build b/development/tools/lyx-build
index affb72eb5c..87e7aa04d9 100755
--- a/development/tools/lyx-build
+++ b/development/tools/lyx-build
@@ -19,8 +19,20 @@ MAKEOPTS="-j4";
 # Determine LyX version
 cd $SRCDIR/
 VERSION=$(head configure.ac | grep AC_INIT | perl -e 'while (<>) {m/AC_INIT\(LyX,([^,]+)/; print $1;}');
+LASTNUM=$(echo $VERSION | sed -e 's/.*\.//');
+LAST=$(($LASTNUM - 1));
+FIRST=$(echo $VERSION | sed -e 's/[0-9]*$//');
+ORIGINAL=${FIRST}0;
+LAST=$FIRST$LAST;
+NUMFIX="th";
+if [ "$LASTNUM" = "1" ]; then
+  NUMFIX="st";
+elif [ "$LASTNUM" = "2" ]; then
+  NUMFIX="nd";
+fi
+NUM="$LASTNUM$NUMFIX";
 
-echo "This is version $VERSION.";
+echo "This is version $VERSION, the $NUM maintenance release in the ${FIRST}x series.";
 echo -n "Ready to build source packages...";
 read
 
@@ -76,12 +88,6 @@ else
   exit 1;
 fi
 
-LASTNUM=$(echo $VERSION | sed -e 's/.*\.//');
-LAST=$(($LASTNUM - 1));
-FIRST=$(echo $VERSION | sed -e 's/[0-9]*$//');
-ORIGINAL=${FIRST}0;
-LAST=$FIRST$LAST;
-
 if [ ! -d "$BASE/lyx-patch/" ]; then
 	mkdir "$BASE/lyx-patch/" || exit 1;
 fi
@@ -118,13 +124,6 @@ echo -n "Please check the patch...";
 read
 $EDITOR patch;
 
-NUMFIX="th";
-if [ "$LASTNUM" = "1" ]; then
-  NUMFIX="st";
-elif [ "$LASTNUM" = "2" ]; then
-  NUMFIX="nd";
-fi
-NUM="$LASTNUM$NUMFIX";
 cat $BASE/lyx-export/development/tools/patch-preamble | \
 sed -e "s/VERSION/$VERSION/; s/ORIGINAL/$ORIGINAL/; s/LAST/$LAST/; s/NUM/$NUM/;" >patch-preamble;
 echo -n "Please verify the patch preamble...";
diff --git a/development/tools/patch-preamble b/development/tools/patch-preamble
index b068c47902..b9f5ed12a8 100644
--- a/development/tools/patch-preamble
+++ b/development/tools/patch-preamble
@@ -1,10 +1,10 @@
-This is patch-2.0.1, the 1st maintenance patch against LyX 2.0.0. 
-You need the source of lyx 2.0.0 to apply this patch.
+This is patch-VERSION, the NUMst maintenance patch against LyX ORIGINAL. 
+You need the source of lyx LAST to apply this patch.
 
 This patch should be applied like this
-  cd lyx-2.0.0
+  cd lyx-LAST
   make distclean
-  zcat patch-2.0.0.gz | patch -p1
+  zcat patch-VERSION.gz | patch -p1
 and then LyX can be build as usual.
 
 If you want to skip the 'distclean' step, make sure to re-run configure.
-- 
2.39.5