r28615 - in /desktop/unstable/pango1.0/debian: changelog control control.in patches/13-tests-link-libraries.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jun 23 16:10:57 2011
New Revision: 28615

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28615
Log:
* Link test suite against all necessary libraries.
  - Add debian/patches/13-tests-link-libraries.patch.
  - Add Build-Depends on dh-autoreconf and run it during build.

Added:
    desktop/unstable/pango1.0/debian/patches/13-tests-link-libraries.patch
Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/control
    desktop/unstable/pango1.0/debian/control.in
    desktop/unstable/pango1.0/debian/patches/series

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=28615&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Thu Jun 23 16:10:57 2011
@@ -14,6 +14,9 @@
     - Remove .gir files which are shipped in the dist tarball. Those files
       were generated for gir format 1.1 and cause build failures when
       srcdir != builddir.
+  * Link test suite against all necessary libraries.
+    - Add debian/patches/13-tests-link-libraries.patch.
+    - Add Build-Depends on dh-autoreconf and run it during build.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 22 Jun 2011 23:57:52 +0200
 

Modified: desktop/unstable/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control?rev=28615&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control [utf-8] Thu Jun 23 16:10:57 2011
@@ -7,6 +7,7 @@
                cdbs (>= 0.4.90~),
                gnome-pkg-tools (>= 0.11),
                autotools-dev,
+               dh-autoreconf,
                perl,
                libfreetype6-dev (>= 2.1.7),
                libx11-dev (>= 2:1.3.3-2),

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=28615&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in [utf-8] Thu Jun 23 16:10:57 2011
@@ -7,6 +7,7 @@
                cdbs (>= 0.4.90~),
                gnome-pkg-tools (>= 0.11),
                autotools-dev,
+               dh-autoreconf,
                perl,
                libfreetype6-dev (>= 2.1.7),
                libx11-dev (>= 2:1.3.3-2),

Added: desktop/unstable/pango1.0/debian/patches/13-tests-link-libraries.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/13-tests-link-libraries.patch?rev=28615&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/13-tests-link-libraries.patch (added)
+++ desktop/unstable/pango1.0/debian/patches/13-tests-link-libraries.patch [utf-8] Thu Jun 23 16:10:57 2011
@@ -1,0 +1,33 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=653242
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 93fdf78..fa3ed12 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -52,15 +52,18 @@ if HAVE_FREETYPE
+ check_PROGRAMS += test-ot-tags
+ endif
+ 
++TEST_PANGO_LIBS = $(GLIB_LIBS) ../pango/libpango-$(PANGO_API_VERSION).la
++TEST_PANGOFT2_LIBS = $(TEST_PANGO_LIBS) ../pango/libpangoft2-$(PANGO_API_VERSION).la
++TEST_PANGOCAIRO_LIBS = $(TEST_PANGO_LIBS) ../pango/libpangocairo-$(PANGO_API_VERSION).la
++
+ gen_all_unicode_LDADD = $(GLIB_LIBS)
+-testboundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
+-testboundaries_ucd_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
+-testcolor_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
+-testiter_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la ../pango/libpangocairo-$(PANGO_API_VERSION).la 
+-testscript_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
+-test_ot_tags_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la ../pango/libpangoft2-$(PANGO_API_VERSION).la 
+-
+-dump_boundaries_LDADD = $(GLIB_LIBS) ../pango/libpango-$(PANGO_API_VERSION).la
++testboundaries_LDADD = $(TEST_PANGO_LIBS)
++testboundaries_ucd_LDADD = $(TEST_PANGO_LIBS)
++testcolor_LDADD = $(TEST_PANGO_LIBS)
++testiter_LDADD = $(TEST_PANGOCAIRO_LIBS)
++testscript_LDADD = $(TEST_PANGO_LIBS)
++test_ot_tags_LDADD = $(TEST_PANGOFT2_LIBS)
++dump_boundaries_LDADD = $(TEST_PANGO_LIBS)
+ 
+ if HAVE_CXX
+ check_PROGRAMS += cxx-test

Modified: desktop/unstable/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/series?rev=28615&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/series [utf-8] Thu Jun 23 16:10:57 2011
@@ -1,3 +1,4 @@
 10_scan-module-files-in-dirs.patch
 11_module-files-append-module-files-d.patch
 12_module-files-append-compat-module-files-d.patch
+13-tests-link-libraries.patch