Branch: master

145fb69e 2015-09-27 15:12:07 Timothy Pearson
Allow heimdal kerberos to be installed with the tdelibs dev packages on Debian and Ubuntu
M debian/lenny/tdelibs/debian/control
M debian/lenny/tdelibs/debian/control.in
M debian/squeeze/tdelibs/debian/control
M debian/squeeze/tdelibs/debian/control.in
M ubuntu/maverick/tdelibs/debian/control
M ubuntu/maverick/tdelibs/debian/control.in
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index b865ecd..d660dcd 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -84,7 +84,7 @@
 Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 4:14.0.0~),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
diff --git a/debian/lenny/tdelibs/debian/control.in b/debian/lenny/tdelibs/debian/control.in
index efc66b1..fa8b2be 100644
--- a/debian/lenny/tdelibs/debian/control.in
+++ b/debian/lenny/tdelibs/debian/control.in
@@ -79,7 +79,7 @@
 Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index b865ecd..d660dcd 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -84,7 +84,7 @@
 Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 4:14.0.0~),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
diff --git a/debian/squeeze/tdelibs/debian/control.in b/debian/squeeze/tdelibs/debian/control.in
index efc66b1..fa8b2be 100644
--- a/debian/squeeze/tdelibs/debian/control.in
+++ b/debian/squeeze/tdelibs/debian/control.in
@@ -79,7 +79,7 @@
 Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 0f7967d..a8f10f1 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -84,7 +84,7 @@
 Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 4:14.0.0~),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
diff --git a/ubuntu/maverick/tdelibs/debian/control.in b/ubuntu/maverick/tdelibs/debian/control.in
index efc66b1..fa8b2be 100644
--- a/ubuntu/maverick/tdelibs/debian/control.in
+++ b/ubuntu/maverick/tdelibs/debian/control.in
@@ -79,7 +79,7 @@
 Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,