set version number to 2.3.0, prepare for release
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 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea4545a..85fccaf 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 1)
-SET(VERSION_MINOR 3)
+SET(VERSION_MAJOR 3)
+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 837a196..4628f99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-14 21:17 Frank Heckenbach <f.heckenbach@fh-soft.de>
+
+ * NEWS, configure.ac, ppa_upload.sh, msvc/config.h, debian/rules:
+ * Mark package as being version 2.3.0.
+
2008-06-19 13:11 sammy
* [r1193] NEWS, configure.ac:
diff --git a/NEWS b/NEWS
index 3027150..fe2e49c 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,23 @@ been released to date. All versions prior to and including version
versions have changes attributed per contributor.
----------------------------------------------------------------------
+--- 2018-10-14 Release 2.3.0 ---
+----------------------------------------------------------------------
+
+ * Fix a memory leak
+ * FTContour: avoid NaN for angles close to 180 degrees
+ (see Debian bug #589601, 5.)
+ * FTBufferGlyph: fix garbage with bitmap fonts
+ (text is still clipped, that seems to be another problem)
+ * FTTextureGlyphImpl: fix garbage with bitmap fonts
+ (see Debian bug #589601, 4.)
+ * FTPixmapGlyph: fix garbage with bitmap fonts
+ (see Debian bug #589601, 2.)
+ * FTOutlineGlyphImpl, FTPolygonGlyphImpl: avoid uninizitalized
+ vectoriser in case of error (see Debian bug #589601, 1.)
+ * Various other bugfixes collected through the years
+
+----------------------------------------------------------------------
--- 2008-06-19 Release 2.2.0 ---
----------------------------------------------------------------------
diff --git a/README b/README
index 69b2776..9554f30 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-FTGL 2.1
-5 December 2004
+FTGL 2.3
+14 Oct 2018
DESCRIPTION:
@@ -33,6 +33,15 @@ CONTACT:
Please contact us if you have any suggestions, feature requests, or problems.
+ftgl is currently hosted at:
+
+https://github.com/frankheckenbach/ftgl
+
+Current maintainer:
+
+Frank Heckenbach <f.heckenbach@fh-soft.de>
+
+Original authors:
+
Sam Hocevar <sam@hocevar.net>
Christopher Sean Morrison <learner@brlcad.org>
-
diff --git a/configure.ac b/configure.ac
index 025ebbb..0d60496 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.2.0, [https://sourceforge.net/projects/ftgl/], ftgl)
+AC_INIT(FTGL, 2.3.0, [https://sourceforge.net/projects/ftgl/], ftgl)
AC_CONFIG_SRCDIR(src/FTPoint.cpp)
AC_CONFIG_AUX_DIR(.auto)
AC_CONFIG_MACRO_DIR([m4])
@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h)
FTGL_PROG_CXX
LT_MAJOR="2"
-LT_MINOR="2"
+LT_MINOR="3"
LT_MICRO="0"
AC_SUBST(LT_MAJOR)
AC_SUBST(LT_MINOR)
diff --git a/debian/changelog b/debian/changelog
index 367c15e..92db0ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ftgl (2.3.0) unstable; urgency=medium
+
+ * New Upstream Release.
+ (Closes: #531489, #589601, #742469, #760571).
+
+ -- Frank Heckenbach <f.heckenbach@fh-soft.de> Sun, 14 Oct 2018 21:17:59 +0200
+
ftgl (2.1.3~rc5-5polyextr~xenial) xenial; urgency=medium
* Improved discovery for cmake
diff --git a/debian/control b/debian/control
index 924277e..29b225b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Package: libftgl-dev
Section: libdevel
Architecture: any
Depends: libftgl2 (= ${binary:Version}), libfreetype6-dev (>> 2.0.9), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ftgl-dev (<< 2.1.3~rc1)
-Replaces: ftgl-dev (<< 2.1.3~rc1)
+Conflicts: ftgl-dev (<< 2.3.0)
+Replaces: ftgl-dev (<< 2.3.0)
Description: development files for libftgl
FTGL binds OpenGL and FreeType together in order to offer and easy to use
and flexible text rendering library. It offers several rendering modes:
diff --git a/debian/rules b/debian/rules
index 914f537..13caa26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-arch: build install
dh_strip -a
dh_compress -a
dh_fixperms -a
- dh_makeshlibs -p libftgl2 -V 'libftgl2 (>= 2.1.3~rc5)'
+ dh_makeshlibs -p libftgl2 -V 'libftgl2 (>= 2.3.0)'
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
diff --git a/msvc/config.h b/msvc/config.h
index 6c39013..08a11b2 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -45,4 +45,4 @@
// use __FUNCTION__
#define __FUNC__ __FUNCTION__
-#define PACKAGE_VERSION "2.2.0"
+#define PACKAGE_VERSION "2.3.0"
diff --git a/ppa_upload.sh b/ppa_upload.sh
index c3d6c3c..399f30d 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.1.3~rc5-10polyextr
+VERSIONNBR=2.3.0
for DISTRIBUTION in precise quantal
do