2012-04-11 11:30 Gergely Nagy <alger...@balabit.hu>: | jari.aa...@cante.net writes: | | > I took a better look at FTBFS #666331. The following improves the patch in | > previous message by using DEB_HOST_MULTIARCH as in Ubuntu. Patch 02 was | > never needed (and not included in previous message); so this mistake has | > been fixed in debian/patches/series as well. | | Erm. Are you sure you sent the right patch?
Wrong file. Here is the correct one, Thanks, Jari
>From 677d72d9ce3f5524b335e2ddd5d93d0fe220c15c Mon Sep 17 00:00:00 2001 From: Jari Aalto <jari.aa...@cante.net> Date: Wed, 11 Apr 2012 11:06:53 +0300 Subject: [PATCH] nmu Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <jari.aa...@cante.net> --- debian/changelog | 5 +++-- debian/patches/series | 1 - debian/rules | 13 +++++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b703fb1..a0dbf9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,12 @@ libdbi-drivers (0.8.3-1+s-2.2) unstable; urgency=low * 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). + * Add multiarch support (FTBFS; Closes: #666331); patch thanks to + Clint Byrum <cl...@ubuntu.com>. * Fix temporary-debhelper-file (Lintian) by cleaning debian/*.log. * Fix copyright-refers-to-symlink-license (Lintian). - -- Jari Aalto <jari.aa...@cante.net> Wed, 11 Apr 2012 10:09:33 +0300 + -- Jari Aalto <jari.aa...@cante.net> Wed, 11 Apr 2012 10:59:10 +0300 libdbi-drivers (0.8.3-1+s-2.1) unstable; urgency=low diff --git a/debian/patches/series b/debian/patches/series index 56aedae..db2fffb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 001_test_dbi.c.patch -02-configure-multiarch.patch diff --git a/debian/rules b/debian/rules index c9a7960..3c5fb2e 100755 --- a/debian/rules +++ b/debian/rules @@ -22,8 +22,17 @@ config.status: 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 \ - --with-sqlite3 --with-freetds --with-freetds-dir=/usr \ + --prefix=/usr \ + --with-pgsql \ + --with-mysql \ + --with-sqlite \ + --with-sqlite-incdir=/usr/include/$(DEB_HOST_MULTIARCH) \ + --with-sqlite-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-sqlite3 \ + --with-sqlite3-incdir=/usr/include/$(DEB_HOST_MULTIARCH) \ + --with-sqlite3-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-freetds \ + --with-freetds-dir=/usr \ --enable-docs # This is for the moment removed until the upstream fixes the problems with # the new API: --with-firebird -- 1.7.9.5
