diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-31 10:17:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-31 10:17:14 +0200 |
| commit | 83da3ad0287bc51cd16ee6911fe73dc98ebe000b (patch) | |
| tree | 48d48590a0b0a3770006aeda8ec2b2a45054d1f1 /fontconfig | |
| parent | 00e30605ffc7ac3cf1a091ff2c1f46cfefb780d7 (diff) | |
| parent | bd27b3d008b0abf9ae2edcb127302728808533e4 (diff) | |
| download | vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.tar.gz vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.tar.bz2 vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/README | 8 | ||||
| -rw-r--r-- | fontconfig/conf.d/Makefile.am | 2 | ||||
| -rw-r--r-- | fontconfig/configure.ac | 2 | ||||
| -rw-r--r-- | fontconfig/fontconfig.pc.in | 2 | ||||
| -rw-r--r-- | fontconfig/fontconfig/fontconfig.h | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/fontconfig/README b/fontconfig/README index 624ffa4ce..02f4f27d6 100644 --- a/fontconfig/README +++ b/fontconfig/README @@ -1,12 +1,18 @@ Fontconfig Font configuration and customization library - Version 2.10.0 + Version 2.10.1 2012-03-11 Check INSTALL for compilation and installation instructions. Report bugs to https://bugs.freedesktop.org in the fontconfig module. +2.10.1 + +Akira TAGOH (2): + Fix a typo in fontconfig.pc + Install config files first + 2.10.0 Akira TAGOH (5): diff --git a/fontconfig/conf.d/Makefile.am b/fontconfig/conf.d/Makefile.am index 7f14920d0..0f6f59c60 100644 --- a/fontconfig/conf.d/Makefile.am +++ b/fontconfig/conf.d/Makefile.am @@ -76,7 +76,7 @@ template_DATA = \ 80-delicious.conf \ 90-synthetic.conf -install-data-local: +install-data-hook: mkdir -p $(DESTDIR)$(configdir) @(echo cd $(DESTDIR)$(configdir); \ cd $(DESTDIR)$(configdir); \ diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index 8aa3d6ba7..4de2d089c 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -34,7 +34,7 @@ dnl This is the package version number, not the shared library dnl version. This same version number must appear in fontconfig/fontconfig.h dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl not possible to extract the version number here from fontconfig.h -AM_INIT_AUTOMAKE(fontconfig, 2.10.0) +AM_INIT_AUTOMAKE(fontconfig, 2.10.1) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) dnl libtool versioning diff --git a/fontconfig/fontconfig.pc.in b/fontconfig/fontconfig.pc.in index 7d846a533..9ef2c273f 100644 --- a/fontconfig/fontconfig.pc.in +++ b/fontconfig/fontconfig.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ sysconfdir=@sysconfdir@ localstatedir=@localstatedir@ PACKAGE=@PACKAGE@ -confdir=@confdir@ +confdir=@baseconfigdir@ cachedir=@fc_cachedir@ Name: Fontconfig diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h index 41af47074..d3aeaf359 100644 --- a/fontconfig/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig/fontconfig.h @@ -52,7 +52,7 @@ typedef int FcBool; #define FC_MAJOR 2 #define FC_MINOR 10 -#define FC_REVISION 0 +#define FC_REVISION 1 #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION)) |