[SCM] libiodbc2 packaging branch, master, updated. 7368928588ac1fc37b8de3c0d1e3e4d7bae57772

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libiodbc2.git;a=commitdiff;h=7368928

The following commit has been merged in the master branch:
commit 7368928588ac1fc37b8de3c0d1e3e4d7bae57772
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jun 4 09:44:47 2013 +0200

    Change includedir to avoid conflicts.
---
 debian/changelog             |    1 +
 debian/libiodbc2-dev.install |    2 +-
 debian/rules                 |    3 +++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cda67ce..db15344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libiodbc2 (3.52.8-1) UNRELEASED; urgency=low
   * Update lintian-overrides.
   * Remove duplicate section field.
   * Update libiodbc2-dev install file, remove private libraries.
+  * Change includedir to avoid conflicts.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 03 Jun 2013 13:05:31 +0200
 
diff --git a/debian/libiodbc2-dev.install b/debian/libiodbc2-dev.install
index 8f110a6..4a84a85 100644
--- a/debian/libiodbc2-dev.install
+++ b/debian/libiodbc2-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/bin/iodbc-config
-debian/tmp/usr/include/*.h
+debian/tmp/usr/include/iodbc/*.h
 debian/tmp/usr/lib/*/libiodbc.so
 debian/tmp/usr/lib/*/libiodbcinst.so
diff --git a/debian/rules b/debian/rules
index ab598ef..2ad182c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
 	dh $@ --parallel --with autoreconf,pkgkde_symbolshelper
+
+override_dh_auto_configure:
+	dh_auto_configure -- --includedir='$${prefix}/include/iodbc'

-- 
libiodbc2 packaging