r46189 - in /desktop/unstable/pango1.0/debian: changelog patches/configure-without-libthai.patch patches/series rules

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Sep 28 14:22:29 2015
New Revision: 46189

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46189
Log:
* Add debian/patches/configure-without-libthai.patch
  - make it possible to disable checking for libthai
* debian/rules: configure udeb build --without-libthai
  - this avoids the udeb picking up a dependency on libthai which has
    no udeb. (Closes: #800356)

Added:
    desktop/unstable/pango1.0/debian/patches/configure-without-libthai.patch
Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/patches/series
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=46189&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog	[utf-8] Mon Sep 28 14:22:29 2015
@@ -1,3 +1,13 @@
+pango1.0 (1.38.0-3) unstable; urgency=medium
+
+  * Add debian/patches/configure-without-libthai.patch
+    - make it possible to disable checking for libthai
+  * debian/rules: configure udeb build --without-libthai
+    - this avoids the udeb picking up a dependency on libthai which has
+      no udeb. (Closes: #800356)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 28 Sep 2015 16:01:38 +0200
+
 pango1.0 (1.38.0-2) unstable; urgency=medium
 
   * Add debian/patches/disable-layout-test.patch

Added: desktop/unstable/pango1.0/debian/patches/configure-without-libthai.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/configure-without-libthai.patch?rev=46189&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/configure-without-libthai.patch	(added)
+++ desktop/unstable/pango1.0/debian/patches/configure-without-libthai.patch	[utf-8] Mon Sep 28 14:22:29 2015
@@ -0,0 +1,34 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Add configure flag --without-libthai
+
+Make it possible to avoid enabling libthai which is needed
+for udeb builds, since libthai has no udeb (now).
+Maybe libthai should grow an udeb and this patch could
+be dropped....
+
+Bug-Debian: http://bugs.debian.org/800356
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -459,6 +459,12 @@
+ #
+ # Checks for LibThai
+ #
++AC_ARG_WITH([libthai],
++              AC_HELP_STRING([--without-libthai],
++                             [Ignore presence of libthai and disable it]))
++
++if test "x$with_libthai" != "xno"; then
++
+ LIBTHAI_REQUIRED_VERSION=0.1.9
+ have_libthai=false
+ PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=true, :)
+@@ -466,6 +472,8 @@
+ 	AC_DEFINE(HAVE_LIBTHAI, 1, [Whether libthai is available])
+ fi
+ 
++fi
++
+ #
+ # Checks for GObject Introspection
+ #

Modified: desktop/unstable/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/series?rev=46189&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/series	[utf-8] Mon Sep 28 14:22:29 2015
@@ -1,2 +1,3 @@
+configure-without-libthai.patch
 tests-needs-asserts.patch
 disable-layout-test.patch

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=46189&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/rules	[utf-8] Mon Sep 28 14:22:29 2015
@@ -51,6 +51,7 @@
 
 DEB_CONFIGURE_FLAGS_udeb = \
 		--libdir=/$(LIBDIR_UDEB) \
+		--without-libthai \
 		--disable-debug
 
 # Get failing tests' stdout/err so we have some information when a build fails