diff -Nru pango1.0-1.36.2/aclocal.m4 pango1.0-1.36.3/aclocal.m4 --- pango1.0-1.36.2/aclocal.m4 2014-02-04 19:10:31.000000000 +0000 +++ pango1.0-1.36.3/aclocal.m4 2014-03-18 01:02:16.000000000 +0000 @@ -9961,7 +9961,7 @@ dnl -*- mode: autoconf -*- -# serial 1 +# serial 2 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) @@ -9971,6 +9971,17 @@ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + dnl check for tools we added during development dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that dnl may not be writable by the user. Currently, automake requires that the @@ -9994,22 +10005,22 @@ [use gtk-doc to build documentation [[default=no]]]),, [enable_gtk_doc=no]) - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - fi - AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + dnl enable/disable output formats AC_ARG_ENABLE([gtk-doc-html], AS_HELP_STRING([--enable-gtk-doc-html], @@ -10029,6 +10040,7 @@ fi AC_SUBST([AM_DEFAULT_VERBOSITY]) + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) diff -Nru pango1.0-1.36.2/build/Makefile-msvcproj.am pango1.0-1.36.3/build/Makefile-msvcproj.am --- pango1.0-1.36.2/build/Makefile-msvcproj.am 2013-12-02 12:01:45.000000000 +0000 +++ pango1.0-1.36.3/build/Makefile-msvcproj.am 2014-03-06 04:33:55.000000000 +0000 @@ -202,12 +202,14 @@ # (Seperator) -$(RM) $@ $(CPP) -I$(top_builddir)/build -P - <$(top_srcdir)/build/win32/vs10/pangocairo.vcxprojin >$@ + -$(RM) $(top_builddir)/build/libpangocairo.vs10.sourcefiles $(top_builddir)/build/win32/vs10/pangocairo.vcxproj.filters: \ $(top_srcdir)/build/win32/vs10/pangocairo.vcxproj.filtersin $(top_builddir)/build/libpangocairo.vs10.sourcefiles.filters # (Seperator) -$(RM) $@ $(CPP) -I$(top_builddir)/build -P - <$(top_srcdir)/build/win32/vs10/pangocairo.vcxproj.filtersin >$@ + -$(RM) $(top_builddir)/build/libpangocairo.vs10.sourcefiles.filters ############################################## # Now fill in the header "installation" list # diff -Nru pango1.0-1.36.2/build/pango-introspection-msvc.mak pango1.0-1.36.3/build/pango-introspection-msvc.mak --- pango1.0-1.36.2/build/pango-introspection-msvc.mak 2014-01-13 12:43:43.000000000 +0000 +++ pango1.0-1.36.3/build/pango-introspection-msvc.mak 2014-03-06 04:33:55.000000000 +0000 @@ -1,14 +1,5 @@ # NMake Makefile to build Introspection Files for Pango -# Change or pass in as variable/env var if needed -DLLPREFIX = -DLLSUFFIX = -1-vs$(VSVER) -PANGO_DLLNAME = $(DLLPREFIX)pango$(DLLSUFFIX) -PANGOFT_DLLNAME = $(DLLPREFIX)pangoft2$(DLLSUFFIX) -PANGOCAIRO_DLLNAME = $(DLLPREFIX)pangocairo$(DLLSUFFIX) - -# Please do not change anything after this line - !include testsrules_msvc.mak APIVERSION = 1.0 @@ -21,7 +12,7 @@ !if "$(BUILD_PANGOFT2_INTROSPECTION)" == "1" # Build of PangoFT2 introspection files is not currently supported. -PangoFT2LIBS = --library=$(PANGO_DLLNAME) +PangoFT2LIBS = --library=pangoft2-1.0 PangoFT2GIR = --include-uninstalled=./PangoFT2-$(APIVERSION) all: setbuildenv Pango-$(APIVERSION).gir Pango-$(APIVERSION).typelib PangoFT2-$(APIVERSION).gir PangoFT2-$(APIVERSION).typelib PangoCairo-$(APIVERSION).gir PangoCairo-$(APIVERSION).typelib @@ -53,7 +44,7 @@ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \ --namespace=Pango --nsversion=$(APIVERSION) \ --include=GObject-2.0 --include=cairo-1.0 \ - --no-libtool --pkg=gobject-2.0 --pkg=cairo --pkg=glib-2.0 --library=$(PANGO_DLLNAME) \ + --no-libtool --pkg=gobject-2.0 --pkg=cairo --pkg=glib-2.0 --library=pango-1.0 \ --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) \ --pkg-export pango --warn-all --c-include "pango/pango.h" \ -DG_LOG_DOMAIN=\"Pango\" -DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \ @@ -66,7 +57,7 @@ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include -I$(BASEDIR)\include \ --namespace=PangoCairo --nsversion=$(APIVERSION) \ --include=GObject-2.0 --include=cairo-1.0 \ - --no-libtool --pkg=gobject-2.0 --pkg=cairo --library=$(PANGOCAIRO_DLLNAME) $(PangoFT2LIBS) --library=$(PANGO_DLLNAME) \ + --no-libtool --pkg=gobject-2.0 --pkg=cairo --library=pangocairo-1.0 $(PangoFT2LIBS) --library=pango-1.0 \ --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=. \ --pkg-export pangocairo --warn-all $(PangoFT2GIR) --include-uninstalled=./Pango-$(APIVERSION).gir \ --c-include "pango/pangocairo.h" \ diff -Nru pango1.0-1.36.2/ChangeLog pango1.0-1.36.3/ChangeLog --- pango1.0-1.36.2/ChangeLog 2014-02-04 19:42:41.000000000 +0000 +++ pango1.0-1.36.3/ChangeLog 2014-03-18 01:15:44.000000000 +0000 @@ -1,3 +1,78 @@ +commit f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd +Author: Matthias Clasen +Date: Mon Mar 17 20:47:36 2014 -0400 + + Update the pango_color_parse docs + + https://bugzilla.gnome.org/show_bug.cgi?id=711061 + + pango/pango-color.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 27693187e309f7e7fbb2f75a709e71dd4119428e +Author: Chun-wei Fan +Date: Tue Feb 25 13:16:51 2014 +0800 + + MSVC Builds: Update Introspection Build Process + + GObject-Introspection was recently changed to support acquiring the + name of + the DLL from a library (.lib, etc) that was passed into g-ir-scanner + on + Windows, like the *nix builds, instead of directly passing in the + name of + the DLL. + + This updates the introspection build process, so that introspection + files + for Pango can continue to be properly built. + + build/pango-introspection-msvc.mak | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +commit 05e4927ab0b7b4ead30c47c26e881711a1724d63 +Author: Chun-wei Fan +Date: Fri Feb 21 13:38:04 2014 +0800 + + build/Makefile-msvcproj.am: Remove Generated Intermediate Files + + Delete libpangocairo.vs10.sourcefiles and + libpangocairo.vs10.sourcefiles.filters once we are done with them, + so to + fix make distcheck + + build/Makefile-msvcproj.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 44d90b5771bf08e0e900596eb3a4db78c10d7f23 +Author: Akira TAGOH +Date: Wed Feb 12 18:39:27 2014 +0900 + + Avoid a crash when FT_Face is null + + https://bugzilla.gnome.org/show_bug.cgi?id=724006 + + pango/pango-ot-info.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit d8e2dc00c8d28e1bf8b443208497ce1ab25e0af4 +Author: Behdad Esfahbod +Date: Tue Feb 11 12:37:33 2014 -0500 + + Fix cairotwisted curve_length() + + examples/cairotwisted.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07de8494412e6d735c5fa04aa8bdf1632582d098 +Author: Iain Lane +Date: Fri Feb 7 13:59:14 2014 +0000 + + Fix tests for builddir != srcdir by setting G_TEST_{SRC,BUILD}DIR + + tests/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + commit f324a942455cd68fc4a97327a61ed6492f1f1f40 Author: Matthias Clasen Date: Tue Feb 4 14:09:42 2014 -0500 diff -Nru pango1.0-1.36.2/config.h.win32 pango1.0-1.36.3/config.h.win32 --- pango1.0-1.36.2/config.h.win32 2014-02-04 19:10:58.000000000 +0000 +++ pango1.0-1.36.3/config.h.win32 2014-03-18 01:02:44.000000000 +0000 @@ -118,7 +118,7 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.36.2" +#define PACKAGE_STRING "pango 1.36.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" @@ -127,19 +127,19 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.36.2" +#define PACKAGE_VERSION "1.36.3" /* PANGO binary age */ -#define PANGO_BINARY_AGE 3602 +#define PANGO_BINARY_AGE 3603 /* PANGO interface age */ -#define PANGO_INTERFACE_AGE 2 +#define PANGO_INTERFACE_AGE 3 /* PANGO major version */ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 2 +#define PANGO_VERSION_MICRO 3 /* PANGO minor version */ #define PANGO_VERSION_MINOR 36 @@ -151,4 +151,4 @@ /* #undef USE_LA_MODULES */ /* Version number of package */ -#define VERSION "1.36.2" +#define VERSION "1.36.3" diff -Nru pango1.0-1.36.2/configure pango1.0-1.36.3/configure --- pango1.0-1.36.2/configure 2014-02-04 19:10:32.000000000 +0000 +++ pango1.0-1.36.3/configure 2014-03-18 01:02:17.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pango 1.36.2. +# Generated by GNU Autoconf 2.69 for pango 1.36.3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='pango' PACKAGE_TARNAME='pango' -PACKAGE_VERSION='1.36.2' -PACKAGE_STRING='pango 1.36.2' +PACKAGE_VERSION='1.36.3' +PACKAGE_STRING='pango 1.36.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pango' PACKAGE_URL='' @@ -664,6 +664,8 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE GTKDOC_DEPS_LIBS GTKDOC_DEPS_CFLAGS HTML_DIR @@ -1503,7 +1505,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 pango 1.36.2 to adapt to many kinds of systems. +\`configure' configures pango 1.36.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1573,7 +1575,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pango 1.36.2:";; + short | recursive ) echo "Configuration of pango 1.36.3:";; esac cat <<\_ACEOF @@ -1739,7 +1741,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pango configure 1.36.2 +pango configure 1.36.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2229,7 +2231,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pango $as_me 1.36.2, which was +It was created by pango $as_me 1.36.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3095,7 +3097,7 @@ # Define the identity of the package. PACKAGE='pango' - VERSION='1.36.2' + VERSION='1.36.3' cat >>confdefs.h <<_ACEOF @@ -3232,11 +3234,11 @@ PANGO_VERSION_MAJOR=1 PANGO_VERSION_MINOR=36 -PANGO_VERSION_MICRO=2 -PANGO_VERSION=1.36.2 +PANGO_VERSION_MICRO=3 +PANGO_VERSION=1.36.3 PANGO_API_VERSION=1.0 -PANGO_INTERFACE_AGE=2 -PANGO_BINARY_AGE=3602 +PANGO_INTERFACE_AGE=3 +PANGO_BINARY_AGE=3603 PANGO_MODULE_VERSION=1.8.0 @@ -3252,10 +3254,10 @@ $as_echo "#define MODULE_VERSION \"1.8.0\"" >>confdefs.h -$as_echo "#define PANGO_BINARY_AGE 3602" >>confdefs.h +$as_echo "#define PANGO_BINARY_AGE 3603" >>confdefs.h -$as_echo "#define PANGO_INTERFACE_AGE 2" >>confdefs.h +$as_echo "#define PANGO_INTERFACE_AGE 3" >>confdefs.h $as_echo "#define PANGO_VERSION_MAJOR 1" >>confdefs.h @@ -3264,13 +3266,13 @@ $as_echo "#define PANGO_VERSION_MINOR 36" >>confdefs.h -$as_echo "#define PANGO_VERSION_MICRO 2" >>confdefs.h +$as_echo "#define PANGO_VERSION_MICRO 3" >>confdefs.h -VERSION_INFO="3600:2:3600" +VERSION_INFO="3600:3:3600" PANGO_CURRENT_MINUS_AGE=0 @@ -16414,7 +16416,7 @@ Report bugs to ." lt_cl_version="\ -pango config.lt 1.36.2 +pango config.lt 1.36.3 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -19276,6 +19278,31 @@ + gtk_doc_requires="gtk-doc >= 1.15" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -19459,18 +19486,19 @@ fi - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.15\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.15") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -else - as_fn_error $? "You need to have gtk-doc >= 1.15 installed to build $PACKAGE_NAME" "$LINENO" 5 -fi - if test "x$PACKAGE_NAME" != "xglib"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 @@ -19542,14 +19570,8 @@ $as_echo "yes" >&6; } fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : enableval=$enable_gtk_doc_html; @@ -19574,6 +19596,14 @@ fi + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' @@ -20421,6 +20451,10 @@ as_fn_error $? "conditional \"DYNAMIC_THAI_LANG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20854,7 +20888,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pango $as_me 1.36.2, which was +This file was extended by pango $as_me 1.36.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20920,7 +20954,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pango config.status 1.36.2 +pango config.status 1.36.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru pango1.0-1.36.2/configure.ac pango1.0-1.36.3/configure.ac --- pango1.0-1.36.2/configure.ac 2014-02-04 19:09:38.000000000 +0000 +++ pango1.0-1.36.3/configure.ac 2014-03-18 00:59:32.000000000 +0000 @@ -22,7 +22,7 @@ dnl The triplet m4_define([pango_version_major], [1]) m4_define([pango_version_minor], [36]) -m4_define([pango_version_micro], [2]) +m4_define([pango_version_micro], [3]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) diff -Nru pango1.0-1.36.2/debian/changelog pango1.0-1.36.3/debian/changelog --- pango1.0-1.36.2/debian/changelog 2014-03-20 14:11:21.000000000 +0000 +++ pango1.0-1.36.3/debian/changelog 2014-03-20 18:25:11.000000000 +0000 @@ -1,3 +1,25 @@ +pango1.0 (1.36.3-1ubuntu1) trusty; urgency=medium + + * Merge with Debian, remaining change: + - Add a versioned conflicts on old versions of plymouth whose initramfs + hook tries to find pango modules. The Debian version of this change + uses Breaks which is insufficient, and doesn't match the version of + the plymouth package that supports the new path in Ubuntu. + + -- Iain Lane Thu, 20 Mar 2014 18:19:30 +0000 + +pango1.0 (1.36.3-1) unstable; urgency=medium + + * Add xauth test-dep, needed for xvfb-run + * New upstream release + - Fix builddir != srdir builds + + Drop 0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch, + which was a cherry-pick of this fix. + - Avoid a crash when FT_Face is NULL + - Update pango_color_parse docs + + -- Iain Lane Thu, 20 Mar 2014 18:01:45 +0000 + pango1.0 (1.36.2-2ubuntu1) trusty; urgency=medium * Resynchronise on Debian, remaining change: @@ -1906,4 +1928,3 @@ * update-pango-modules: provides wrapper script for updating pango modules. -- Akira TAGOH Tue, 12 Mar 2002 17:53:38 +0900 - diff -Nru pango1.0-1.36.2/debian/control pango1.0-1.36.3/debian/control --- pango1.0-1.36.2/debian/control 2014-03-20 14:11:21.000000000 +0000 +++ pango1.0-1.36.3/debian/control 2014-03-20 18:25:13.000000000 +0000 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Emilio Pozuelo Monfort , Martin Pitt , Michael Biebl +Uploaders: Emilio Pozuelo Monfort , Michael Biebl Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), diff -Nru pango1.0-1.36.2/debian/patches/0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch pango1.0-1.36.3/debian/patches/0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch --- pango1.0-1.36.2/debian/patches/0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch 2014-02-11 15:07:54.000000000 +0000 +++ pango1.0-1.36.3/debian/patches/0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 94356298f55e10924e7e5431b754e24eea9c444e Mon Sep 17 00:00:00 2001 -From: Iain Lane -Date: Fri, 7 Feb 2014 13:59:14 +0000 -Subject: [PATCH] Fix tests for builddir != srcdir by setting - G_TEST_{SRC,BUILD}DIR - ---- - tests/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index bcd60ae..4591448 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -39,6 +39,8 @@ endif - - TESTS_ENVIRONMENT = \ - srcdir=$(srcdir) \ -+ G_TEST_SRCDIR=$(abs_srcdir) \ -+ G_TEST_BUILDDIR=$(abs_builddir) \ - PANGO_RC_FILE=./pangorc - - check_PROGRAMS = testboundaries testboundaries_ucd testcolor testscript --- -1.9.rc1 - diff -Nru pango1.0-1.36.2/debian/patches/series pango1.0-1.36.3/debian/patches/series --- pango1.0-1.36.2/debian/patches/series 2014-02-11 15:07:54.000000000 +0000 +++ pango1.0-1.36.3/debian/patches/series 2014-03-20 17:59:24.000000000 +0000 @@ -1,4 +1,3 @@ -0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch 10_scan-module-files-in-dirs.patch 11_module-files-append-module-files-d.patch 14_makefile_modules_ft2_link_harfbuzz.patch diff -Nru pango1.0-1.36.2/debian/tests/control pango1.0-1.36.3/debian/tests/control --- pango1.0-1.36.2/debian/tests/control 2014-02-11 15:07:54.000000000 +0000 +++ pango1.0-1.36.3/debian/tests/control 2014-03-05 11:50:06.000000000 +0000 @@ -2,4 +2,4 @@ Depends: build-essential, libpango1.0-dev, pkg-config Tests: installed-tests -Depends: pango1.0-tests, dbus-x11, xvfb, gnome-desktop-testing +Depends: pango1.0-tests, dbus-x11, xauth, xvfb, gnome-desktop-testing diff -Nru pango1.0-1.36.2/docs/html/annotation-glossary.html pango1.0-1.36.3/docs/html/annotation-glossary.html --- pango1.0-1.36.2/docs/html/annotation-glossary.html 2014-02-04 19:42:46.000000000 +0000 +++ pango1.0-1.36.3/docs/html/annotation-glossary.html 2014-03-18 01:15:48.000000000 +0000 @@ -8,26 +8,26 @@ - + - -