pixman: Branch 'master' - 3 commits

[GitLab Mirror]

 Makefile.am  |    4 ++--
 configure.ac |    2 +-
 meson.build  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e7058fe49d6b8d0696f6c056458b7abb091f506a
Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun Apr 7 13:43:57 2019 -0700

    Makefile.am: Update download links
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/Makefile.am b/Makefile.am
index a680665..212d0a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,8 @@ USERNAME=$$USER
 RELEASE_OR_SNAPSHOT = $$(if test "x$(PIXMAN_VERSION_MINOR)" = "x$$(echo "$(PIXMAN_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
 RELEASE_CAIRO_HOST =	$(USERNAME)@cairographics.org
 RELEASE_CAIRO_DIR =	/srv/cairo.freedesktop.org/www/$(RELEASE_OR_SNAPSHOT)s
-RELEASE_CAIRO_URL = 	http://cairographics.org/$(RELEASE_OR_SNAPSHOT)s
-RELEASE_XORG_URL =	http://xorg.freedesktop.org/archive/individual/lib
+RELEASE_CAIRO_URL = 	https://cairographics.org/$(RELEASE_OR_SNAPSHOT)s
+RELEASE_XORG_URL =	https://www.x.org/releases/individual/lib
 RELEASE_XORG_HOST =	$(USERNAME)@xorg.freedesktop.org
 RELEASE_XORG_DIR =	/srv/xorg.freedesktop.org/archive/individual/lib
 RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org, xorg-announce at lists.freedesktop.org, pixman at lists.freedesktop.org
commit 8888e752bf161d60e2015c912d09e68a11a9eafa
Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun Apr 7 13:34:44 2019 -0700

    Post-release version bump to 0.38.3
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index a29b3dc..d057d59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 38)
-m4_define([pixman_micro], 2)
+m4_define([pixman_micro], 3)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/meson.build b/meson.build
index 71db1ea..596c1e2 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
 project(
   'pixman',
   ['c'],
-  version : '0.38.2',
+  version : '0.38.3',
   license : 'MIT',
   meson_version : '>= 0.47.2',
   default_options : ['buildtype=debugoptimized'],
commit a7ffb3e6172958fa893e7c0d277b2baaaceabbdc
Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun Apr 7 13:13:30 2019 -0700

    Pre-release version bump to 0.38.2
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 6efc6c0..a29b3dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 38)
-m4_define([pixman_micro], 0)
+m4_define([pixman_micro], 2)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/meson.build b/meson.build
index 8870b9e..71db1ea 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
 project(
   'pixman',
   ['c'],
-  version : '0.38.0',
+  version : '0.38.2',
   license : 'MIT',
   meson_version : '>= 0.47.2',
   default_options : ['buildtype=debugoptimized'],