[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |    2 +-
 configure.ac   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d28681af2ace90e80bed440d126e98f76cd086f3
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Apr 15 09:03:57 2019 +0000

    Distribute archive in xz instead of bz2
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/151

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a82cec4..a8e7dcf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ shared-build:
     name: fontconfig-$CI_COMMIT_SHA-$CI_JOB_ID
     when: always
     paths:
-      - build-*/fontconfig-*.tar.bz2
+      - build-*/fontconfig-*.tar.*
       - build-*/fontconfig*/_build/sub/*.log
       - build-*/fontconfig*/_build/sub/test/*.log
       - build-*/fontconfig*/_build/sub/test/*.trs
diff --git a/configure.ac b/configure.ac
index ff5f2c9..9574715 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ 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
 AC_INIT([fontconfig], [2.13.1], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
-AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 parallel-tests dist-xz])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl ==========================================================================