Control: tags -1 +patch

Hi,

 Attached patch would fix this FTBFS, could you consider to apply it,
 please?

-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/changelog virtuoso-opensource-6.1.4+dfsg1/debian/changelog
--- virtuoso-opensource-6.1.4+dfsg1/debian/changelog	2013-04-18 04:30:32.000000000 +0900
+++ virtuoso-opensource-6.1.4+dfsg1/debian/changelog	2013-10-21 21:59:41.000000000 +0900
@@ -1,3 +1,17 @@
+virtuoso-opensource (6.1.4+dfsg1-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules
+    - auto detect aclocal/automake/autoconf version (Closes: #713192)
+    - include autoreconf.mk to fix "error: required file 'binsrc/config/test-driver'
+      not found"
+  * debian/control
+    - add "Build-Depends: dh-autoreconf" to provide above autreconf.mk
+  * debian/patches
+    - add define_subdir-objects.patch for automake
+
+ -- Hideki Yamane <henr...@debian.org>  Mon, 21 Oct 2013 19:49:34 +0900
+
 virtuoso-opensource (6.1.4+dfsg1-7) unstable; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/control virtuoso-opensource-6.1.4+dfsg1/debian/control
--- virtuoso-opensource-6.1.4+dfsg1/debian/control	2013-04-18 03:36:04.000000000 +0900
+++ virtuoso-opensource-6.1.4+dfsg1/debian/control	2013-10-21 20:22:39.000000000 +0900
@@ -8,7 +8,7 @@
 Homepage: http://virtuoso.openlinksw.com/wiki/main/Main/
 Vcs-Browser: https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=pkg-virtuoso/pkg-virtuoso.git
 Vcs-Git: git://anonscm.alioth.debian.org/git/pkg-virtuoso/pkg-virtuoso.git
-Build-Depends: cdbs, debhelper (>= 9), autotools-dev, autoconf (>=2.57),
+Build-Depends: cdbs, debhelper (>= 9), autotools-dev, autoconf (>=2.57), dh-autoreconf,
  automake (>=1.10), libtool (>=1.5.16), flex (>=2.5.4), bison (>=1.35),
  gperf (>=2.7.2), gawk (>=3.1.1), m4 (>=1.4.1), make (>=3.79.1),
  libssl-dev (>=0.9.7), libreadline-dev, zlib1g-dev, libxml2-dev, libpcre3-dev,
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/patches/define_subdir-objects.patch virtuoso-opensource-6.1.4+dfsg1/debian/patches/define_subdir-objects.patch
--- virtuoso-opensource-6.1.4+dfsg1/debian/patches/define_subdir-objects.patch	1970-01-01 09:00:00.000000000 +0900
+++ virtuoso-opensource-6.1.4+dfsg1/debian/patches/define_subdir-objects.patch	2013-10-21 20:02:37.000000000 +0900
@@ -0,0 +1,15 @@
+Description: fix FTBFS with automake
+Forwarded: no
+Last-Update: 2013-10-22
+
+--- virtuoso-opensource-6.1.4+dfsg1.orig/configure.in
++++ virtuoso-opensource-6.1.4+dfsg1/configure.in
+@@ -46,7 +46,7 @@ dnl	AM_INIT_AUTOMAKE([1.7])
+ dnl	AM_INIT_AUTOMAKE([1.8])
+ dnl	AM_INIT_AUTOMAKE([1.9 tar-ustar])
+ dnl
+-AM_INIT_AUTOMAKE([1.9 tar-ustar])
++AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
+ 
+ AM_MAINTAINER_MODE
+ 
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/patches/series virtuoso-opensource-6.1.4+dfsg1/debian/patches/series
--- virtuoso-opensource-6.1.4+dfsg1/debian/patches/series	2013-04-18 03:36:04.000000000 +0900
+++ virtuoso-opensource-6.1.4+dfsg1/debian/patches/series	2013-10-21 20:02:04.000000000 +0900
@@ -11,3 +11,4 @@
 build-gmake-to-make.patch
 ignore-netstat-failure.patch
 safer-timeout.patch
+define_subdir-objects.patch
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/rules virtuoso-opensource-6.1.4+dfsg1/debian/rules
--- virtuoso-opensource-6.1.4+dfsg1/debian/rules	2013-04-18 03:17:39.000000000 +0900
+++ virtuoso-opensource-6.1.4+dfsg1/debian/rules	2013-10-21 20:13:06.000000000 +0900
@@ -3,10 +3,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
-DEB_AUTO_UPDATE_ACLOCAL = 1.11
-DEB_AUTO_UPDATE_AUTOCONF = 2.61
-DEB_AUTO_UPDATE_AUTOMAKE = 1.11
+DEB_AUTO_UPDATE_ACLOCAL = $(shell dpkg -s automake | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
+DEB_AUTO_UPDATE_AUTOCONF = $(shell dpkg -s autoconf | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
+DEB_AUTO_UPDATE_AUTOMAKE = $(shell dpkg -s automake | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
 DEB_AUTO_UPDATE_LIBTOOL = pre
 
 DEB_AUTOMAKE_ARGS += -Wno-portability

Reply via email to