[Pkg-tcltk-commits] r1353 - tclodbc/trunk/debian

[andrewshadoura-guest at alioth.debian.org]

Author: andrewshadoura-guest
Date: 2013-06-20 12:48:52 +0000 (Thu, 20 Jun 2013)
New Revision: 1353

Modified:
   tclodbc/trunk/debian/changelog
   tclodbc/trunk/debian/control
   tclodbc/trunk/debian/rules
Log:
Add changes from NMU by gregor herrmann

Modified: tclodbc/trunk/debian/changelog
===================================================================
--- tclodbc/trunk/debian/changelog	2013-05-11 14:52:17 UTC (rev 1352)
+++ tclodbc/trunk/debian/changelog	2013-06-20 12:48:52 UTC (rev 1353)
@@ -1,3 +1,17 @@
+tclodbc (2.5.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: configure: error: Cannot find an ODBC library path":
+    + debian/rules: point ./configure to odbc multiarch lib directory
+    + debian/control: build depend on dpkg-dev (>= 1.16.0)
+    Closes: #639990
+  * debian/control: remove alternative (build) dependency on libiodbc2 (not
+    multiarched, bound for removal); remove manually added unixodbc from
+    Depends (${shlibs:Depends} is enough); add ${misc:Depends} while we're
+    there.
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 16 Sep 2011 14:51:53 +0200
+
 tclodbc (2.5.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: tclodbc/trunk/debian/control
===================================================================
--- tclodbc/trunk/debian/control	2013-05-11 14:52:17 UTC (rev 1352)
+++ tclodbc/trunk/debian/control	2013-06-20 12:48:52 UTC (rev 1353)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Daniel Rus Morales <danirus at tol-project.org>, Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7), dpatch, automake, autoconf, autotools-dev, tcl-dev (>= 8.0), unixodbc-dev | libiodbc2-dev
+Build-Depends: debhelper (>= 7), dpatch, automake, autoconf, autotools-dev, tcl-dev (>= 8.0), unixodbc-dev, dpkg-dev (>= 1.16.0)
 Standards-Version: 3.8.3
 Homepage: https://sourceforge.net/projects/tclodbc/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-tcltk/tclodbc/trunk
@@ -13,7 +13,7 @@
 Package: tclodbc
 Architecture: any
 Section: libs
-Depends: tcl (>= 8.0), unixodbc | libiodbc2, ${shlibs:Depends}
+Depends: tcl (>= 8.0), ${shlibs:Depends}, ${misc:Depends}
 Description: The ODBC extension to Tcl
  This package is the ODBC extension to Tcl, originally written by Roy Nurmi,
  Tom Poindexter and Rob Saboye. Provides access to Databases through ODBC

Modified: tclodbc/trunk/debian/rules
===================================================================
--- tclodbc/trunk/debian/rules	2013-05-11 14:52:17 UTC (rev 1352)
+++ tclodbc/trunk/debian/rules	2013-06-20 12:48:52 UTC (rev 1353)
@@ -5,6 +5,8 @@
 
 include /usr/share/dpatch/dpatch.make
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 CFLAGS = -Wall -fPIC -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -19,7 +21,7 @@
 	mv -f aclocal.m4 aclocal.m4.orig
 	aclocal -I . -I tclconfig
 	autoconf
-	CC=g++ ./configure --prefix=/usr --with-tcl=/usr/lib --with-tclinclude=/usr/include/tcl CFLAGS="$(CFLAGS)"
+	CC=g++ ./configure --prefix=/usr --with-tcl=/usr/lib --with-tclinclude=/usr/include/tcl --with-odbclibrary=/usr/lib/$(DEB_HOST_MULTIARCH) CFLAGS="$(CFLAGS)"
 	mv -f configure.orig configure
 	mv -f aclocal.m4.orig aclocal.m4