Update for renamed and relayedout scripts. Don't install removed prerm. Use helper...

diff --git a/debian/rules b/debian/rules
index 256c40a0eca1c6ba29ecda1d0721d32a157eab92..2e7bbc8b521d4bf823783c7f59b1b53829890688 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-# debian/rules file - for Katie (0.0)
+# debian/rules file - for dak (0.0)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
-# Copyright 1998,1999,2000,2001,2002 James Troup
+# Copyright 1998,1999,2000,2001,2002,2006 James Troup
 # I hereby give you perpetual unlimited permission to copy,
 # modify and relicense this file, provided that you do not remove
 # my name from the file itself.  (I assert my moral right of
@@ -11,6 +11,11 @@
 
 PYTHONVER := `/usr/bin/python -c 'import sys;print sys.version[:3]'`
 
+install_dir=install -d -m 755
+install_file=install -m 644
+install_script=install -m 755
+install_binary=install -m 755 -s
+
 build: build-stamp
 build-stamp:
        $(MAKE)
@@ -26,50 +31,37 @@ binary-indep: checkroot build
        $(checkdir)
        -rm -rf debian/tmp
 
-       install -d debian/tmp/DEBIAN/
-       install -m 755 debian/prerm debian/postinst debian/tmp/DEBIAN/
-
-       install -d debian/tmp/usr/bin/
-
-       install -m 755 andrea catherine charisma denise fernanda \
-               heidi jenna julia katie madison melanie natalie neve \
-               rene rhona shania tea ziyi debian/tmp/usr/bin/
-
-       # Compatability symlinks for people using old debs
-       ln -s katie debian/tmp/usr/bin/da_install
-       ln -s katie debian/tmp/usr/bin/dinstall
-       ln -s jenna debian/tmp/usr/bin/da_mkfilelist
-       ln -s heidi debian/tmp/usr/bin/da_tags
-       ln -s catherine debian/tmp/usr/bin/da_poolize
-       ln -s charisma debian/tmp/usr/bin/da_mkmaintainers
-       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 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/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/
+       $(install_dir) debian/tmp/DEBIAN/
+       $(install_script) debian/postinst debian/tmp/DEBIAN/
+
+       $(install_dir) debian/tmp/usr/lib/python/site-packages/dak/lib/
+
+       $(install_file) dak/*.py debian/tmp/usr/lib/python/site-packages/dak/
+       $(install_file) dak/lib/*.py debian/tmp/usr/lib/python/site-packages/dak/lib/
+
+
+       $(install_dir) debian/tmp/usr/bin/
+       $(install_script) dak/shell.py debian/tmp/usr/bin/dak
+
+       $(install_dir) -m 755 debian/tmp/usr/share/man/man1/
+       $(install_file) docs/manpages/*.1 debian/tmp/usr/share/man/man1/
        gzip -9v debian/tmp/usr/share/man/man1/*
 
-       install -d -m 755 debian/tmp/etc/katie/
+       $(install_dir) -m 755 debian/tmp/etc/dak/
 
-       install -d debian/tmp/usr/share/doc/katie/
-       install -m 644 debian/changelog debian/tmp/usr/share/doc/katie/changelog.Debian
-       install -m 644 README NEWS THANKS TODO debian/tmp/usr/share/doc/katie/
-       install -m 644 docs/README* debian/tmp/usr/share/doc/katie/
-       install -m 644 ChangeLog debian/tmp/usr/share/doc/katie/changelog
-       gzip -9v debian/tmp/usr/share/doc/katie/*
-       install -m 644 debian/copyright debian/tmp/usr/share/doc/katie/
+       $(install_dir) debian/tmp/usr/share/doc/dak/
+       $(install_file) debian/changelog debian/tmp/usr/share/doc/dak/changelog.Debian
+       $(install_file) README NEWS THANKS TODO debian/tmp/usr/share/doc/dak/
+       $(install_file) docs/README* debian/tmp/usr/share/doc/dak/
+       $(install_file) ChangeLog debian/tmp/usr/share/doc/dak/changelog
+       gzip -9v debian/tmp/usr/share/doc/dak/*
+       $(install_file) debian/copyright debian/tmp/usr/share/doc/dak/
 
-       install -d debian/tmp/usr/share/doc/katie/examples/
-       install -m 644 examples/katie.conf debian/tmp/usr/share/doc/katie/examples/
+       $(install_dir) debian/tmp/usr/share/doc/dak/examples/
+       $(install_file) examples/dak.conf debian/tmp/usr/share/doc/dak/examples/
        # Hoho (err, rather: FIXME)
-       install -m 644 *.sql debian/tmp/usr/share/doc/katie/examples/
-       gzip -9v debian/tmp/usr/share/doc/katie/examples/*
+       $(install_file) *.sql debian/tmp/usr/share/doc/dak/examples/
+       gzip -9v debian/tmp/usr/share/doc/dak/examples/*
 
        dpkg-shlibdeps sql-aptvc.so
        /usr/bin/python debian/python-dep >> debian/substvars
@@ -81,7 +73,7 @@ binary-indep: checkroot build
 binary-arch:
 
 define checkdir
-       test -f katie -a -f debian/rules
+       test -f dak/ls.py -a -f debian/rules
 endef
 
 # Below here is fairly generic really