X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=c7e4e71f9833419bb4b05d9434a472ddce815fc0;hb=d889e5903fc6da2f7ba081dca17c457a20db5fa0;hp=8af895b76d3505c1282050f9afafcc4fa3fd1674;hpb=7b229c4db5ae4d45dc08cc94c63460395f8e06f1;p=dak.git

diff --git a/debian/rules b/debian/rules
index 8af895b7..c7e4e71f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
+PYTHONVER := `/usr/bin/python -c 'import sys;print sys.version[:3]'`
+
 build: build-stamp
 build-stamp:
 	$(MAKE)
@@ -30,7 +32,7 @@ binary-indep: checkroot build
 	install -d debian/tmp/usr/bin/
 
 	install -m 755 andrea catherine charisma denise fernanda \
-		heidi jenna julia katie madison melanie natalie.py neve \
+		heidi jenna julia katie madison melanie natalie neve \
 		rene rhona shania tea ziyi debian/tmp/usr/bin/
 
 	# Compatability symlinks for people using old debs
@@ -43,12 +45,12 @@ binary-indep: checkroot build
 	ln -s neve debian/tmp/usr/bin/da_populate
 	ln -s rhona debian/tmp/usr/bin/da_clean
 	ln -s madison debian/tmp/usr/bin/da_chkver
-	ln -s natalie.py debian/tmp/usr/bin/da_override
+	ln -s natalie debian/tmp/usr/bin/da_override
 	ln -s melanie debian/tmp/usr/bin/da_remove
 	ln -s ziyi debian/tmp/usr/bin/da_mkrelease
 
-	install -d -m 755 debian/tmp/usr/lib/python1.5/site-packages/
-	install -m 644 db_access.py utils.py claire.py logging.py debian/tmp/usr/lib/python1.5/site-packages/
+	install -d -m 755 debian/tmp/usr/lib/python$(PYTHONVER)/site-packages/
+	install -m 644 db_access.py utils.py claire.py logging.py debian/tmp/usr/lib/python$(PYTHONVER)/site-packages/
 	install -d -m 755 debian/tmp/usr/share/man/man1/
 	install -m 644 docs/*.1 debian/tmp/usr/share/man/man1/
 	gzip -9v debian/tmp/usr/share/man/man1/*
@@ -70,6 +72,7 @@ binary-indep: checkroot build
 	gzip -9v debian/tmp/usr/share/doc/katie/examples/*
 
 	dpkg-shlibdeps sql-aptvc.so
+	/usr/bin/python debian/python-dep >> debian/substvars
 	dpkg-gencontrol -isp
 	chown -R root.root debian/tmp
 	chmod -R go=rX debian/tmp