Commit 483639219095ad080538e07ceb5996de901d4e74
2019-02-07T22:39:58
set version number to 2.4.0
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b230ce..303fcae 100644
--- 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
index cb0aade..42fef90 100644
--- 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
index 15a8174..659f3f8 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,13 @@ been released to date. All versions prior to and including version
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
index 3a0ff01..7b4710e 100644
--- 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
index d5454bc..494cc03 100755
--- 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
index 3eeb78e..2330e71 100644
--- 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
index 1bf1739..772c883 100755
--- 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