change packaging to use python-support to build for the default python version

diff --git a/debian/changelog b/debian/changelog
index 38f5eb1..c47360c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+userdir-ldap (0.3.15) unstable; urgency=low
+
+  * userdir_gpg.py: fix RT #70 (sub-key support for mail gateway)
+  * change *PK* mechanism to Linux standard ! mechanism, and check for
+    it in the mail gateway for changes, too.
+  * change packaging to make use of python-support, simplyfing scripts
+    greatly.
+  * Remove obsolete ud-killcrypt that wouldn't work with modern ldap anyways.
+
+ -- Ryan Murray <rmurray@debian.org>  Sun, 12 Aug 2007 13:38:11 -0600
+
 userdir-ldap (0.3.14) unstable; urgency=low
 
   * ud-generate:

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5

diff --git a/debian/control b/debian/control
index 7faf8e6..b58a107 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: userdir-ldap
 Section: admin
 Priority: optional
 Maintainer: Debian Administration team <debian-admin@lists.debian.org>
-Build-Depends-Indep: debhelper, python2.4, python
+Build-Depends-Indep: debhelper, python-support
 Standards-Version: 3.5.8.0
 Uploaders: Ryan Murray <rmurray@debian.org>
 

diff --git a/debian/postinst b/debian/postinst
index 8cb20a6..e748473 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,27 +1,8 @@
 #! /bin/bash -e
 #
-# Debian postinst script for Python hierarchical modules
-# Written by Gregor Hoffleit <flight@debian.org>
-#
-
-PYTHON_VER="2.4"
-DIRLIST="/usr/lib/python$PYTHON_VER/site-packages"
-
-case "$1" in
-    configure|abort-upgrade|abort-remove|abort-deconfigure)
-        for i in $DIRLIST ; do
-            python -O /usr/lib/python$PYTHON_VER/compileall.py -q $i
-            python /usr/lib/python$PYTHON_VER/compileall.py -q $i
-        done
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
+#DEBHELPER#
 if [ "$1" = "configure" ]
 then
     test ! -f /usr/local/bin/ud-replicate || rm -f /usr/local/bin/ud-replicate
 fi
+exit 0

diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644 (file)
index d300f6c..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/bash -e
-#
-# Debian prerm script for Python hierarchical modules
-# Written by Gregor Hoffleit <flight@debian.org>
-#
-
-NAME=userdir-ldap
-
-dpkg --listfiles $NAME |
-       awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
-       xargs rm -f >&2
-
-if command -v install-docs >/dev/null 2>&1; then
-    install-docs -r $NAME
-fi

diff --git a/debian/python-dep b/debian/python-dep
deleted file mode 100644 (file)
index bc688ef..0000000
--- a/debian/python-dep
+++ /dev/null
@@ -1,6 +0,0 @@
-import sys;
-
-if sys.version[:3] != "1.5":
-       print "python:Depends=python (>= %s), python (<< %s)" % (sys.version[:3],float(sys.version[:3])+0.1)
-else:
-       print "python:Depends=python-base (>= 1.5) | python1.5"

diff --git a/debian/rules b/debian/rules
index b13c7ab..25ea778 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,9 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-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
+i:=./debian/$(package)
+pysite:=usr/share/python-support
 
 build:
        dh_testdir
@@ -50,11 +48,11 @@ binary-indep: build
 
        dh_installdocs
        dh_installchangelogs
-       dh_installmanpages
+       dh_installman
        dh_fixperms
        dh_compress
        dh_installdeb
-       $(PYTHON) debian/python-dep >> debian/substvars
+       dh_pysupport
        dh_gencontrol
 #      dh_makeshlibs
        dh_md5sums