Merge pull request #14 from frankheckenbach/master

set version number to 2.3.0, prepare for release
ulrichard · Oct 15, 2018 · 16f7667 · 16f7667
2 parents e7130ee + d48ee41
commit 16f7667
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 12 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 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
@@ -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
@@ -7,6 +7,23 @@ 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.
 
+----------------------------------------------------------------------
+--- 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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