* Go back to using krb5-config. The dependency problem has now been

  fixed on all platforms in the krb5 package and this is the preferred
  upstream method.

diff --git a/debian/changelog b/debian/changelog
index 08c86763bdc49d69d564a1aa50cd2e740babe62f..bb5a51e90381e75785481b9e3a546a24f2b971cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openafs (1.4.4.dfsg1-4) UNRELEASED; urgency=low
+
+  * Go back to using krb5-config.  The dependency problem has now been
+    fixed on all platforms in the krb5 package and this is the preferred
+    upstream method.
+
+ -- Russ Allbery <rra@debian.org>  Sat, 19 May 2007 22:01:00 -0700
+
 openafs (1.4.4.dfsg1-3) unstable; urgency=low
 
   * Always generate a UUID on client startup even if for some reason we

diff --git a/debian/rules b/debian/rules
index f52311d8f72a2d54ac5eb27ec87c3e168075d403..f03a84f5e46c9124990e8a5c9054be7f4b5e7a67 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,22 +85,20 @@ get-orig-source:
        rm -r openafs_$(DEBVERS).orig
        gzip -9 openafs_$(DEBVERS).orig.tar
 
-# Manually set --with-krb5 and the environment variables since krb5-config
-# adds a variety of other stuff we don't want.  This may soon be fixed in
-# Debian unstable, but this is the most reliable approach.
 configure: configure-stamp
 configure-stamp:
        @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi
        dh_testdir
        sh regen.sh
        afslogsdir=/var/log/openafs afslocaldir=/etc/openafs/server-local \
-           KRB5CFLAGS=' ' KRB5LIBS='-lkrb5 -lcom_err' sh configure \
+           sh configure \
            --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
            --prefix=/usr --mandir=\$${prefix}/share/man \
            --sysconfdir=/etc --libexecdir=/usr/lib \
            --localstatedir=/var/lib --enable-supergroups \
            --enable-largefile-fileserver --enable-debug --enable-lwp-debug \
-           --with-krb5 $(DEBIAN_OPT_FLAGS) $(SYSTEM)
+           --with-krb5-conf=/usr/bin/krb5-config \
+           $(DEBIAN_OPT_FLAGS) $(SYSTEM)
        chmod a+x src/libafs/make_kbuild_makefile.pl         
        touch configure-stamp