[Lunar-commits] <moonbase> heimdal: Give a minute here.

[Dennis `stumbles` Veatch]

commit 9c7216d09fdfc607f2855309c05d40c56888eac8
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Mon Feb 15 20:29:39 2010 -0500

    heimdal: Give a minute here.
---
 crypto/heimdal/BUILD   |    3 ---
 crypto/heimdal/DETAILS |   11 -----------
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/crypto/heimdal/BUILD b/crypto/heimdal/BUILD
index c7855d1..b5e5aca 100644
--- a/crypto/heimdal/BUILD
+++ b/crypto/heimdal/BUILD
@@ -28,17 +28,14 @@
     mv -f /var/heimdal /var/lib/heimdal
   fi &&
 
-<<<<<<< HEAD
   # Change default datadir (hardcoded)
   sedit "s;var/heimdal;var/lib/heimdal;g" configure.in configure \
         doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
         lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5 &&
-=======
 
   patch_it $SOURCE2 1 &&
   patch_it $SOURCE3 1 &&
   patch_it $SOURCE4 1 &&
->>>>>>> 4c2e476... heimdal: Version bump to 1.2.1
 
   sh autogen.sh &&
 
diff --git a/crypto/heimdal/DETAILS b/crypto/heimdal/DETAILS
index 1ed649b..1fb29a6 100644
--- a/crypto/heimdal/DETAILS
+++ b/crypto/heimdal/DETAILS
@@ -1,16 +1,6 @@
           MODULE=heimdal
-<<<<<<< HEAD
          VERSION=1.3.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://www.h5l.org/dist/src
-      SOURCE_VFY=sha1:
-        WEB_SITE=http://www.h5l.org
-      MAINTAINER=ratler at lunar-linux.org
-         ENTERED=20041026
-         UPDATED=20100216
-=======
-         VERSION=1.1
-          SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-1.0.1-no_libss.patch
          SOURCE3=$MODULE-1.0.1-lpthreads.patch
          SOURCE4=$MODULE-1.1-rename_su.patch.bz2
@@ -26,7 +16,6 @@
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20041026
          UPDATED=20080517
->>>>>>> 4c2e476... heimdal: Version bump to 1.2.1
           SHORT="Heimdals kerberos 5 implementation"
 
 cat << EOF