add perl5 dep to quite lintian a fair bit, add libnet-ldap-perl suggests,

set python dep to something that works for both new and old python.

diff --git a/debian/control b/debian/control
index 8e64050..b233aa9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ 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, libdate-manip-perl, liburi-perl
+Depends: ${python:Depends}, python-ldap, perl5
+Suggests: libnet-ldap-perl, libcrypt-blowfish-perl, gnupg, python-net, python-gdbm, libdate-manip-perl, liburi-perl, libnet-ldap-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 2948e85..61114aa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,11 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-package=userdir-ldap
-pyversion=1.5
-i=./debian/tmp
-pysite=usr/lib/python$(pyversion)/site-packages
+PYTHON:=/usr/bin/python
+package:=userdir-ldap
+pyversion:=`$(PYTHON) -c 'import sys; print sys.version[:3]'`
+i:=./debian/tmp
+pysite:=usr/lib/python$(pyversion)/site-packages
 
 build:
        dh_testdir
@@ -59,6 +60,7 @@ binary-indep: build
        dh_fixperms --exclude=web-cookies
        dh_compress
        dh_installdeb
+       $(PYTHON) debian/python-dep >> debian/substvars
        dh_gencontrol
 #      dh_makeshlibs
        dh_md5sums