Bug#639300: please build against unixodbc-dev instead of libiodbc2-dev

[Steve Langasek <vorlon@debian.org>]

tags 639300 patch
thanks

Dear maintainers,

I'm surprised to say that after sitting on this bug for far too long, it
turns out that it's trivial to fix.  Although it had been reported that
soprano would not work with unixodbc, once I actually installed virtuoso,
which the soprano test suite silently depends on, I get the same results
from test/virtuosobackendtest when built against either iODBC or UnixODBC.

So I think the attached patch would be safe to apply to soprano, fixing this
longstanding issue.

I'm happy to upload this as an NMU if you would like.  It's probably worth
an upload ASAP rather than waiting for 2.7.5+dfsg.1-1 to migrate to testing,
since it's hard to have usable ODBC drivers for soprano until it's fixed.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek@ubuntu.com                                     vorlon@debian.org

diff -Nru soprano-2.7.5+dfsg.1/debian/changelog soprano-2.7.5+dfsg.1/debian/changelog
--- soprano-2.7.5+dfsg.1/debian/changelog	2012-03-04 20:55:08.000000000 +0000
+++ soprano-2.7.5+dfsg.1/debian/changelog	2012-03-05 23:49:53.000000000 +0000
@@ -1,3 +1,10 @@
+soprano (2.7.5+dfsg.1-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Build against unixodbc.  Closes: #639300, LP: #901638.
+
+ -- Steve Langasek <vorlon@debian.org>  Mon, 05 Mar 2012 23:49:13 +0000
+
 soprano (2.7.5+dfsg.1-1) unstable; urgency=low
 
   * Team upload.
diff -Nru soprano-2.7.5+dfsg.1/debian/control soprano-2.7.5+dfsg.1/debian/control
--- soprano-2.7.5+dfsg.1/debian/control	2012-03-04 20:43:25.000000000 +0000
+++ soprano-2.7.5+dfsg.1/debian/control	2012-03-05 23:49:41.000000000 +0000
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.4.15), cmake (>= 2.6.2), pkg-kde-tools (>= 0.12),
  dpkg-dev (>= 1.15.5), libclucene-dev (>= 0.9.21b), libqt4-dev (>= 4.5.3),
  libraptor1-dev (>= 1.4.16), librdf0-dev (>= 1.0.13),
- doxygen (>= 1.7.1), graphviz, libiodbc2-dev
+ doxygen (>= 1.7.1), graphviz, unixodbc-dev
 Standards-Version: 3.9.2
 Homepage: http://soprano.sourceforge.net
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-req/soprano.git
diff -Nru soprano-2.7.5+dfsg.1/debian/patches/series soprano-2.7.5+dfsg.1/debian/patches/series
--- soprano-2.7.5+dfsg.1/debian/patches/series	2012-03-04 20:33:22.000000000 +0000
+++ soprano-2.7.5+dfsg.1/debian/patches/series	2012-03-05 23:49:41.000000000 +0000
@@ -2,3 +2,4 @@
 disable_usr_lib_install_rpath.diff
 doxyfile_generate_tagfile.diff
 redland_raptor2_support.h
+unixodbc
diff -Nru soprano-2.7.5+dfsg.1/debian/patches/unixodbc soprano-2.7.5+dfsg.1/debian/patches/unixodbc
--- soprano-2.7.5+dfsg.1/debian/patches/unixodbc	1970-01-01 00:00:00.000000000 +0000
+++ soprano-2.7.5+dfsg.1/debian/patches/unixodbc	2012-03-05 23:49:41.000000000 +0000
@@ -0,0 +1,21 @@
+Description: Build against unixodbc
+ Add support for soprano to build against unixodbc.  Thanks to some hints
+ from Alban Browaeys, I've found that the "virtuosobackendtest" test suite
+ works just as well with either unixodbc or iodbc, you just have to have
+ the virtuoso-opensource-6.1-bin package installed first to avoid
+ incomprehensible test failures.
+Author: Steve Langasek <vorlon@debian.org>
+Bug-Debian: http://bugs.debian.org/639300
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/901638
+
+--- soprano-2.6.0+dfsg.1.orig/cmake/modules/FindIODBC.cmake
++++ soprano-2.6.0+dfsg.1/cmake/modules/FindIODBC.cmake
+@@ -57,7 +57,7 @@ find_path(IODBC_INCLUDE_DIR sql.h
+   ${iodbc_INCLUDE_DIRS}
+   )
+ 
+-find_library(IODBC_LIBRARIES NAMES iodbc
++find_library(IODBC_LIBRARIES NAMES odbc iodbc
+   HINTS
+   ${iodbc_LIBRARY_DIRS}
+   )