diff -Nru pixman-0.33.6/ChangeLog pixman-0.34.0/ChangeLog --- pixman-0.33.6/ChangeLog 2016-11-04 09:07:26.000000000 +0000 +++ pixman-0.34.0/ChangeLog 2016-11-04 09:07:26.000000000 +0000 @@ -1,3 +1,19 @@ +commit 1727aa4ab60a594cbb1cc1bdaa270b7dfad21f06 +Author: Oded Gabbay +Date: Sun Jan 31 16:39:23 2016 +0200 + + Pre-release version bump to 0.34.0 + + Signed-off-by: Oded Gabbay + +commit 0e72e780865196e4edd720148d9a99704cd114b5 +Author: Oded Gabbay +Date: Tue Dec 22 15:55:32 2015 +0200 + + Post-release version bump to 0.33.7 + + Signed-off-by: Oded Gabbay + commit 65f35270e4531621bd2e1ee5cdb31c56c3051c43 Author: Oded Gabbay Date: Tue Dec 22 15:30:10 2015 +0200 diff -Nru pixman-0.33.6/configure pixman-0.34.0/configure --- pixman-0.33.6/configure 2015-12-22 13:37:31.000000000 +0000 +++ pixman-0.34.0/configure 2016-01-31 14:31:06.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pixman 0.33.6. +# Generated by GNU Autoconf 2.69 for pixman 0.34.0. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='pixman' PACKAGE_TARNAME='pixman' -PACKAGE_VERSION='0.33.6' -PACKAGE_STRING='pixman 0.33.6' +PACKAGE_VERSION='0.34.0' +PACKAGE_STRING='pixman 0.34.0' PACKAGE_BUGREPORT='pixman@lists.freedesktop.org' PACKAGE_URL='' @@ -1393,7 +1393,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pixman 0.33.6 to adapt to many kinds of systems. +\`configure' configures pixman 0.34.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1463,7 +1463,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pixman 0.33.6:";; + short | recursive ) echo "Configuration of pixman 0.34.0:";; esac cat <<\_ACEOF @@ -1603,7 +1603,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pixman configure 0.33.6 +pixman configure 0.34.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2201,7 +2201,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pixman $as_me 0.33.6, which was +It was created by pixman $as_me 0.34.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3064,7 +3064,7 @@ # Define the identity of the package. PACKAGE='pixman' - VERSION='0.33.6' + VERSION='0.34.0' cat >>confdefs.h <<_ACEOF @@ -12844,13 +12844,13 @@ -LT_VERSION_INFO="33:6:33" +LT_VERSION_INFO="34:0:34" PIXMAN_VERSION_MAJOR=0 -PIXMAN_VERSION_MINOR=33 +PIXMAN_VERSION_MINOR=34 -PIXMAN_VERSION_MICRO=6 +PIXMAN_VERSION_MICRO=0 @@ -15897,7 +15897,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pixman $as_me 0.33.6, which was +This file was extended by pixman $as_me 0.34.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15963,7 +15963,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pixman config.status 0.33.6 +pixman config.status 0.34.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17656,24 +17656,3 @@ - echo - echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" - echo - echo " Thanks for testing this development snapshot of pixman. Please" - echo " report any problems you find, either by sending email to " - echo - echo " pixman@lists.freedesktop.org" - echo - echo " or by filing a bug at " - echo - echo " https://bugs.freedesktop.org/enter_bug.cgi?product=pixman " - echo - echo " If you are looking for a stable release of pixman, please note " - echo " that stable releases have _even_ minor version numbers. Ie., " - echo " pixman-0.32.x are stable releases, whereas pixman-$PIXMAN_VERSION_MAJOR.$PIXMAN_VERSION_MINOR.$PIXMAN_VERSION_MICRO is a " - echo " development snapshot that may contain bugs and experimental " - echo " features. " - echo - echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" - echo - diff -Nru pixman-0.33.6/configure.ac pixman-0.34.0/configure.ac --- pixman-0.33.6/configure.ac 2015-12-22 13:29:33.000000000 +0000 +++ pixman-0.34.0/configure.ac 2016-01-31 14:30:05.000000000 +0000 @@ -53,8 +53,8 @@ # m4_define([pixman_major], 0) -m4_define([pixman_minor], 33) -m4_define([pixman_micro], 6) +m4_define([pixman_minor], 34) +m4_define([pixman_micro], 0) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) diff -Nru pixman-0.33.6/debian/changelog pixman-0.34.0/debian/changelog --- pixman-0.33.6/debian/changelog 2016-11-04 09:07:26.000000000 +0000 +++ pixman-0.34.0/debian/changelog 2016-11-04 09:07:26.000000000 +0000 @@ -1,3 +1,11 @@ +pixman (0.34.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release (no actual changes) + * Use https URL in debian/watch. + + -- Julien Cristau Sat, 24 Sep 2016 13:25:16 +0200 + pixman (0.33.6-1) unstable; urgency=medium * New upstream release candidate. diff -Nru pixman-0.33.6/debian/watch pixman-0.34.0/debian/watch --- pixman-0.33.6/debian/watch 2016-11-04 09:07:26.000000000 +0000 +++ pixman-0.34.0/debian/watch 2016-11-04 09:07:26.000000000 +0000 @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/pixman version=3 -http://xorg.freedesktop.org/releases/individual/lib/ pixman-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/lib/ pixman-(.*)\.tar\.gz diff -Nru pixman-0.33.6/pixman/pixman-version.h pixman-0.34.0/pixman/pixman-version.h --- pixman-0.33.6/pixman/pixman-version.h 2015-12-22 13:38:27.000000000 +0000 +++ pixman-0.34.0/pixman/pixman-version.h 2016-01-31 14:31:20.000000000 +0000 @@ -32,10 +32,10 @@ #endif #define PIXMAN_VERSION_MAJOR 0 -#define PIXMAN_VERSION_MINOR 33 -#define PIXMAN_VERSION_MICRO 6 +#define PIXMAN_VERSION_MINOR 34 +#define PIXMAN_VERSION_MICRO 0 -#define PIXMAN_VERSION_STRING "0.33.6" +#define PIXMAN_VERSION_STRING "0.34.0" #define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \ ((major) * 10000) \