package: heimdal
severity: wishlist 
tags: patch

Brian, per our discussions I'd like permission to NMU the following patch:

diff --git a/debian/changelog b/debian/changelog
index 0b27460..e7c2247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+heimdal (1.2.e1.dfsg.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Implement heimdal-multidev package to provide set of headers and
+    libraries that can be installed along-side MIT Kerberos Development
+    files  
+
+ -- Sam Hartman <[email protected]>  Sat, 25 Jul 2009 13:35:51 -0400
+
 heimdal (1.2.e1.dfsg.1-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 3f8f834..b9af0fb 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: Heimdal Kerberos - key distribution center (KDC)
  such a way that the server computers do not need to know the
  passwords.
 
-Package: heimdal-dev
+Package: heimdal-multidev
 Section: devel
 Priority: extra
 Architecture: any
@@ -47,6 +47,22 @@ Conflicts: heimdal-clients (<< 0.4e-7), kerberos4kth-dev
 Depends: ${misc:Depends}, libasn1-8-heimdal (= ${binary:Version}), libkrb5-25-heimdal (= ${binary:Version}), libhdb9-heimdal (= ${binary:Version}), libkadm5srv8-heimdal (= ${binary:Version}), libkadm5clnt7-heimdal (= ${binary:Version}), libgssapi2-heimdal (= ${binary:Version}), libkafs0-heimdal (= ${binary:Version}), comerr-dev
 Replaces: heimdal-clients (<< 0.4e-7)
 Suggests: heimdal-docs
+Description: Heimdal Kerberos - Multi-implementation Development
+ Heimdal is a free implementation of Kerberos 5 that aims to be
+ compatible with MIT Kerberos.
+ .
+ This package provides versions of the Heimdal development files that
+ can be installed along-side MIT Kerberos development files.
+ Normally, heimdal-dev should be used. However if a package needs to
+ build  against both Heimdal Kerberos and MIT Kerberos, then the
+ multidev package should be used. 
+
+Package: heimdal-dev
+Depends: heimdal-multidev (= ${binary:Version})
+Section: devel
+Conflicts: libkrb5-dev
+Priority: extra
+Architecture: any
 Description: Heimdal Kerberos - development files
  Heimdal is a free implementation of Kerberos 5 that aims to be
  compatible with MIT Kerberos.
diff --git a/debian/heimdal-dev.dirs b/debian/heimdal-dev.dirs
new file mode 100644
index 0000000..e43b95c
--- /dev/null
+++ b/debian/heimdal-dev.dirs
@@ -0,0 +1 @@
+usr/include
diff --git a/debian/heimdal-dev.install b/debian/heimdal-dev.install
index 9e39a8b..3d9a05e 100644
--- a/debian/heimdal-dev.install
+++ b/debian/heimdal-dev.install
@@ -1,7 +1,3 @@
 usr/bin/krb5-config
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/*.so
-usr/include
 usr/share/man/man1/krb5-config.1
 usr/share/man/man3
diff --git a/debian/heimdal-dev.links b/debian/heimdal-dev.links
new file mode 100644
index 0000000..cfecffe
--- /dev/null
+++ b/debian/heimdal-dev.links
@@ -0,0 +1,98 @@
+usr/lib/heimdal/libasn1.a usr/lib/libasn1.a
+usr/lib/heimdal/libasn1.la usr/lib/libasn1.la
+usr/lib/heimdal/libasn1.so usr/lib/libasn1.so
+usr/lib/heimdal/libgssapi.a usr/lib/libgssapi.a
+usr/lib/heimdal/libgssapi.la usr/lib/libgssapi.la
+usr/lib/heimdal/libgssapi.so usr/lib/libgssapi.so
+usr/lib/heimdal/libhdb.a usr/lib/libhdb.a
+usr/lib/heimdal/libhdb.la usr/lib/libhdb.la
+usr/lib/heimdal/libhdb.so usr/lib/libhdb.so
+usr/lib/heimdal/libheimntlm.a usr/lib/libheimntlm.a
+usr/lib/heimdal/libheimntlm.la usr/lib/libheimntlm.la
+usr/lib/heimdal/libheimntlm.so usr/lib/libheimntlm.so
+usr/lib/heimdal/libhx509.a usr/lib/libhx509.a
+usr/lib/heimdal/libhx509.la usr/lib/libhx509.la
+usr/lib/heimdal/libhx509.so usr/lib/libhx509.so
+usr/lib/heimdal/libkadm5clnt.a usr/lib/libkadm5clnt.a
+usr/lib/heimdal/libkadm5clnt.la usr/lib/libkadm5clnt.la
+usr/lib/heimdal/libkadm5clnt.so usr/lib/libkadm5clnt.so
+usr/lib/heimdal/libkadm5srv.a usr/lib/libkadm5srv.a
+usr/lib/heimdal/libkadm5srv.la usr/lib/libkadm5srv.la
+usr/lib/heimdal/libkadm5srv.so usr/lib/libkadm5srv.so
+usr/lib/heimdal/libkafs.a usr/lib/libkafs.a
+usr/lib/heimdal/libkafs.la usr/lib/libkafs.la
+usr/lib/heimdal/libkafs.so usr/lib/libkafs.so
+usr/lib/heimdal/libkdc.a usr/lib/libkdc.a
+usr/lib/heimdal/libkdc.la usr/lib/libkdc.la
+usr/lib/heimdal/libkdc.so usr/lib/libkdc.so
+usr/lib/heimdal/libkrb5.a usr/lib/libkrb5.a
+usr/lib/heimdal/libkrb5.la usr/lib/libkrb5.la
+usr/lib/heimdal/libkrb5.so usr/lib/libkrb5.so
+usr/lib/heimdal/libotp.a usr/lib/libotp.a
+usr/lib/heimdal/libotp.la usr/lib/libotp.la
+usr/lib/heimdal/libotp.so usr/lib/libotp.so
+usr/lib/heimdal/libroken.a usr/lib/libroken.a
+usr/lib/heimdal/libroken.la usr/lib/libroken.la
+usr/lib/heimdal/libroken.so usr/lib/libroken.so
+usr/lib/heimdal/libsl.a usr/lib/libsl.a
+usr/lib/heimdal/libsl.la usr/lib/libsl.la
+usr/lib/heimdal/libsl.so usr/lib/libsl.so
+usr/lib/heimdal/libwind.a usr/lib/libwind.a
+usr/lib/heimdal/libwind.la usr/lib/libwind.la
+usr/lib/heimdal/libwind.so usr/lib/libwind.so
+usr/lib/heimdal/windc.a usr/lib/windc.a
+usr/lib/heimdal/windc.la usr/lib/windc.la
+usr/lib/heimdal/windc.so usr/lib/windc.so
+usr/include/heimdal/asn1_err.h usr/include/asn1_err.h
+usr/include/heimdal/base64.h usr/include/base64.h
+usr/include/heimdal/cms_asn1.h usr/include/cms_asn1.h
+usr/include/heimdal/der-protos.h usr/include/der-protos.h
+usr/include/heimdal/der.h usr/include/der.h
+usr/include/heimdal/digest_asn1.h usr/include/digest_asn1.h
+usr/include/heimdal/getarg.h usr/include/getarg.h
+usr/include/heimdal/gssapi usr/include/gssapi
+usr/include/heimdal/gssapi.h usr/include/gssapi.h
+usr/include/heimdal/hdb-protos.h usr/include/hdb-protos.h
+usr/include/heimdal/hdb.h usr/include/hdb.h
+usr/include/heimdal/hdb_asn1.h usr/include/hdb_asn1.h
+usr/include/heimdal/hdb_err.h usr/include/hdb_err.h
+usr/include/heimdal/heim_asn1.h usr/include/heim_asn1.h
+usr/include/heimdal/heim_err.h usr/include/heim_err.h
+usr/include/heimdal/heimntlm-protos.h usr/include/heimntlm-protos.h
+usr/include/heimdal/heimntlm.h usr/include/heimntlm.h
+usr/include/heimdal/hex.h usr/include/hex.h
+usr/include/heimdal/hx509-protos.h usr/include/hx509-protos.h
+usr/include/heimdal/hx509.h usr/include/hx509.h
+usr/include/heimdal/hx509_err.h usr/include/hx509_err.h
+usr/include/heimdal/k524_err.h usr/include/k524_err.h
+usr/include/heimdal/kadm5 usr/include/kadm5
+usr/include/heimdal/kafs.h usr/include/kafs.h
+usr/include/heimdal/kdc-protos.h usr/include/kdc-protos.h
+usr/include/heimdal/kdc.h usr/include/kdc.h
+usr/include/heimdal/krb5 usr/include/krb5
+usr/include/heimdal/krb5-private.h usr/include/krb5-private.h
+usr/include/heimdal/krb5-protos.h usr/include/krb5-protos.h
+usr/include/heimdal/krb5-types.h usr/include/krb5-types.h
+usr/include/heimdal/krb5.h usr/include/krb5.h
+usr/include/heimdal/krb5_asn1.h usr/include/krb5_asn1.h
+usr/include/heimdal/krb5_ccapi.h usr/include/krb5_ccapi.h
+usr/include/heimdal/krb5_err.h usr/include/krb5_err.h
+usr/include/heimdal/kx509_asn1.h usr/include/kx509_asn1.h
+usr/include/heimdal/otp.h usr/include/otp.h
+usr/include/heimdal/parse_bytes.h usr/include/parse_bytes.h
+usr/include/heimdal/parse_time.h usr/include/parse_time.h
+usr/include/heimdal/parse_units.h usr/include/parse_units.h
+usr/include/heimdal/pkcs12_asn1.h usr/include/pkcs12_asn1.h
+usr/include/heimdal/pkcs8_asn1.h usr/include/pkcs8_asn1.h
+usr/include/heimdal/pkcs9_asn1.h usr/include/pkcs9_asn1.h
+usr/include/heimdal/pkinit_asn1.h usr/include/pkinit_asn1.h
+usr/include/heimdal/resolve.h usr/include/resolve.h
+usr/include/heimdal/rfc2459_asn1.h usr/include/rfc2459_asn1.h
+usr/include/heimdal/roken usr/include/roken
+usr/include/heimdal/roken-common.h usr/include/roken-common.h
+usr/include/heimdal/roken.h usr/include/roken.h
+usr/include/heimdal/rtbl.h usr/include/rtbl.h
+usr/include/heimdal/sl.h usr/include/sl.h
+usr/include/heimdal/wind.h usr/include/wind.h
+usr/include/heimdal/wind_err.h usr/include/wind_err.h
+usr/include/heimdal/xdbm.h usr/include/xdbm.h
diff --git a/debian/heimdal-multidev.install b/debian/heimdal-multidev.install
new file mode 100644
index 0000000..9341e9b
--- /dev/null
+++ b/debian/heimdal-multidev.install
@@ -0,0 +1,4 @@
+usr/lib/*.ausr/lib/heimdal
+usr/lib/*.lausr/lib/heimdal
+usr/lib/*.sousr/lib/heimdal
+usr/include/*usr/include/heimdal

Reply via email to