On 2012-04-13 21:45, Thomas Goirand wrote:
| On 04/11/2012 11:54 PM, Jari Aalto wrote:
| >
| > 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
| >
|
| Hi Jari,
|
| I have begin to apply all of your patch, in order to upload libdbi and
| libdbi-drivers myself. Unfortunately, your patch was missing
| 02-configure-multiarch.patch, and I have no idea what you've put in it.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668342#10
... Patch 02 was never needed (and not included in previous
message); so this mistake has been fixed in debian/patches/series
as well.
| Can you please send it to me? Or is it simply the addition of:
|
| --with-sqlite-incdir=/usr/include/$(DEB_HOST_MULTIARCH) \
| --with-sqlite-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
| --with-sqlite3-incdir=/usr/include/$(DEB_HOST_MULTIARCH) \
| --with-sqlite3-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
|
| in the debian/rules?
Yes.
|
| By the way, you can use Git, since the repository is now up-to-date:
| http://git.debian.org/git/users/zigo/libdbi.git
The last commit's debian/changelog is 0.8.2-4 and my patch was sequel
to latest in Debian (0.9b3-4.1). Could you update the repository and
I'll check after that.
| http://git.debian.org/git/users/zigo/libdbi-drivers.git
|
| I'll wait on you for libdbi-drivers.
Here is a small update against your Git for libdbi-drivers.
Thanks,
Jari
>From 31aa242857831434fd15187114780fd0d58bf32c Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 13 Apr 2012 19:30:20 +0300
Subject: [PATCH] Minor cleanup
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 12 ++-
debian/copyright | 96 +++++++++++---------
...{001_test_dbi.c.dpatch => 001-test-dbi.c.patch} | 0
debian/patches/series | 3 +-
debian/watch | 2 +-
5 files changed, 64 insertions(+), 49 deletions(-)
rename debian/patches/{001_test_dbi.c.dpatch => 001-test-dbi.c.patch} (100%)
diff --git a/debian/changelog b/debian/changelog
index 51992d7..1945c09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,16 @@
-libdbi-drivers (0.8.3-1+s-2.2) unstable; urgency=low
+libdbi-drivers (0.8.3-1+s-3) unstable; urgency=low
[ Thomas Goirand ]
- * Switched debian/copyright to machine readable format.
+ * Switched debian/copyright to format 1.0.
* Added a debian/gbp.conf.
+
[ Jari Aalto <jari.aa...@cante.net> ]
- * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
+ (Closes: #668342).
* 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), patch
- thanks to Clint Byrum <cl...@ubuntu.com>.
+ * Add multiarch support (FTBFS; Closes: #650044), patch
+ thanks to Clint Byrum <cl...@ubuntu.com>.
* Fix temporary-debhelper-file (Lintian) by cleaning debian/*.log.
* Fix copyright-refers-to-symlink-license (Lintian).
diff --git a/debian/copyright b/debian/copyright
index fc0af0e..683bf42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,82 +4,96 @@ Upstream-Contact: Markus Hoenicka <mar...@mhoenicka.de>
Source: http://libdbi.sourceforge.net/download.html
Files: debian/*
-Copyright: (c) 2005-2007 David Nebauer <da...@nebauer.org>
- (c) 2001-2005, David A. Parker <da...@neongoat.com>
- (c) 2007-2012, Thomas Goirand <tho...@goirand.fr>
+Copyright:
+ 2005-2007 David Nebauer <da...@nebauer.org>
+ 2001-2005 David A. Parker <da...@neongoat.com>
+ 2007-2012 Thomas Goirand <tho...@goirand.fr>
License: LGPL-2.1
Files: debian/test_mysql.sh debian/test_pgsql.sh
-Copyright: (c) 2010 Clint Byrum <cl...@ubuntu.com>
- (c) 2010 Thomas Goirand <z...@debian.org>
+Copyright:
+ 2010 Clint Byrum <cl...@ubuntu.com>
+ 2010 Thomas Goirand <z...@debian.org>
License: LGPL-2.1
Files: drivers/firebird/*
-Copyright: (c) 2001-2004, David Parker <da...@neongoat.com>
- (c) 2001-2004, Mark Tobenkin <m...@brentwoodradio.com>
- (c) 2001-2005, Christian M. Stamgren <christ...@centiongroup.com>
+Copyright:
+ 2001-2004 David Parker <da...@neongoat.com>
+ 2001-2004 Mark Tobenkin <m...@brentwoodradio.com>
+ 2001-2005 Christian M. Stamgren <christ...@centiongroup.com>
License: LGPL-2.1
Files: drivers/freetds/*
-Copyright: (c) 2001-2005, Vadym Kononenko <kona...@users.sourceforge.net>
- (c) 2001-2005, Christian M. Stamgren <christ...@stamgren.com>
+Copyright:
+ 2001-2005 Vadym Kononenko <kona...@users.sourceforge.net>
+ 2001-2005 Christian M. Stamgren <christ...@stamgren.com>
License: LGPL-2.1
Files: drivers/ingres/*
-Copyright: (c) 2006, Toby Thain <qu1j...@sourceforge.net>
- (c) 2001-2002, David Parker <da...@neongoat.com>
+Copyright:
+ 2006 Toby Thain <qu1j...@sourceforge.net>
+ 2001-2002 David Parker <da...@neongoat.com>
License: LGPL-2.1
Files: drivers/msql/*
-Copyright: (C) 2001-2002, Mark Tobenkin <m...@brentwoodradio.com>
- (c) 2001-2002, David Parker <da...@neongoat.com>
- (c) 2001-2007, Markus Hoenicka <mar...@mhoenicka.de>
+Copyright:
+ 2001-2002 Mark Tobenkin <m...@brentwoodradio.com>
+ 2001-2002 David Parker <da...@neongoat.com>
+ 2001-2007 Markus Hoenicka <mar...@mhoenicka.de>
License: LGPL-2.1
Files: driver/msql/*.sgml
-Copyright: (c) 2001-2003, Christian Stamgren christ...@centiongroup.com
+Copyright:
+ 2001-2003, Christian Stamgren christ...@centiongroup.com
License: GFDL-1.2
Files: drivers/oracle/*
-Copyright: (c) 2003-2004, Christian M. Stamgren <christ...@stamgren.com>
- (c) 2001-2004, David Parker <da...@neongoat.com>
- (c) 2001-2007, Ashish Ranjan <ashishw...@yahoo.com>
+Copyright:
+ 2003-2004 Christian M. Stamgren <christ...@stamgren.com>
+ 2001-2004 David Parker <da...@neongoat.com>
+ 2001-2007 Ashish Ranjan <ashishw...@yahoo.com>
License: LGPL-2.1
Files: drivers/pgsql/*
-Copyright: (c) 2001-2002, David A. Parker <da...@neongoat.com>
- (c) 2001-2007, Markus Hoenicka <mar...@mhoenicka.de>
+Copyright:
+ 2001-2002 David A. Parker <da...@neongoat.com>
+ 2001-2007 Markus Hoenicka <mar...@mhoenicka.de>
License: LGPL-2.1
Files: driver/pgsql/*.sgml
-Copyright: (c) 2001-2005, Neon Goat Productions <da...@neongoat.com>
- (c) 2001-2003, David A. Parker <da...@neongoat.com>
+Copyright:
+ 2001-2005 Neon Goat Productions <da...@neongoat.com>
+ 2001-2003 David A. Parker <da...@neongoat.com>
License: GFDL-1.2
Files: drivers/sqlite/*
-Copyright: (c) 2001-2002, David Parker <da...@neongoat.com>
- (c) 2001-2007, Markus Hoenicka <mar...@mhoenicka.de>
+Copyright:
+ 2001-2002 David Parker <da...@neongoat.com>
+ 2001-2007 Markus Hoenicka <mar...@mhoenicka.de>
License: GPL-2
Files: drivers/sqlite3/*
-Copyright: (c) 2001-2002, David Parker <da...@neongoat.com>
- (c) 2001-2007, Markus Hoenicka <mar...@mhoenicka.de>
+Copyright:
+ 2001-2002 David Parker <da...@neongoat.com>
+ 2001-2007 Markus Hoenicka <mar...@mhoenicka.de>
License: GPL-2
Files: drivers/mysql/*
-Copyright: (C) 2001-2002, Mark Tobenkin <m...@brentwoodradio.com>
- (C) 2001-2002, David Parker <da...@neongoat.com>
- (C) 2001-2007, Markus Hoenicka <mar...@mhoenicka.de>
- (C) 2006, Toby Thain <qu1j...@users.sourceforge.net>
+Copyright:
+ 2001-2002 Mark Tobenkin <m...@brentwoodradio.com>
+ 2001-2002 David Parker <da...@neongoat.com>
+ 2001-2007 Markus Hoenicka <mar...@mhoenicka.de>
+ 2006 Toby Thain <qu1j...@users.sourceforge.net>
License: LGPL-2.1
Files: *
-Copyright: (C) 2001-2005, David Parker <da...@neongoat.com>
- (C) 2001-2007, Markus Hoenicka <mar...@mhoenicka.de>
- (C) 2001-2002, Mark Tobenkin <m...@brentwoodradio.com>
- (C) 2006, Toby Thain <qu1j...@users.sourceforge.net>
- (C) 2003-2004, Christian M. Stamgren <christ...@stamgren.com>
- (C) 2001-2007, Ashish Ranjan <ashishw...@yahoo.com>
+Copyright:
+ 2001-2005 David Parker <da...@neongoat.com>
+ 2001-2007 Markus Hoenicka <mar...@mhoenicka.de>
+ 2001-2002 Mark Tobenkin <m...@brentwoodradio.com>
+ 2006 Toby Thain <qu1j...@users.sourceforge.net>
+ 2003-2004 Christian M. Stamgren <christ...@stamgren.com>
+ 2001-2007 Ashish Ranjan <ashishw...@yahoo.com>
License: LGPL-2.1
License: LGPL-2.1
@@ -100,13 +114,13 @@ License: LGPL-2.1
On Debian systems, the complete text of the GNU Lesser General Public
License can be found in /usr/share/common-licenses/LGPL-2.1.
-License: GFDL-1.1+
- Permission is granted to copy, distribute and/or modify this document under
+License: GFDL-1.2
+ Permission is granted to copy, distribute and/or modify this document under
the terms of the GNU Free Documentation License, Version 1.2 published by the
Free Software Foundation; with no Invariant Sections, no Front-Cover Texts,
and no Back-Cover Texts.
.
- On Debian systems, the complete text of the GNU Free Documentation License
+ On Debian systems, the complete text of the GNU Free Documentation License
(GFDL) may be found in /usr/share/common-licenses/GFDL-1.2.
License: GPL-2
@@ -119,7 +133,7 @@ License: GPL-2
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
.
- You should have received a copy of the GNU General Public License along with
+ You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
St, Fifth Floor, Boston, MA 02110-1301 USA
.
diff --git a/debian/patches/001_test_dbi.c.dpatch b/debian/patches/001-test-dbi.c.patch
similarity index 100%
rename from debian/patches/001_test_dbi.c.dpatch
rename to debian/patches/001-test-dbi.c.patch
diff --git a/debian/patches/series b/debian/patches/series
index 56aedae..bef9b16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-001_test_dbi.c.patch
-02-configure-multiarch.patch
+001-test-dbi.c.patch
diff --git a/debian/watch b/debian/watch
index 22dbe33..aae2724 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=2
+version=3
http://sf.net/libdbi-drivers/libdbi-drivers-(.*)\.tar\.gz
--
1.7.9.5
