Changeset 24108

Timestamp:

10/20/09 12:17:33 (5 weeks ago)

Author:

broder

Message:

Use the same logic for determining at build time whether to configure
krb4 as is used in the postinst for determining whether to keep krb4
configured.

Otherwise systems (such as Karmic) which don't have krb4, but do come
with a krb4-config, would install the transformed files and then
immediately undo the transformations on upgrades.

Location:

trunk/debathena/config/kerberos-config/debian

Files:

• control.in (modified) (1 diff)
• rules (modified) (1 diff)

trunk/debathena/config/kerberos-config/debian/control.in

@@ -3 +3 @@
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, krb5-config, debathena-maybe-krb4-config, debathena-maybe-apparmor, debathena-cups
+Build-Depends: @cdbs@, krb5-clients, krb5-config, debathena-maybe-krb4-config, debathena-maybe-apparmor, debathena-cups
 Standards-Version: 3.7.2
 

trunk/debathena/config/kerberos-config/debian/rules

@@ -6 +6 @@
 DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.debathena = \
         /usr/share/kerberos-configs/krb5.conf.template
-ifneq ($(wildcard /usr/share/kerberos-configs/krb.conf.template),)
+
+KRB5_VERSION="$(shell dpkg-query -W -f '${Version}' krb5-clients)"
+ifeq ($(shell dpkg --compare-versions $(KRB5_VERSION) '<<' '1.7~' && echo y),y)
     DEB_TRANSFORM_FILES_debathena-kerberos-config += \
         /etc/krb.conf.debathena \