xserver: Branch 'server-1.20-branch' - 2 commits

[GitLab Mirror]

 configure.ac |    8 ++++----
 meson.build  |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b88ad0b342c954109bfd4b1d32c04ff55545cb0f
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Jul 8 12:15:21 2021 -0700

    xserver 1.20.12
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index a166d83f7..ae4443748 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.20.11, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2021-04-13"
-RELEASE_NAME="Arroz con Pollo"
+AC_INIT([xorg-server], 1.20.12, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-07-08"
+RELEASE_NAME="Lemon Pepper Chicken"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-xz])
diff --git a/meson.build b/meson.build
index b3ef00b68..c74135aff 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.20.11',
+        version: '1.20.12',
         meson_version: '>= 0.42.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
commit 8dea50223b9b9495aa2e2f4e6aef2a842c0e0a2f
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Jul 8 12:15:13 2021 -0700

    Build xz tarballs instead of bzip2
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 91fc5fdbf..a166d83f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ RELEASE_DATE="2021-04-13"
 RELEASE_NAME="Arroz con Pollo"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 AC_USE_SYSTEM_EXTENSIONS
 
 # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS