set version number to 2.4.0

frankheckenbach · Feb 7, 2019 · 4836392 · 4836392
1 parent 8ee0d83
commit 4836392
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,8 +4,8 @@ PROJECT(FTGL)
 SET(CMAKE_MODULE_PATH ${FTGL_SOURCE_DIR})
 
 SET(VERSION_SERIES 2)
-SET(VERSION_MAJOR 3)
-SET(VERSION_MINOR 1)
+SET(VERSION_MAJOR 4)
+SET(VERSION_MINOR 0)
 SET(FTGL_SOVERSION 1)
 
 FIND_PACKAGE(Freetype REQUIRED) # if it fails, check this: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/826988

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-07 22:35  Frank Heckenbach <f.heckenbach@fh-soft.de>
+
+  * NEWS, configure.ac, ppa_upload.sh, msvc/config.h, CMakeLists.txt:
+    * Mark package as being version 2.4.0.
+
 2019-02-07 22:31  Frank Heckenbach <f.heckenbach@fh-soft.de>
 
   * configure.ac: remove -Waggregate-return (returning aggregates is

diff --git a/NEWS b/NEWS
@@ -7,6 +7,13 @@ been released to date.  All versions prior to and including version
 2.1.2 were exclusively developed by Henry Maddocks.  Subsequent
 versions have changes attributed per contributor.
 
+----------------------------------------------------------------------
+--- 2019-02-07  Release 2.4.0                                      ---
+----------------------------------------------------------------------
+
+    * New setting LegacyOpenGLState(), see README-LegacyOpenGLState
+    * Fix/silence compiler warnings
+
 ----------------------------------------------------------------------
 --- 2018-11-21  Release 2.3.1                                      ---
 ----------------------------------------------------------------------

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl Minimum version of autoconf required.  Should coincide with the
 dnl setting in the autogen.sh script.
 AC_PREREQ(2.58)
 
-AC_INIT(FTGL, 2.3.1, [https://sourceforge.net/projects/ftgl/], ftgl)
+AC_INIT(FTGL, 2.4.0, [https://sourceforge.net/projects/ftgl/], ftgl)
 AC_CONFIG_SRCDIR(src/FTPoint.cpp)
 AC_CONFIG_AUX_DIR(.auto)
 AC_CONFIG_MACRO_DIR([m4])
@@ -12,8 +12,8 @@ AM_CONFIG_HEADER(config.h)
 FTGL_PROG_CXX
 
 LT_MAJOR="2"
-LT_MINOR="3"
-LT_MICRO="1"
+LT_MINOR="4"
+LT_MICRO="0"
 AC_SUBST(LT_MAJOR)
 AC_SUBST(LT_MINOR)
 AC_SUBST(LT_MICRO)

diff --git a/debian/rules b/debian/rules
@@ -4,7 +4,7 @@
 # doesn't have pkg-config files or other simple mechanisms.
 GLUT_LIBS := -lglut -lGLU -lGL -lm
 
-SHLIBVER := 2.3.1
+SHLIBVER := 2.4.0
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
         ^(\./\.git/.*|\./debian/.*|\./\.pc/.*|\./test/font_pack/(El_Abogado_Loco\.ttf|timR12-ISO8859-1\.pcf\.gz)|\./docs/images/.*\.png|\./docs/FTGL_1_3\.gif)$
 

diff --git a/msvc/config.h b/msvc/config.h
@@ -45,4 +45,4 @@
 // use __FUNCTION__
 #define __FUNC__ __FUNCTION__
 
-#define PACKAGE_VERSION "2.3.1"
+#define PACKAGE_VERSION "2.4.0"
diff --git a/ppa_upload.sh b/ppa_upload.sh
@@ -2,7 +2,7 @@
 # build a debian sourcepackage and upload it to the launchpad ppa
 
 #:${VERSIONNBR:=$(parsechangelog | grep Version | sed -e "s/Version: //g" -e "s/\\~.*//g")}
-VERSIONNBR=2.3.1
+VERSIONNBR=2.4.0
 
 for DISTRIBUTION in precise quantal
 do