[SCM] Debian packaging of libdbd-odbc-perl branch, master, updated. 918470649a1c5cf35fbbc6d7330dbbc7d2a7bdc0

[gregor herrmann]

The following commit has been merged in the master branch:
commit f74f6adfd5fd658769de6244c2b455d2dc4b3cc6
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Sep 20 20:58:37 2011 +0200

    Make the build system compatible with the multi-arched odbc-dev.
    
    This includes:
    - debian/rules: pointing Makefile.PL to the multiarch directory
    - patching Makefile.PL to actually use the value
    - build depending on dpkg-dev (>= 1.16.0)
    
    Closes: #642237
    Thanks: Dominic Hargreaves for the bug report

diff --git a/debian/control b/debian/control
index cb3d61d..b974cd7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: libdbd-odbc-perl
 Section: perl
 Priority: optional
 Build-Depends: perl, debhelper (>= 8),
+ dpkg-dev (>= 1.16.0),
  libdbi-perl (>= 1.612),
  unixodbc-dev,
  perl (>= 5.10.1) | libtest-simple-perl (>= 0.90)
diff --git a/debian/patches/Makefile_multiarch.patch b/debian/patches/Makefile_multiarch.patch
new file mode 100644
index 0000000..c13c0d6
--- /dev/null
+++ b/debian/patches/Makefile_multiarch.patch
@@ -0,0 +1,21 @@
+Description: Actually use the supplied odbc lib directory instead of the one
+ guessed by finding the headers. The latter doesn't work anymore with
+ multiarch.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/642237
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-09-20
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1026,7 +1026,8 @@
+ 
+     my @dirs;
+     # start with specified dir if there was one
+-    push @dirs, "$home/lib" if defined($opt_o) || defined($ENV{ODBCHOME});
++    push @dirs, "$opt_o" if defined($opt_o);
++    push @dirs, "$ENV{ODBCHOME}" if defined($ENV{ODBCHOME});
+ 
+     # look in perl's libspath as it is more likely to be compatible
+     # (e.g., a lib64 dir)
diff --git a/debian/patches/series b/debian/patches/series
index 5299247..b0bce66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 spelling.patch
+Makefile_multiarch.patch
diff --git a/debian/rules b/debian/rules
index 29ad7ee..691489f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 PACKAGE = $(shell dh_listpackages)
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # for test target, see below
 DBUSER  := $(shell whoami)
 DBNAME  := dbd_odbc_test_db
@@ -26,7 +28,7 @@ test:
 	-dropdb $(DBNAME)
 
 override_dh_auto_configure:
-	dh_auto_configure -- -x -o /usr
+	dh_auto_configure -- -x -o /usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_test:
 	# To run tests, use 'debian/rules test'

-- 
Debian packaging of libdbd-odbc-perl