From b9722d39cd619ac55c2cfbb5644eabb84ff57f1b Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Thu, 17 Jun 2021 18:00:50 +0300 Subject: [PATCH] configure.ac: Switch project version to 20.x.y style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Zoltán Böszörményi Signed-off-by: Povilas Kanapickas --- configure.ac | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index a88c64e7e..10900db14 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.20.99.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) +AC_INIT([xorg-server], 20.99.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) RELEASE_DATE="2018-05-14" RELEASE_NAME="Carrot and Ginger Soup" AC_CONFIG_SRCDIR([Makefile.am]) @@ -363,12 +363,10 @@ esac dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the dnl major number PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` -PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1` -if test "x$PVS" = "x"; then - PVS="0" -fi -VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)" +dnl Convert to the old-style 1.x.y version scheme used up to 1.20.x for +dnl backwards compatibility +VENDOR_RELEASE="((10000000) + (($PVMAJOR) * 100000) + (($PVM) * 1000) + $PVP)" VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}" VENDOR_NAME="The X.Org Foundation"