Package: libpq-dev
Version: 9.1.3-2
Severity: wishlist
Tags: patch

At the moment, libpq-dev depends on libkrb5-dev. This makes it
impossible to have it (or anything that depends on it, such as
libsvn-dev) installed at the same time as heimdal-dev.

It would be great if libpq-dev could instead depend on krb5-multidev,
which doesn't conflict with the heimdal development libraries.
libkrb5-dev is a trivial wrapper around krb5-multidev these days, making
it available in the standard locations.

I'll attach a patch which updates libpq-dev to look for -lgssapi in
both /usr/lib/<tuple>/mit-krb5 and /usr/lib/mit-krb5. Multi-arch support
in krb5-multidev was introduced in 1.9.1+dfsg-2 (09 Aug 2011), so
alternatively the second path could be dropped and a dependency on that
version added instead.

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libpq-dev depends on:
ii  comerr-dev     2.1-1.42.1-2
ii  krb5-multidev  1.10+dfsg~beta1-2
ii  libc6          2.13-27
ii  libpq5         9.1.3-2
ii  libssl-dev     1.0.1-2

libpq-dev recommends no packages.

Versions of packages libpq-dev suggests:
pn  postgresql-doc-9.1  <none>

-- no debconf information
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [email protected]
# target_branch: http://bazaar.launchpad.net/~pitti/postgresql/debian-\
#   9.1/
# testament_sha1: 405ed163d97e9bdcfbc0dd105018287ec6d7634e
# timestamp: 2012-03-21 16:49:12 +0100
# base_revision_id: [email protected]
# 
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-06 11:22:58 +0000
+++ debian/changelog	2012-03-21 15:34:55 +0000
@@ -1,3 +1,10 @@
+postgresql-9.1 (9.1.3-2.1) UNRELEASED; urgency=low
+
+  * Build against krb5-multidev, to allow use while heimdal-dev is
+    installed.
+
+ -- Jelmer Vernooij <[email protected]>  Wed, 21 Mar 2012 16:33:24 +0100
+
 postgresql-9.1 (9.1.3-2) unstable; urgency=low
 
   * debian/control, debian/rules: Support and prefer dpkg-buildflags when

=== modified file 'debian/control'
--- debian/control	2012-03-03 20:28:01 +0000
+++ debian/control	2012-03-21 15:34:55 +0000
@@ -13,7 +13,7 @@
  libssl-dev, 
  zlib1g-dev | libz-dev,
  libpam0g-dev | libpam-dev,
- libxml2-dev, libkrb5-dev,
+ libxml2-dev, krb5-multidev,
  libldap2-dev,
  libxslt1-dev,
  libossp-uuid-dev,
@@ -38,7 +38,7 @@
  ${shlibs:Depends},
  libpq5 (= ${binary:Version}),
  libssl-dev,
- libkrb5-dev,
+ krb5-multidev,
  comerr-dev
 Conflicts: postgresql-dev (<< 7.5)
 Replaces: postgresql-dev

=== modified file 'debian/rules'
--- debian/rules	2012-03-01 07:26:12 +0000
+++ debian/rules	2012-03-21 15:34:55 +0000
@@ -6,8 +6,9 @@
 export DEB_BUILD_HARDENING = 1
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
-LDFLAGS+= -Wl,--as-needed -Wl,-z,now
-CFLAGS+= -fPIC
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LDFLAGS+= -Wl,--as-needed -Wl,-z,now -L/usr/lib/mit-krb5 -L/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5
+CFLAGS+= -fPIC -I/usr/include/mit-krb5
 
 # When protecting the postmaster with oom_adj=-17, allow the OOM killer to slay
 # the backends (http://archives.postgresql.org/pgsql-hackers/2010-01/msg00170.php)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbjVDuYAAutfgEAQVH/////3
34C////wUAWe7N3GA1ZzgQTVagkoTUwqe0TNMptqT1NqeiJsUaaeUA00BtI8pkEpT0p6RiPKY1TR
kaHqMIGhoAGgZDTQCRIjSYp5Kep5Rnqmaj1Bo2oDJoD0QAaAOaZGQyYIaMJgjTRoxA0yZGAAIJJJ
pkaGpgCUwnpTYRA0eUaYjIAHpPUdd43YaR59Lxy/ffaJq2+/92FIqeFulbp0RAJKmmTq6bHXc4uy
0KRjrzE7au9vaae97t9bjU2xsGP7fIWjqqzsHVO/uaJ0bFeytbyva9g9n7O27TLZfIUmc31Krf5O
L3+KefKMkV9iFEbLCUy2w0ZHQd40PWaNN09NyUTBLZA1MZb562efE4nmZTPLlDfRF/Ysyo0HAHZA
7hDF8JIjmYV60m4EgS6W0hU5AfRdsxXp7LXCfIhFF9Wk2jea7tqQ+Ole7pMMbksWA24zoMtPNqmg
K8CEpMR1ywtkQQgmHUOmkuQd/IRZCKguM0U4kEYpcrIpwSiMJ6156WuzklzvZ5Hq9Ftj0hdvCK6c
NtbAMAvJ0Z607axx9wbI8Z5YIJCHFoxI15QgVq+28qJ6x8hD0DygnsImwBk8AvH0COKC2kMns4pf
BBeGpqO5WYVWyzZKBufK2OGzIJC1c5IxlhsTQXsI0a+AbZ8YxYa6VmWEbpnFAxeUrfXObNtRDFFJ
cVzpfnSgagdvwHCNgmVlpvwFDv5iNHBm1DQkbWZCHPaDYCGCvEzQYQSB9hkIhANolpYPO7dUFCvV
LVWjWxQPvQo3FVhCk1a+BMSPBYayEsYpAUpuiD5S2TW5xWIj1JEclQ570ZRKSt+YI1tTSyC/QqNN
DCy5KvhiUQHu0Lr83dz3wGjote8oxAnosTDFvttRqITleFIyFBcqRhYWsVBfEzCcKJar6r3ON+QQ
KkkMrdQWCqo+nnDI3eAw4r223nbDanDe3LmXiLswuMFyG1fC3OmmMaEdr3+Ke3y6ZSlTbpHd34GL
yWvguGLFEeByYuKlUbe5dk64fwbxVKyLipgwm1ULlOZXNS7/ZELaka+r3PA3EVJ31iHHe74y3Pe+
oxJ+kXqLz2yIEEjFUPERwWuWs0De9T2rL+8x8LkvY43kke48DUkIvl6rvSIecxcMdBIY8sHHGvw8
Gz9wW0xjONTXj2qGCRw6MiyKLylEKMaiCWmh7S8y1L14pV58xYMxzhyd+XHZGwytwMTp2Ocegext
SVxHlB+J0Ho3OteZT1uOth1CiKCCVfXK4RL4O5eVhzF0vj1YzaPU/gbVxbT/XFP/HiCqCsN6YiBT
XlcCs8y780q6YjJkmi0TJRUEJM/YZ7jmNFbTpeWddvqLeoKg81sVS0sPWa1AA35kDTUgjTdERsQQ
EZOiwRAR+otIDFh5B3EinCcMYGAszCH5xFqbRz/VKQGs0hWThaWLYMFgIyj22Cx2Hm3wtg6ApSsX
WsOcTXqu4mwm4GK+6klrFGHFTCW/eMctDcMLcBVPDELRHSyeV8yfkTtr1cEKEB8qztBnhP0TDqVa
RwGURLegmse3OMBHYCklNpNGhRLrMVVUTUrj9zCtJ1qEQtmw8tMVEcsYi9bl2DyoX3CCS89CY7hE
u0La2NOtBno00SClsC8N2uvhfZ83dMuAcKEleLZoSqzcsIGW2XhUIIWhLsenGAUcKH93JnLoHhOr
D70h9pwC5k61TCapUUyEiZWDJyVKecfMniKwfMJ6uFNUnVU5Cq0QQK5PDptIkBWr6GClkWJcvWgw
l6/YSK60L+PAsyv1JYVtoBwoIKhDgkKrhF7Kg6GpdqDXQsFsc80FjQMm/4u5IpwoSFxqh3MA
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [email protected]
# target_branch: http://bazaar.launchpad.net/~pitti/postgresql/debian-\
#   9.1/
# testament_sha1: 405ed163d97e9bdcfbc0dd105018287ec6d7634e
# timestamp: 2012-03-21 16:49:12 +0100
# base_revision_id: [email protected]
# 
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-06 11:22:58 +0000
+++ debian/changelog	2012-03-21 15:34:55 +0000
@@ -1,3 +1,10 @@
+postgresql-9.1 (9.1.3-2.1) UNRELEASED; urgency=low
+
+  * Build against krb5-multidev, to allow use while heimdal-dev is
+    installed.
+
+ -- Jelmer Vernooij <[email protected]>  Wed, 21 Mar 2012 16:33:24 +0100
+
 postgresql-9.1 (9.1.3-2) unstable; urgency=low
 
   * debian/control, debian/rules: Support and prefer dpkg-buildflags when

=== modified file 'debian/control'
--- debian/control	2012-03-03 20:28:01 +0000
+++ debian/control	2012-03-21 15:34:55 +0000
@@ -13,7 +13,7 @@
  libssl-dev, 
  zlib1g-dev | libz-dev,
  libpam0g-dev | libpam-dev,
- libxml2-dev, libkrb5-dev,
+ libxml2-dev, krb5-multidev,
  libldap2-dev,
  libxslt1-dev,
  libossp-uuid-dev,
@@ -38,7 +38,7 @@
  ${shlibs:Depends},
  libpq5 (= ${binary:Version}),
  libssl-dev,
- libkrb5-dev,
+ krb5-multidev,
  comerr-dev
 Conflicts: postgresql-dev (<< 7.5)
 Replaces: postgresql-dev

=== modified file 'debian/rules'
--- debian/rules	2012-03-01 07:26:12 +0000
+++ debian/rules	2012-03-21 15:34:55 +0000
@@ -6,8 +6,9 @@
 export DEB_BUILD_HARDENING = 1
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
-LDFLAGS+= -Wl,--as-needed -Wl,-z,now
-CFLAGS+= -fPIC
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LDFLAGS+= -Wl,--as-needed -Wl,-z,now -L/usr/lib/mit-krb5 -L/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5
+CFLAGS+= -fPIC -I/usr/include/mit-krb5
 
 # When protecting the postmaster with oom_adj=-17, allow the OOM killer to slay
 # the backends (http://archives.postgresql.org/pgsql-hackers/2010-01/msg00170.php)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbjVDuYAAutfgEAQVH/////3
34C////wUAWe7N3GA1ZzgQTVagkoTUwqe0TNMptqT1NqeiJsUaaeUA00BtI8pkEpT0p6RiPKY1TR
kaHqMIGhoAGgZDTQCRIjSYp5Kep5Rnqmaj1Bo2oDJoD0QAaAOaZGQyYIaMJgjTRoxA0yZGAAIJJJ
pkaGpgCUwnpTYRA0eUaYjIAHpPUdd43YaR59Lxy/ffaJq2+/92FIqeFulbp0RAJKmmTq6bHXc4uy
0KRjrzE7au9vaae97t9bjU2xsGP7fIWjqqzsHVO/uaJ0bFeytbyva9g9n7O27TLZfIUmc31Krf5O
L3+KefKMkV9iFEbLCUy2w0ZHQd40PWaNN09NyUTBLZA1MZb562efE4nmZTPLlDfRF/Ysyo0HAHZA
7hDF8JIjmYV60m4EgS6W0hU5AfRdsxXp7LXCfIhFF9Wk2jea7tqQ+Ole7pMMbksWA24zoMtPNqmg
K8CEpMR1ywtkQQgmHUOmkuQd/IRZCKguM0U4kEYpcrIpwSiMJ6156WuzklzvZ5Hq9Ftj0hdvCK6c
NtbAMAvJ0Z607axx9wbI8Z5YIJCHFoxI15QgVq+28qJ6x8hD0DygnsImwBk8AvH0COKC2kMns4pf
BBeGpqO5WYVWyzZKBufK2OGzIJC1c5IxlhsTQXsI0a+AbZ8YxYa6VmWEbpnFAxeUrfXObNtRDFFJ
cVzpfnSgagdvwHCNgmVlpvwFDv5iNHBm1DQkbWZCHPaDYCGCvEzQYQSB9hkIhANolpYPO7dUFCvV
LVWjWxQPvQo3FVhCk1a+BMSPBYayEsYpAUpuiD5S2TW5xWIj1JEclQ570ZRKSt+YI1tTSyC/QqNN
DCy5KvhiUQHu0Lr83dz3wGjote8oxAnosTDFvttRqITleFIyFBcqRhYWsVBfEzCcKJar6r3ON+QQ
KkkMrdQWCqo+nnDI3eAw4r223nbDanDe3LmXiLswuMFyG1fC3OmmMaEdr3+Ke3y6ZSlTbpHd34GL
yWvguGLFEeByYuKlUbe5dk64fwbxVKyLipgwm1ULlOZXNS7/ZELaka+r3PA3EVJ31iHHe74y3Pe+
oxJ+kXqLz2yIEEjFUPERwWuWs0De9T2rL+8x8LkvY43kke48DUkIvl6rvSIecxcMdBIY8sHHGvw8
Gz9wW0xjONTXj2qGCRw6MiyKLylEKMaiCWmh7S8y1L14pV58xYMxzhyd+XHZGwytwMTp2Ocegext
SVxHlB+J0Ho3OteZT1uOth1CiKCCVfXK4RL4O5eVhzF0vj1YzaPU/gbVxbT/XFP/HiCqCsN6YiBT
XlcCs8y780q6YjJkmi0TJRUEJM/YZ7jmNFbTpeWddvqLeoKg81sVS0sPWa1AA35kDTUgjTdERsQQ
EZOiwRAR+otIDFh5B3EinCcMYGAszCH5xFqbRz/VKQGs0hWThaWLYMFgIyj22Cx2Hm3wtg6ApSsX
WsOcTXqu4mwm4GK+6klrFGHFTCW/eMctDcMLcBVPDELRHSyeV8yfkTtr1cEKEB8qztBnhP0TDqVa
RwGURLegmse3OMBHYCklNpNGhRLrMVVUTUrj9zCtJ1qEQtmw8tMVEcsYi9bl2DyoX3CCS89CY7hE
u0La2NOtBno00SClsC8N2uvhfZ83dMuAcKEleLZoSqzcsIGW2XhUIIWhLsenGAUcKH93JnLoHhOr
D70h9pwC5k61TCapUUyEiZWDJyVKecfMniKwfMJ6uFNUnVU5Cq0QQK5PDptIkBWr6GClkWJcvWgw
l6/YSK60L+PAsyv1JYVtoBwoIKhDgkKrhF7Kg6GpdqDXQsFsc80FjQMm/4u5IpwoSFxqh3MA

Reply via email to