Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: pu
Hi,
to get #703047 in odbc-postgresql (src:psqlodbc) fixed, libiodbc2
needs to become aware of the location of the multi-arched ODBC
drivers. (Note that this does not mean to multi-arch libiodbc2
itself.)
Sune uploaded a version of libiodbc2 to unstable from which I would
like to extract the relevant patch and have that included in wheezy.
I'd also like to upload a version of odbc-postgresql to wheezy that
changes the "Breaks: libiodbc2" to << this version.
Would that be ok?
Proposed patch for libiodbc2:
diff -Nru libiodbc2-3.52.7/debian/changelog libiodbc2-3.52.7/debian/changelog
--- libiodbc2-3.52.7/debian/changelog 2011-04-08 23:40:02.000000000 -0700
+++ libiodbc2-3.52.7/debian/changelog 2013-05-31 23:16:20.000000000 -0700
@@ -1,3 +1,10 @@
+libiodbc2 (3.52.7-2wheezy1) stable; urgency=low
+
+ * QA upload
+ * Find odbc drivers in a system dir (e.g. /usr/lib/x86_64-linux-gnu/odbc/).
+
+ -- Christoph Berg <m...@debian.org> Fri, 31 May 2013 23:12:13 -0700
+
libiodbc2 (3.52.7-2) unstable; urgency=low
* QA upload
diff -Nru libiodbc2-3.52.7/debian/patches/06_add_system_dir.diff
libiodbc2-3.52.7/debian/patches/06_add_system_dir.diff
--- libiodbc2-3.52.7/debian/patches/06_add_system_dir.diff 1969-12-31
16:00:00.000000000 -0800
+++ libiodbc2-3.52.7/debian/patches/06_add_system_dir.diff 2013-05-31
23:12:06.000000000 -0700
@@ -0,0 +1,22 @@
+Add a system dir to be able to load drivers from a system dir without having a
full
+path to the drivers, as it is done nowadays on debian systems
+
+Index: libiodbc2-3.52.7/iodbc/connect.c
+===================================================================
+--- libiodbc2-3.52.7.orig/iodbc/connect.c 2013-05-17 21:03:10.000000000
+0200
++++ libiodbc2-3.52.7/iodbc/connect.c 2013-05-17 21:10:35.000000000 +0200
+@@ -1085,6 +1085,14 @@
+ }
+
+ genv = (GENV_t *) pdbc->genv;
++
++#ifdef SYSTEM_DIR
++ char path_with_multiarch[1024];
++ if (!(path[0] == '/' || path[0] == '.')) {
++ snprintf(path_with_multiarch,sizeof (path_with_multiarch), "%s/%s",
SYSTEM_DIR, path);
++ path = path_with_multiarch;
++ }
++#endif
+
+ /* This will either load the driver dll or increase its reference count */
+ hdll = _iodbcdm_dllopen ((char *) path);
diff -Nru libiodbc2-3.52.7/debian/patches/series
libiodbc2-3.52.7/debian/patches/series
--- libiodbc2-3.52.7/debian/patches/series 2011-04-09 00:11:49.000000000
-0700
+++ libiodbc2-3.52.7/debian/patches/series 2013-05-31 23:12:06.000000000
-0700
@@ -3,3 +3,4 @@
03_bug508480.diff
04_bug501100.diff
05_unicode_includes.diff
+06_add_system_dir.diff
diff -Nru libiodbc2-3.52.7/debian/rules libiodbc2-3.52.7/debian/rules
--- libiodbc2-3.52.7/debian/rules 2010-06-26 12:43:16.000000000 -0700
+++ libiodbc2-3.52.7/debian/rules 2013-05-31 23:12:06.000000000 -0700
@@ -7,6 +7,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/dpkg/architecture.mk
+
+CFLAGS+=-DSYSTEM_DIR=\\\"/usr/lib/$(DEB_HOST_MULTIARCH)/odbc/\\\"
# To make sure that every package that links against libiodbc defines
# a versioned dependency and not just a normal one.
Proposed patch for psqlodbc:
diff --git a/debian/changelog b/debian/changelog
index 8950c57..b75acc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+psqlodbc (1:09.01.0200-1wheezy1) stable; urgency=low
+
+ * Versioned Breaks: libiodbc2 (<= 3.52.7-2), it is multiarch-aware now.
+ (Fixes co-installability with KDE, Closes: #703047.)
+
+ -- Christoph Berg <m...@debian.org> Sun, 26 May 2013 15:23:58 -0700
+
psqlodbc (1:09.01.0200-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 4823eaa..1d80ca9 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Suggests: unixodbc-bin
Enhances: unixodbc
-Breaks: unixodbc (<< 2.2.14p2-3), odbcinst1debian2 (<< 2.2.14p2-3), libiodbc2
+Breaks: unixodbc (<< 2.2.14p2-3), odbcinst1debian2 (<< 2.2.14p2-3),
+ libiodbc2 (<= 3.52.7-2)
Description: ODBC driver for PostgreSQL
This package provides a driver that allows ODBC-enabled applications to
access PostgreSQL databases. ODBC is an abstraction layer that allows
diff --git a/debian/odbc-postgresql.lintian-overrides
b/debian/odbc-postgresql.lintian-overrides
deleted file mode 100644
index 366fb91..0000000
--- a/debian/odbc-postgresql.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-breaks-without-version libiodbc2
Christoph
--
c...@df7cb.de | http://www.df7cb.de/
signature.asc
Description: Digital signature
