Package: guile-cairo
Version: 1.4.0-3
Severity: normal
Tags: patch
User: [email protected]
Usertags: autoreconf

Hi,

The ppc64el port requires a patch to libtool.m4
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726404), which
requires autoreconfing a bunch of packages to pick it up.  guile-cairo
could handle this by using dh-autoreconf, although it needs an
additional tweak to cope with the new Automake parallel test harness.

  * Convert to dh-autoreconf in order to update libtool macros for new
    ports.
  * Adjust tests/unit-tests/Makefile.am to cope with the new Automake
    parallel test harness.

diff -Nru guile-cairo-1.4.0/debian/control guile-cairo-1.4.0/debian/control
--- guile-cairo-1.4.0/debian/control    2011-04-06 21:10:03.000000000 +0100
+++ guile-cairo-1.4.0/debian/control    2014-03-24 18:05:19.000000000 +0000
@@ -6,7 +6,7 @@
 Vcs-Git: git://git.debian.org/git/collab-maint/guile-cairo.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/guile-cairo.git
 Standards-Version: 3.9.1
-Build-Depends: cdbs (>= 0.4.49), autotools-dev, debhelper (>> 7),
+Build-Depends: cdbs (>= 0.4.49), autotools-dev, debhelper (>> 7), 
dh-autoreconf,
                patchutils (>= 0.2.25), guile-1.8-dev, libcairo2-dev (>= 
1.4.10),
                guile-library (>= 0.1.2)
 
diff -Nru guile-cairo-1.4.0/debian/patches/automake-parallel-tests.patch 
guile-cairo-1.4.0/debian/patches/automake-parallel-tests.patch
--- guile-cairo-1.4.0/debian/patches/automake-parallel-tests.patch      
1970-01-01 01:00:00.000000000 +0100
+++ guile-cairo-1.4.0/debian/patches/automake-parallel-tests.patch      
2014-03-24 18:14:45.000000000 +0000
@@ -0,0 +1,20 @@
+Description: Cope with the new Automake parallel test harness
+Author: Colin Watson <[email protected]>
+Forwarded: no
+Last-Update: 2014-03-24
+
+Index: b/tests/unit-tests/Makefile.am
+===================================================================
+--- a/tests/unit-tests/Makefile.am
++++ b/tests/unit-tests/Makefile.am
+@@ -2,8 +2,8 @@
+       api-stability.scm \
+       version.scm
+ 
+-TESTS_ENVIRONMENT=\
+-      API_FILE=$(srcdir)/cairo.api $(top_builddir)/env guile -s
++LOG_COMPILER=\
++      env API_FILE=$(srcdir)/cairo.api $(top_builddir)/env guile -s
+ 
+ %.api.update:
+       $(top_builddir)/env $(srcdir)/update-api $(subst ., ,$*) > 
$(srcdir)/$*.api
diff -Nru guile-cairo-1.4.0/debian/patches/series 
guile-cairo-1.4.0/debian/patches/series
--- guile-cairo-1.4.0/debian/patches/series     1970-01-01 01:00:00.000000000 
+0100
+++ guile-cairo-1.4.0/debian/patches/series     2014-03-24 18:04:53.000000000 
+0000
@@ -0,0 +1 @@
+automake-parallel-tests.patch
diff -Nru guile-cairo-1.4.0/debian/rules guile-cairo-1.4.0/debian/rules
--- guile-cairo-1.4.0/debian/rules      2011-04-06 21:10:03.000000000 +0100
+++ guile-cairo-1.4.0/debian/rules      2014-03-24 18:05:13.000000000 +0000
@@ -4,6 +4,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 # Empty dependency_libs in .la files, courtesy of gnome-pkg-tools
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

Thanks,

-- 
Colin Watson                                       [[email protected]]


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to