From 1d6764209f4358ae4c81893df5a6c18391d37d12 Mon Sep 17 00:00:00 2001
From: rmurray <>
Date: Mon, 3 Dec 2001 04:02:00 +0000
Subject: [PATCH] some FHS cleanups

---
 debian/changelog |  7 +++++++
 debian/control   |  2 +-
 debian/rules     | 12 ++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85c272f..5508f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userdir-ldap (0.3) unstable; urgency=low
+
+  * Only use sshrsa{host,}key variable, and store all three types of keys
+    in that attribute.
+
+ -- Jason Gunthrope <jgg@debian.org>  Sun,  2 Dec 2001 20:21:26 -0800
+
 userdir-ldap (0.2) unstable; urgency=low
 
   * What the hey, a new version number.
diff --git a/debian/control b/debian/control
index e9d208d..8e64050 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 2.5.0.0
 Package: userdir-ldap
 Architecture: all
 Depends: python-base (>= 1.5), python-ldap
-Suggests: libnet-ldap-perl, libcrypt-blowfish-perl, gnupg, python-net, python-gdbm
+Suggests: libnet-ldap-perl, libcrypt-blowfish-perl, gnupg, python-net, python-gdbm, libdate-manip-perl, liburi-perl
 Description: Login User Directory in LDAP support scripts
   These scripts simplifiy the creation and management of a LDAP based user
   directory. Included are scripts to import existing passwd, group and shadow
diff --git a/debian/rules b/debian/rules
index 2250e34..2948e85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,12 @@ clean:
 
 instdirs = \
 	usr/bin \
-	usr/man/man1 \
+	usr/share/man/man1 \
 	$(pysite)/userdir_ldap \
 	var/www/userdir-ldap \
 	var/cache/userdir-ldap/web-cookies \
 	var/cache/userdir-ldap/hosts \
-	usr/doc/$(package)/samples \
+	usr/share/doc/$(package)/samples \
 	etc/userdir-ldap/templates
 
 binary-indep: build
@@ -47,11 +47,11 @@ binary-indep: build
 	chown www-data.www-data $(i)/var/cache/userdir-ldap/web-cookies/
 	chmod u=rwx,g=,o= $(i)/var/cache/userdir-ldap/web-cookies/
 	
-	install -m 644 doc/{apache-config.txt,slapd-config.txt} $(i)/usr/doc/$(package)
-	install -m 644 doc/samples/ud-* $(i)/usr/doc/$(package)/samples
-	gzip -9 $(i)/usr/doc/$(package)/*.txt
+	install -m 644 doc/{apache-config.txt,slapd-config.txt} $(i)/usr/share/doc/$(package)
+	install -m 644 doc/samples/ud-* $(i)/usr/share/doc/$(package)/samples
+	gzip -9 $(i)/usr/share/doc/$(package)/*.txt
 	install -m 644 userdir-ldap.conf $(i)/etc/userdir-ldap/
-	echo "# See /usr/doc/userdir-ldap" > $(i)/etc/userdir-ldap/generate.conf
+	echo "# See /usr/share/doc/userdir-ldap" > $(i)/etc/userdir-ldap/generate.conf
 	chmod 644 $(i)/etc/userdir-ldap/generate.conf
 	install -m 644 templates/*-* $(i)/etc/userdir-ldap/templates/
 	
-- 
2.20.1