[SCM] Debian packaging of libdbd-odbc-perl branch, master, updated. debian/1.33-1-12-gcde8db4

[gregor herrmann]

The following commit has been merged in the master branch:
commit 3d0b6106fea645f43c759aa5598677da9d4fdfee
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Mar 18 18:33:09 2012 +0100

    The upstream build system is now multiarch-aware.
    
    Drop Makefile_multiarch.patch, simplify debian/{rules,control}.

diff --git a/debian/control b/debian/control
index b974cd7..cb3d61d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ 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
deleted file mode 100644
index 407b747..0000000
--- a/debian/patches/Makefile_multiarch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-@@ -1081,7 +1081,8 @@ sub find_unixodbc
- 
-     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 b0bce66..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 spelling.patch
-Makefile_multiarch.patch
diff --git a/debian/rules b/debian/rules
index 691489f..b2062f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 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
@@ -28,7 +26,7 @@ test:
 	-dropdb $(DBNAME)
 
 override_dh_auto_configure:
-	dh_auto_configure -- -x -o /usr/lib/$(DEB_HOST_MULTIARCH)
+	PERL_DBD_ODBC_PREFER_UNIXODBC=1 dh_auto_configure
 
 override_dh_auto_test:
 	# To run tests, use 'debian/rules test'

-- 
Debian packaging of libdbd-odbc-perl