diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e66cde67..7168cc14d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,8 +162,8 @@ endif () project(freetype C) set(VERSION_MAJOR "2") -set(VERSION_MINOR "11") -set(VERSION_PATCH "1") +set(VERSION_MINOR "12") +set(VERSION_PATCH "0") # Generate LIBRARY_VERSION and LIBRARY_SOVERSION. set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'") diff --git a/README b/README index da01bfed6..a33cb11aa 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -FreeType 2.11.1 +FreeType 2.12.0 =============== Homepage: https://www.freetype.org @@ -30,9 +30,9 @@ sites. Go to and download one of the following files. - freetype-doc-2.11.1.tar.xz - freetype-doc-2.11.1.tar.gz - ftdoc2111.zip + freetype-doc-2.12.0.tar.xz + freetype-doc-2.12.0.tar.gz + ftdoc2120.zip To view the documentation online, go to diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 36e491be0..fb0838e98 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -304,13 +304,12 @@ do-dist: distclean refdoc cp $(CONFIG_GUESS) builds/unix cp $(CONFIG_SUB) builds/unix - @# Generate `ChangeLog' file with commits since previous release. + @# Generate `ChangeLog' file with commits since release 2.11.0 + @# (when we stopped creating this file manually). $(CHANGELOG_SCRIPT) \ --format='%B%n' \ --no-cluster \ - -- `git describe --tags \ - --abbrev=0 \ - $(version_tag)^`..$(version_tag) \ + -- VER-2-11-0..$(version_tag) \ > ChangeLog @# Remove intermediate files created by the `refdoc' target. diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index f0a292e9c..cfb073efa 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='24:1:18' +version_info='24:2:18' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 3e42cf992..2289c76b8 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,7 +21,7 @@ the following targets:
  • PPC/SP WM6 (Windows Mobile 6)
  • -It compiles the following libraries from the FreeType 2.11.1 sources:

    +It compiles the following libraries from the FreeType 2.12.0 sources:

    -It compiles the following libraries from the FreeType 2.11.1 sources:

    +It compiles the following libraries from the FreeType 2.12.0 sources: