MonetDB: Jun2020-mmt - Slight change to version number: this is ...

[Sjoerd Mullender]

Changeset: bfb3b06de3e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bfb3b06de3e6
Modified Files:
        .bumpversion.cfg
        MonetDB.spec
        NT/monetdb_config.h.in
        NT/rules.msc
        configure.ag
        rpm.mk.in
Branch: Jun2020-mmt
Log Message:

Slight change to version number: this is now 11.37a.12.
Also, use both global and local revision numbers in build identification.
This should not be propagated.
Any more version changes should be done by hand.


diffs (68 lines):

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 11.37.12
+current_version = 11.37a.12
 commit = False
 tag = False
 
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %global name MonetDB
-%global version 11.37.12
+%global version 11.37a.12
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -631,7 +631,7 @@
 #define PACKAGE_URL "https://www.monetdb.org/";
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "11.37.12"
+#define PACKAGE_VERSION "11.37a.12"
 
 /* Path separator */
 #define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
 #
 # Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
 
-VERSION=11.37.12
+VERSION=11.37a.12
 
 !IFDEF MAKE_INCLUDEFILE
 !INCLUDE $(MAKE_INCLUDEFILE)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -52,7 +52,7 @@ dnl  configure file, whereas comments st
 dnl  (including their trailing newline).
 
 AC_PREREQ([2.63b])
-AC_INIT([MonetDB], [11.37.12], [https://bugs.monetdb.org/], [MonetDB], 
[https://www.monetdb.org/])
+AC_INIT([MonetDB], [11.37a.12], [https://bugs.monetdb.org/], [MonetDB], 
[https://www.monetdb.org/])
 AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.])
 AC_CONFIG_AUX_DIR([buildtools/conf])
 AC_CONFIG_MACRO_DIR([buildtools/conf])
diff --git a/rpm.mk.in b/rpm.mk.in
--- a/rpm.mk.in
+++ b/rpm.mk.in
@@ -34,7 +34,7 @@ srpm: MonetDB.spec $(top_builddir)/$(dis
 all: monetdb_hgversion.h
 
 monetdb_hgversion.h: always
-       if [ -d "$(srcdir)"/.hg ] && hgid=`(cd "$(srcdir)"; hg id -i) 
2>/dev/null`; then \
+       if [ -d "$(srcdir)"/.hg ] && hgid=`(cd "$(srcdir)"; hg id -in) 
2>/dev/null`; then \
                echo "#define MERCURIAL_ID \"$$hgid\"" > 
monetdb_hgversion.h.new; \
                if [ -f monetdb_hgversion.h ] && cmp -s monetdb_hgversion.h 
monetdb_hgversion.h.new; then \
                        rm -f monetdb_hgversion.h.new; \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list