Control: tags -1 +patch

Hi,

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

-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane
diff -Nru sysbench-0.4.12/debian/changelog sysbench-0.4.12/debian/changelog
--- sysbench-0.4.12/debian/changelog	2013-10-22 19:51:32.000000000 +0900
+++ sysbench-0.4.12/debian/changelog	2013-10-22 16:39:38.000000000 +0900
@@ -1,3 +1,15 @@
+sysbench (0.4.12-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * drop dpatch, convert to quilt
+  * debian/rules
+    - auto detect automake/autoheader version (Closes: #713211)
+    - include autoreconf.mk to find "config/compile" file
+  * debian/control
+    - add "Build-Depends: dh-autoreconf" to provide above autreconf.mk
+
+ -- Hideki Yamane <henr...@debian.org>  Tue, 22 Oct 2013 16:29:35 +0900
+
 sysbench (0.4.12-1) unstable; urgency=low
 
   * New upstream version 
diff -Nru sysbench-0.4.12/debian/control sysbench-0.4.12/debian/control
--- sysbench-0.4.12/debian/control	2013-10-22 19:51:32.000000000 +0900
+++ sysbench-0.4.12/debian/control	2013-10-22 16:31:43.000000000 +0900
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Hendrik Frenzel <hfren...@scunc.net>
-Build-Depends: cdbs, debhelper (>= 7), dpatch, docbook-xsl, docbook-xml, xsltproc, autoconf, automake, libtool, libmysqlclient15-dev | libmysqlclient-dev
+Build-Depends: cdbs, debhelper (>= 7), docbook-xsl, docbook-xml, xsltproc, autoconf, automake, libtool, libmysqlclient15-dev | libmysqlclient-dev, dh-autoreconf
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/sysbench
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/sysbench/trunk/
diff -Nru sysbench-0.4.12/debian/patches/00list sysbench-0.4.12/debian/patches/00list
--- sysbench-0.4.12/debian/patches/00list	2013-10-22 19:51:32.000000000 +0900
+++ sysbench-0.4.12/debian/patches/00list	1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-disable-manual-creation
diff -Nru sysbench-0.4.12/debian/patches/disable-manual-creation.dpatch sysbench-0.4.12/debian/patches/disable-manual-creation.dpatch
--- sysbench-0.4.12/debian/patches/disable-manual-creation.dpatch	2013-10-22 19:51:32.000000000 +0900
+++ sysbench-0.4.12/debian/patches/disable-manual-creation.dpatch	1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disable-manual-creation.dpatch by Hendrik Frenzel <hfren...@scunc.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disables buggy creation of manula.html from manual.xml
-
-@DPATCH@
-diff -urNad sysbench-0.4.10~/Makefile.in sysbench-0.4.10/Makefile.in
---- sysbench-0.4.10~/Makefile.in	2008-12-18 12:06:03.000000000 +0100
-+++ sysbench-0.4.10/Makefile.in	2009-02-24 00:59:46.000000000 +0100
-@@ -225,7 +225,7 @@
- target_vendor = @target_vendor@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = doc sysbench
-+SUBDIRS = sysbench
- EXTRA_DIST = autogen.sh README README-WIN.txt ChangeLog
- all: all-recursive
- 
diff -Nru sysbench-0.4.12/debian/patches/disable-manual-creation.patch sysbench-0.4.12/debian/patches/disable-manual-creation.patch
--- sysbench-0.4.12/debian/patches/disable-manual-creation.patch	1970-01-01 09:00:00.000000000 +0900
+++ sysbench-0.4.12/debian/patches/disable-manual-creation.patch	2013-10-22 19:51:04.000000000 +0900
@@ -0,0 +1,14 @@
+Description: Disables buggy creation of manula.html from manual.xml
+Author: Hendrik Frenzel <hfren...@scunc.net>
+
+--- sysbench-0.4.12.orig/Makefile.in
++++ sysbench-0.4.12/Makefile.in
+@@ -225,7 +225,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = doc sysbench
++SUBDIRS = sysbench
+ EXTRA_DIST = autogen.sh README README-WIN.txt ChangeLog
+ all: all-recursive
+ 
diff -Nru sysbench-0.4.12/debian/patches/series sysbench-0.4.12/debian/patches/series
--- sysbench-0.4.12/debian/patches/series	1970-01-01 09:00:00.000000000 +0900
+++ sysbench-0.4.12/debian/patches/series	2013-10-22 16:33:11.000000000 +0900
@@ -0,0 +1 @@
+disable-manual-creation.patch
diff -Nru sysbench-0.4.12/debian/rules sysbench-0.4.12/debian/rules
--- sysbench-0.4.12/debian/rules	2013-10-22 19:51:32.000000000 +0900
+++ sysbench-0.4.12/debian/rules	2013-10-22 16:31:50.000000000 +0900
@@ -2,12 +2,13 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 # Add here any variable or target overrides you need.
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-as-needed"
-DEB_AUTO_UPDATE_AUTOMAKE = 1.11
-DEB_AUTO_UPDATE_ACLOCAL = 1.11
+DEB_AUTO_UPDATE_ACLOCAL = $(shell dpkg -s automake | 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
 
 DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
diff -Nru sysbench-0.4.12/debian/source/format sysbench-0.4.12/debian/source/format
--- sysbench-0.4.12/debian/source/format	1970-01-01 09:00:00.000000000 +0900
+++ sysbench-0.4.12/debian/source/format	2013-10-22 16:32:20.000000000 +0900
@@ -0,0 +1 @@
+3.0 (quilt)

Reply via email to