From 8b1c7518ae2f4016db5948f5161d9bf8851053bd Mon Sep 17 00:00:00 2001 From: Mark Grant Date: Sat, 7 Apr 2018 09:52:46 +0100 Subject: [PATCH] Change package versioning to use hard-coded value. This is due to the use of github which produces source tarballs which can be used for package generation. These tarballs are used outside of git so git versioning is not possible, hence the hard-coded value. Because of this, other packaging should probably use the source tarball rather than a dist tarball. Signed-off-by: Mark Grant --- configure.ac | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index f74f32b..d603344 100644 --- a/configure.ac +++ b/configure.ac @@ -44,35 +44,36 @@ # directory. # # Use automake sub-directory and tar # # Posix format directives. # +# 07/04/2018 MG 1.0.11 Change package versioning to use # +# hard-coded value. This is due to the # +# use of github which produces source # +# tarballs which can be used for package # +# generation. These tarballs are used # +# outside of git so git versioning is not # +# possible, hence the hard-coded value. # +# Because of this, other packaging should # +# probably use the source tarball rather # +# than a dist tarball. # # # ######################################################################### -AC_REVISION([$Revision: 1.0.10 $]) +AC_REVISION([$Revision: 1.0.11 $]) AC_PREREQ([2.69]) ######################## # -# The following two macros use git to provide versioning information. -# If git is not initialised or no commit has been made, then 'Pre-Release' -# will be used. -# If no Tag has been created then just a commit identifier will be used. -# If a tag has been created then the most recent tag, plus number of commits -# since the tag, plus a commit identifier will be used. +# The package version in ac init will be used to create an output variable which +# can be used by ac output and / or the sed setup below to substitute bookmarks +# in source files. # ######################## -AC_INIT([apt-get Maintenance Commands Script], m4_esyscmd([ \ - git describe --always 1>/dev/null 2>/dev/null \ - && git describe --always | tr -d '\n' \ - || echo 'Pre-Release' | tr -d '\n']), - [m.grant.prg@gmail.com], [agmaint]) +AC_INIT(apt-get Maintenance Commands Script, v1.0.16, + m.grant.prg@gmail.com, agmaint) -AC_SUBST([pkgversion], [m4_esyscmd([ \ - git describe --always 1>/dev/null 2>/dev/null \ - && git describe --always | tr -d '\n' \ - || echo 'Pre-Release' | tr -d '\n'])]) +AC_SUBST(pkgversion, $PACKAGE_VERSION) ########################