Documentation update for repository move to 'freedesktop.org'.
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
diff --git a/builds/atari/README.TXT b/builds/atari/README.TXT
index ffe6545..1300817 100644
--- a/builds/atari/README.TXT
+++ b/builds/atari/README.TXT
@@ -15,7 +15,7 @@ To compile FreeType 2 as a library the following changes must be applied:
INCLUDE;E:\freetype2\include
-- The file `freetype2/include/Ft2build.h' must be patched as follows to
+- The file `freetype/include/Ft2build.h' must be patched as follows to
include ATARI.H:
#ifndef FT2_BUILD_GENERIC_H_
@@ -40,7 +40,7 @@ ge
INCLUDE;E:\freetype2\include
-- In der Datei freetype2/include/Ft2build.h muss zu Beginn
+- In der Datei freetype/include/Ft2build.h muss zu Beginn
ein #include "ATARI.H" wie folgt eingefgt werden:
#ifndef FT2_BUILD_GENERIC_H_
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index b259c68..209e3ed 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -364,6 +364,6 @@
<TargetFiles Include="$(TargetDir)$(TargetName).*" />
</ItemGroup>
<Copy SourceFiles="@(TargetFiles)" DestinationFolder="..\..\..\objs" />
- <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="..\..\..\..\freetype2-demos\bin" Condition="'$(TargetExt)'=='.dll'" />
+ <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="..\..\..\..\freetype-demos\bin" Condition="'$(TargetExt)'=='.dll'" />
</Target>
</Project>
diff --git a/docs/CHANGES b/docs/CHANGES
index 8f193f8..1655932 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -60,6 +60,18 @@ CHANGES BETWEEN 2.10.4 and 2.11.0
This work was Priyesh Kumar's GSoC 2020 project.
+ - FreeType has moved its infrastructure to
+
+ https://gitlab.freedesktop.org/freetype
+
+ A side effect is that the git repositories are now called
+ `freetype.git` and `freetype-demos.git`, which by default expand
+ to the directories `freetype` and `freetype-demos`, respectively.
+ The documentation has been updated accordingly.
+
+ FreeType's Savannah repositories will stay; they are now mirrors
+ of the 'freedesktop.org' repositories.
+
======================================================================
diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY
index 879dddb..ecfa609 100644
--- a/docs/INSTALL.ANY
+++ b/docs/INSTALL.ANY
@@ -21,9 +21,9 @@ I. Standard procedure
* You need to add the directory `include' to your include path when
compiling the library.
- * FreeType 2 is made of several components; each of them is located
- in a subdirectory of `freetype2/src'. For example,
- `freetype2/src/truetype/' contains the TrueType font driver.
+ * FreeType 2 is made of several components; each of them is located
+ in a subdirectory of `freetype/src'. For example,
+ `freetype/src/truetype/' contains the TrueType font driver.
* DO NOT COMPILE ALL C FILES! Rather, compile the following ones.
@@ -125,9 +125,9 @@ II. Support for flat-directory compilation
1. Copy all files in current directory
- cp freetype2/src/base/*.[hc] .
- cp freetype2/src/raster1/*.[hc] .
- cp freetype2/src/smooth/*.[hc] .
+ cp freetype/src/base/*.[hc] .
+ cp freetype/src/raster1/*.[hc] .
+ cp freetype/src/smooth/*.[hc] .
etc.
2. Compile sources
diff --git a/docs/release b/docs/release
index 628dded..01cc576 100644
--- a/docs/release
+++ b/docs/release
@@ -1,26 +1,26 @@
How to prepare a new release
----------------------------
-. include/freetype/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR,
- and FREETYPE_PATCH.
+. include/freetype/freetype.h: Update `FREETYPE_MAJOR`,
+ `FREETYPE_MINOR`, and `FREETYPE_PATCH`.
. Update version numbers in all files where necessary (for example, do
- a grep for both `2.3.1' and `231' for release 2.3.1).
+ a grep for both '2.10.4' and '2104' for release 2.10.4).
-. builds/unix/configure.raw: Update `version_info'.
+. builds/unix/configure.raw: Update `version_info`.
. docs/CHANGES: Document differences to last release.
. README: Update.
-. docs/VERSIONS.TXT: Document changed `version_info'.
+. docs/VERSIONS.TXT: Document changed `version_info`.
-. ChangeLog: Announce new release (both in the freetype2 and
- freetype2-demos modules).
+. ChangeLog: Announce new release (both in the 'freetype' and
+ 'freetype-demos' repositories).
. Clone the git archive to another directory with
- git clone -l -s . ../freetype2.test
+ git clone -l -s . ../freetype.test
or something like this and run
@@ -35,14 +35,14 @@ How to prepare a new release
in the cloned repository to test compilation with both gcc and g++.
-. Test C++ compilation for freetype2-demos too (using `git clone' as
+. Test C++ compilation for 'freetype-demos' too (using `git clone` as
above).
-. Run src/tools/chktrcmp.py and check that there are no undefined
- trace_XXXX macros.
+. Run `src/tools/chktrcmp.py` and check that there are no undefined
+ `trace_XXXX` macros.
-. After pushing the new release, tag the git repositories (freetype2,
- freetype2-demos) with
+. After pushing the new release, tag the git repositories ('freetype',
+ 'freetype-demos') with
git tag VER-<version> -m "" -u <committer>
@@ -54,29 +54,29 @@ How to prepare a new release
git clean -ndx
- that the git directory is really clean (and remove extraneous files
+ that the git directory is really clean (and remove extraneous files
if necessary).
-. Say `make dist' in both the freetype2 and freetype2-demos modules
- to generate the .tar.gz, .tar.xz, and .zip files.
+. Say `make dist` in both the 'freetype' and 'freetype-demos'
+ repositories to generate the `.tar.gz`, `.tar.xz`, and `.zip` files.
-. Create the doc bundles (freetype-doc-<version>.tar.gz,
- freetype-doc-<version>.tar.xz, ftdoc<version>.zip). This is
+. Create the doc bundles (`freetype-doc-<version>.tar.gz`,
+ `freetype-doc-<version>.tar.xz`, `ftdoc<version>.zip`). This is
everything in
<freetype-web git repository>/freetype2/docs
- except the `reference' subdirectory. Do *not* use option `-l' from
+ except the `reference` subdirectory. Do *not* use option `-l` from
zip!
-. Run the following script (with updated `$VERSION', `$SAVANNAH_USER',
- and $SOURCEFORGE_USER variables) to sign and upload the bundles to
+. Run the following script (with updated `$VERSION`, `$SAVANNAH_USER`,
+ and `$SOURCEFORGE_USER` variables) to sign and upload the bundles to
both Savannah and SourceForge. The signing code has been taken from
- the `gnupload' script (part of the automake bundle).
+ the `gnupload` script (part of the 'automake' bundle).
#!/bin/sh
- VERSION=2.5.1
+ VERSION=2.10.4
SAVANNAH_USER=wl
SOURCEFORGE_USER=wlemb
@@ -155,12 +155,13 @@ How to prepare a new release
# EOF
-. Prepare a README for SourceForge and upload it with the following
- script (with updated `$VERSION' and $SOURCEFORGE_USER variables).
+. Prepare a `README` file for SourceForge and upload it with the
+ following script (with updated `$VERSION` and `$SOURCEFORGE_USER`
+ variables).
#!/bin/sh
- VERSION=2.5.1
+ VERSION=2.10.4
SOURCEFORGE_USER=wlemb
#####################################################################
@@ -170,22 +171,22 @@ How to prepare a new release
# EOF
-. On SourceForge, tag the just uploaded `ftXXX.zip' and
- `freetype-XXX.tar.xz' files as the default files to download for
- `Windows' and `Others', respectively.
+. On SourceForge, tag the just uploaded `ftXXX.zip` and
+ `freetype-XXX.tar.xz` files as the default files to download for
+ 'Windows' and 'Others', respectively.
-. Copy the reference files (generated by `make dist') to
+. Copy the reference files (generated by `make dist`) to
<freetype-web git repository>/freetype2/docs/reference
-. Update the `freetype-web' repository. `git push' then automatically
- triggers an update of the public web pages within ten minutes, due
- to a cron script (on wl@freedesktop.org) that rsyncs with
+. Update the 'freetype-web' repository. `git push` then automatically
+ triggers an update of the public web pages within ten minutes due to
+ a cron script (on 'wl@freedesktop.org') that rsyncs with
freedesktop.org://srv/freetype.freedesktop.org/www
-. Announce new release on freetype-announce@nongnu.org and to relevant
- newsgroups.
+. Announce new release on 'freetype-announce@nongnu.org' and to
+ relevant newsgroups.
----------------------------------------------------------------------