Here the correct initial patch that replaces:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668342#5
Let me know Thomas, if anything needs adjusting.
Jari
>From cae61e2147cd29c7d16c8d1d76d5ad6c1e5acd89 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 11 Apr 2012 10:27:41 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 11 ----------
debian/changelog | 12 +++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 2 +-
debian/libdbd-freetds.debhelper.log | 22 +++++++++++++++++++-
debian/libdbd-mysql.debhelper.log | 22 +++++++++++++++++++-
debian/libdbd-pgsql.debhelper.log | 22 +++++++++++++++++++-
debian/libdbd-sqlite.debhelper.log | 22 +++++++++++++++++++-
debian/libdbd-sqlite3.debhelper.log | 22 +++++++++++++++++++-
...{001_test_dbi.c.dpatch => 001_test_dbi.c.patch} | 9 +++-----
debian/patches/00list | 1 -
debian/patches/series | 2 ++
debian/rules | 12 ++++++-----
debian/source/format | 2 +-
15 files changed, 134 insertions(+), 33 deletions(-)
delete mode 100644 debian/README.source
rename debian/patches/{001_test_dbi.c.dpatch => 001_test_dbi.c.patch} (77%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f690911..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,11 +0,0 @@
-libdbi-driver is using dpatch so that the PGSQL tests using ISO8859-1 have a
-chance to run without any issue. To apply this patch, you shall do:
-
-dpatch apply-all
-
-and to revert:
-
-dpatch deapply-all
-
-The maintainer,
- Thomas Goirand (zigo) <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index ef9ca5e..b703fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libdbi-drivers (0.8.3-1+s-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
+ * Add build-arch and build-indep targets to rules file.
+ * Add multiarch support; new patch 02 (FTBFS; Closes: #666331).
+ * Fix temporary-debhelper-file (Lintian) by cleaning debian/*.log.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <[email protected]> Wed, 11 Apr 2012 10:09:33 +0300
+
libdbi-drivers (0.8.3-1+s-2.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a7cfe16..4ffc4f4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libdbi-drivers
Section: libs
Priority: optional
Maintainer: Thomas Goirand <[email protected]>
-Build-Depends: debhelper (>= 7), autotools-dev, libdbi-dev (>= 0.8.4-5), libmysqlclient-dev, libpq-dev (>= 8.3~rc2-1+b1), libsqlite0-dev, libsqlite3-dev, freetds-dev, automake, libtool, mysql-server, mysql-client, postgresql, postgresql-client, locales-all | language-pack-en, dh-autoreconf, dpatch
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), autotools-dev, libdbi-dev (>= 0.8.4-5), libmysqlclient-dev, libpq-dev (>= 8.3~rc2-1+b1), libsqlite0-dev, libsqlite3-dev, freetds-dev, automake, libtool, mysql-server, mysql-client, postgresql, postgresql-client, locales-all | language-pack-en, dh-autoreconf
+Standards-Version: 3.9.3.1
Vcs-Browser: http://git.debian.org/?p=users/zigo/libdbi-drivers.git
Vcs-Git: http://git.debian.org/git/users/zigo/libdbi-drivers.git
Homepage: http://libdbi.sourceforge.net/
diff --git a/debian/copyright b/debian/copyright
index 18963a7..f04b317 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -314,4 +314,4 @@ License: LGPL-2.1
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in /usr/share/common-licenses/LGPL.
+License can be found in /usr/share/common-licenses/LGPL-2.1.
diff --git a/debian/libdbd-freetds.debhelper.log b/debian/libdbd-freetds.debhelper.log
index 4b04259..3a223ff 100644
--- a/debian/libdbd-freetds.debhelper.log
+++ b/debian/libdbd-freetds.debhelper.log
@@ -1 +1,21 @@
-dh_autoreconf_clean
+dh_autoreconf
+dh_prep
+dh_installdirs
+dh_installdocs
+dh_install
+dh_installchangelogs
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_makeshlibs
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
diff --git a/debian/libdbd-mysql.debhelper.log b/debian/libdbd-mysql.debhelper.log
index 4b04259..3a223ff 100644
--- a/debian/libdbd-mysql.debhelper.log
+++ b/debian/libdbd-mysql.debhelper.log
@@ -1 +1,21 @@
-dh_autoreconf_clean
+dh_autoreconf
+dh_prep
+dh_installdirs
+dh_installdocs
+dh_install
+dh_installchangelogs
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_makeshlibs
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
diff --git a/debian/libdbd-pgsql.debhelper.log b/debian/libdbd-pgsql.debhelper.log
index 4b04259..3a223ff 100644
--- a/debian/libdbd-pgsql.debhelper.log
+++ b/debian/libdbd-pgsql.debhelper.log
@@ -1 +1,21 @@
-dh_autoreconf_clean
+dh_autoreconf
+dh_prep
+dh_installdirs
+dh_installdocs
+dh_install
+dh_installchangelogs
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_makeshlibs
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
diff --git a/debian/libdbd-sqlite.debhelper.log b/debian/libdbd-sqlite.debhelper.log
index 4b04259..3a223ff 100644
--- a/debian/libdbd-sqlite.debhelper.log
+++ b/debian/libdbd-sqlite.debhelper.log
@@ -1 +1,21 @@
-dh_autoreconf_clean
+dh_autoreconf
+dh_prep
+dh_installdirs
+dh_installdocs
+dh_install
+dh_installchangelogs
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_makeshlibs
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
diff --git a/debian/libdbd-sqlite3.debhelper.log b/debian/libdbd-sqlite3.debhelper.log
index 4b04259..3a223ff 100644
--- a/debian/libdbd-sqlite3.debhelper.log
+++ b/debian/libdbd-sqlite3.debhelper.log
@@ -1 +1,21 @@
-dh_autoreconf_clean
+dh_autoreconf
+dh_prep
+dh_installdirs
+dh_installdocs
+dh_install
+dh_installchangelogs
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_makeshlibs
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
+dh_builddeb
diff --git a/debian/patches/001_test_dbi.c.dpatch b/debian/patches/001_test_dbi.c.patch
similarity index 77%
rename from debian/patches/001_test_dbi.c.dpatch
rename to debian/patches/001_test_dbi.c.patch
index b4ab350..af5f31c 100644
--- a/debian/patches/001_test_dbi.c.dpatch
+++ b/debian/patches/001_test_dbi.c.patch
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 001_test_dbi.c.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: This patch removes some tests in the libdbi-drivers when
-## DP: using ISO8859 encoding, as this test is problematic in Debian
+From: Thomas Goirand <[email protected]>
+Subject: This patch removes some tests in the libdbi-drivers when
+ using ISO8859 encoding, as this test is problematic in Debian
-@DPATCH@
--- libdbi-drivers-0.8.3-1.orig/tests/test_dbi.c 2008-02-07 00:22:44.000000000 +0800
+++ libdbi-drivers-0.8.3-1/tests/test_dbi.c 2010-08-16 15:16:10.000000000 +0800
@@ -305,6 +305,11 @@
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d7e5182..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-001_test_dbi.c.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..56aedae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+001_test_dbi.c.patch
+02-configure-multiarch.patch
diff --git a/debian/rules b/debian/rules
index 70e4d54..c9a7960 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -15,13 +14,12 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
#endif
CFLAGS += -g -Wall
-config.status: patch-stamp
+config.status:
dh_testdir
dh_autoreconf
# upgrade to more recent version before starting the configure process
cp /usr/share/misc/config.sub .
cp /usr/share/misc/config.guess .
-
./autogen.sh
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --with-pgsql --with-mysql --with-sqlite \
@@ -30,6 +28,10 @@ config.status: patch-stamp
# This is for the moment removed until the upstream fixes the problems with
# the new API: --with-firebird
+
+build-arch: build
+build-indep: build
+
build: build-stamp test-stamp
build-stamp: config.status
dh_testdir
@@ -66,7 +68,7 @@ test-stamp: build-stamp
#./debian/test_pgsql.sh
touch test-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp test-stamp
@@ -82,7 +84,7 @@ clean: unpatch
dh_autoreconf_clean
# We need to deapply-all here, because of dh_autoreconf_clean that
# might do the opposite work as expected.
- dpatch deapply-all
+ rm -f debian/*.log
install: build
dh_testdir
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9.5
