Rename `VERSION.DLL' (#47472). * docs/VERSION.DLL: Renamed to... * docs/VERSIONS.TXT: ...this.
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 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
diff --git a/ChangeLog b/ChangeLog
index ee6220b..bbdadea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2016-03-23 Werner Lemberg <wl@gnu.org>
+ Rename `VERSION.DLL' (#47472).
+
+ * docs/VERSION.DLL: Renamed to...
+ * docs/VERSIONS.TXT: ...this.
+
+2016-03-23 Werner Lemberg <wl@gnu.org>
+
[raster, smooth] Directly test outline size (#47500).
This improves stand-alone compilation.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index ee81474..e6fd748 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -15,7 +15,7 @@ AC_INIT([FreeType], [@VERSION@], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in])
-# Don't forget to update docs/VERSION.DLL!
+# Don't forget to update `docs/VERSIONS.TXT'!
version_info='18:3:12'
AC_SUBST([version_info])
diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
deleted file mode 100644
index 804c2f2..0000000
--- a/docs/VERSION.DLL
+++ /dev/null
@@ -1,119 +0,0 @@
-Due to our use of `libtool' to generate and install the FreeType 2
-libraries on Unix systems, as well as other historical events, it is
-generally very difficult to know precisely which release of the font
-engine is installed on a given system.
-
-This file tries to explain why and to document ways to properly detect
-FreeType on Unix.
-
-
-1. Version and Release numbers
-------------------------------
-
-For each new public release of FreeType 2, there are generally *three*
-distinct `version' numbers to consider:
-
- * The official FreeType 2 release number, like 2.3.1 or 2.4.10.
-
- * The libtool (and Unix) specific version number, like 13.0.7. This
- is what `freetype-config --version' returns.
-
- * The platform-specific shared object number, used for example when
- the library is installed as `/usr/lib/libfreetype.so.6.7.1'.
-
-The platform-specific number is, unsurprisingly, platform-specific and
-varies with the operating system you are using (several variants of
-Linux, FreeBSD, Solaris, etc.). You should thus _never_ use it, even
-for simple tests.
-
-The libtool-specific number does not equal the release number but is
-tied to it.
-
-The release number is available at *compile* time through the following
-macros defined in FT_FREETYPE_H:
-
- - FREETYPE_MAJOR: major release number
- - FREETYPE_MINOR: minor release number
- - FREETYPE_PATCH: patch release number
-
-See below for a small autoconf fragment.
-
-The release number is also available at *runtime* through the
-`FT_Library_Version' API.
-
-
-2. History
-----------
-
-The following table gives, for all releases since 2.4.0, the
-corresponding libtool number, as well as the shared object number found
-on _most_ systems, but not all of them:
-
-
- release libtool so
- -------------------------------
- 2.6.3 18.3.12 6.12.3
- 2.6.2 18.2.12 6.12.2
- 2.6.1 18.1.12 6.12.1
- 2.6.0 18.0.12 6.12.0
- 2.5.5 17.4.11 6.11.4
- 2.5.4 17.3.11 6.11.3
- 2.5.3 17.2.11 6.11.2
- 2.5.2 17.1.11 6.11.1
- 2.5.1 17.0.11 6.11.0
- 2.5.0 16.2.10 6.10.2
- 2.4.12 16.1.10 6.10.1
- 2.4.11 16.0.10 6.10.0
- 2.4.10 15.0.9 6.9.0
- 2.4.9 14.1.8 6.8.1
- 2.4.8 14.0.8 6.8.0
- 2.4.7 13.2.7 6.7.2
- 2.4.6 13.1.7 6.7.1
- 2.4.5 13.0.7 6.7.0
- 2.4.4 12.2.6 6.6.2
- 2.4.3 12.1.6 6.6.1
- 2.4.2 12.0.6 6.6.0
- 2.4.1 11.1.5 6.5.1
- 2.4.0 11.0.5 6.5.0
-
-
-3. Autoconf Code Fragment
--------------------------
-
-Lars Clausen contributed the following autoconf fragment to detect which
-version of FreeType is installed on a system. This one tests for a
-version that is at least 2.0.9; you should change it to check against
-other release numbers.
-
-
- AC_MSG_CHECKING([whether FreeType version is 2.0.9 or higher])
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS=`freetype-config --cflags`
- AC_TRY_CPP([
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#if (FREETYPE_MAJOR*1000 + FREETYPE_MINOR)*1000 + FREETYPE_PATCH < 2000009
-#error Freetype version too low.
-#endif
- ],
- [AC_MSG_RESULT(yes)
- FREETYPE_LIBS=`freetype-config --libs`
- AC_SUBST(FREETYPE_LIBS)
- AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])
- CPPFLAGS="$old_CPPFLAGS"],
- [AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])])
-
-------------------------------------------------------------------------
-
-Copyright 2002-2016 by
-David Turner, Robert Wilhelm, and Werner Lemberg.
-
-This file is part of the FreeType project, and may only be used,
-modified, and distributed under the terms of the FreeType project
-license, LICENSE.TXT. By continuing to use, modify, or distribute this
-file you indicate that you have read the license and understand and
-accept it fully.
-
-
---- end of VERSION.DLL ---
diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT
new file mode 100644
index 0000000..e2c72bc
--- /dev/null
+++ b/docs/VERSIONS.TXT
@@ -0,0 +1,119 @@
+Due to our use of `libtool' to generate and install the FreeType 2
+libraries on Unix systems, as well as other historical events, it is
+generally very difficult to know precisely which release of the font
+engine is installed on a given system.
+
+This file tries to explain why and to document ways to properly detect
+FreeType on Unix.
+
+
+1. Version and Release numbers
+------------------------------
+
+For each new public release of FreeType 2, there are generally *three*
+distinct `version' numbers to consider:
+
+ * The official FreeType 2 release number, like 2.3.1 or 2.4.10.
+
+ * The libtool (and Unix) specific version number, like 13.0.7. This
+ is what `freetype-config --version' returns.
+
+ * The platform-specific shared object number, used for example when
+ the library is installed as `/usr/lib/libfreetype.so.6.7.1'.
+
+The platform-specific number is, unsurprisingly, platform-specific and
+varies with the operating system you are using (several variants of
+Linux, FreeBSD, Solaris, etc.). You should thus _never_ use it, even
+for simple tests.
+
+The libtool-specific number does not equal the release number but is
+tied to it.
+
+The release number is available at *compile* time through the following
+macros defined in FT_FREETYPE_H:
+
+ - FREETYPE_MAJOR: major release number
+ - FREETYPE_MINOR: minor release number
+ - FREETYPE_PATCH: patch release number
+
+See below for a small autoconf fragment.
+
+The release number is also available at *runtime* through the
+`FT_Library_Version' API.
+
+
+2. History
+----------
+
+The following table gives, for all releases since 2.4.0, the
+corresponding libtool number, as well as the shared object number found
+on _most_ systems, but not all of them:
+
+
+ release libtool so
+ -------------------------------
+ 2.6.3 18.3.12 6.12.3
+ 2.6.2 18.2.12 6.12.2
+ 2.6.1 18.1.12 6.12.1
+ 2.6.0 18.0.12 6.12.0
+ 2.5.5 17.4.11 6.11.4
+ 2.5.4 17.3.11 6.11.3
+ 2.5.3 17.2.11 6.11.2
+ 2.5.2 17.1.11 6.11.1
+ 2.5.1 17.0.11 6.11.0
+ 2.5.0 16.2.10 6.10.2
+ 2.4.12 16.1.10 6.10.1
+ 2.4.11 16.0.10 6.10.0
+ 2.4.10 15.0.9 6.9.0
+ 2.4.9 14.1.8 6.8.1
+ 2.4.8 14.0.8 6.8.0
+ 2.4.7 13.2.7 6.7.2
+ 2.4.6 13.1.7 6.7.1
+ 2.4.5 13.0.7 6.7.0
+ 2.4.4 12.2.6 6.6.2
+ 2.4.3 12.1.6 6.6.1
+ 2.4.2 12.0.6 6.6.0
+ 2.4.1 11.1.5 6.5.1
+ 2.4.0 11.0.5 6.5.0
+
+
+3. Autoconf Code Fragment
+-------------------------
+
+Lars Clausen contributed the following autoconf fragment to detect which
+version of FreeType is installed on a system. This one tests for a
+version that is at least 2.0.9; you should change it to check against
+other release numbers.
+
+
+ AC_MSG_CHECKING([whether FreeType version is 2.0.9 or higher])
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS=`freetype-config --cflags`
+ AC_TRY_CPP([
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#if (FREETYPE_MAJOR*1000 + FREETYPE_MINOR)*1000 + FREETYPE_PATCH < 2000009
+#error Freetype version too low.
+#endif
+ ],
+ [AC_MSG_RESULT(yes)
+ FREETYPE_LIBS=`freetype-config --libs`
+ AC_SUBST(FREETYPE_LIBS)
+ AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])
+ CPPFLAGS="$old_CPPFLAGS"],
+ [AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])])
+
+------------------------------------------------------------------------
+
+Copyright 2002-2016 by
+David Turner, Robert Wilhelm, and Werner Lemberg.
+
+This file is part of the FreeType project, and may only be used,
+modified, and distributed under the terms of the FreeType project
+license, LICENSE.TXT. By continuing to use, modify, or distribute this
+file you indicate that you have read the license and understand and
+accept it fully.
+
+
+--- end of VERSIONS.TXT ---
diff --git a/docs/release b/docs/release
index 3d66762..fc03a50 100644
--- a/docs/release
+++ b/docs/release
@@ -13,7 +13,7 @@ How to prepare a new release
. README: Update.
-. docs/VERSION.DLL: Document changed `version_info'.
+. docs/VERSIONS.TXT: Document changed `version_info'.
. ChangeLog: Announce new release (both in the freetype2 and
freetype2-demos modules).