packaging updates

diff --git a/debian/changelog b/debian/changelog
index a9d41078ef84dc5bbe20a290e1153f4d4b012eeb..8bac9e0238abec785d8ef55c1351f177ddd25546 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
-katie (0.0-0) unstable; urgency=low
+katie (0notforuse0-0) unstable; urgency=low
 
   * Initial non-release.  [The packaging is nowhere near complete; don't bother trying to use it unaltered.]
 
- -- James Troup <james@nocrew.org>  Fri, 29 Sep 2000 01:19:17 +0100
+ -- James Troup <james@nocrew.org>  Tue, 25 Sep 2001 22:59:17 +0100
+
 
-Local variables:
-mode: debian-changelog
-End:

diff --git a/debian/control b/debian/control
index ad77c83677e5bf3a707db577ef23721d6c1a7c4a..f0abbbdbb029401e6b1be5199ff5bf0c4d634cbc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: misc
 Priority: extra
 Build-Depends: postgresql-dev, libapt-pkg-dev, sp, docbook, docbook2man
 Maintainer: James Troup <james@nocrew.org>
-Standards-Version: 3.2.1
+Standards-Version: 3.5.6.0
 
 Package: katie
-Architecture: all
+Architecture: any
 Depends: python, python-pygresql, python-zlib, python-apt, apt-utils, gnupg (>= 1.0.6-1), postgresql (>= 7.1.0), ${shlibs:Depends}
 Suggests: lintian, binutils-multiarch, symlinks
 Description: Debian's archive maintenance scripts

diff --git a/debian/postinst b/debian/postinst
index cb8cb1b140fe03af9751336478b09fdaf3ef80ba..1f309d97f92cd31d5e1a08f857c2d7e44e31189c 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,4 +7,7 @@ if [ "$1" = "configure" ]; then
           -a -d /usr/share/doc/katie ]; then
               ln -sf ../share/doc/katie /usr/doc/katie
       fi
+      # Default (blank) files so that programs at least run --help and stuff
+      touch /etc/katie/katie.conf
+      touch /etc/katie/apt.conf
 fi

diff --git a/debian/rules b/debian/rules
index 48943655c33d25c192b38c54f219491ca0f2c5cd..8af895b76d3505c1282050f9afafcc4fa3fd1674 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # debian/rules file - for Katie (0.0)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
-# Copyright 1998,1999,2000 James Troup
+# Copyright 1998,1999,2000,2001 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
@@ -12,6 +12,7 @@
 build: build-stamp
 build-stamp:
        $(MAKE)
+       $(MAKE) -C docs
        touch $@
 
 clean: checkroot
@@ -28,10 +29,11 @@ binary-indep: checkroot build
 
        install -d debian/tmp/usr/bin/
 
-       install -m 755 katie jenna heidi catherine charisma neve rhona \
-               madison natalie.py melanie ziyi shania fernanda rene tea \
-               debian/tmp/usr/bin/
+       install -m 755 andrea catherine charisma denise fernanda \
+               heidi jenna julia katie madison melanie natalie.py 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
@@ -47,13 +49,12 @@ binary-indep: checkroot build
 
        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/share/man/man1/        
-       install -m 644 docs/katie.1 debian/tmp/usr/share/man/man1/da_install.1
-       install -m 644 docs/natalie.1 debian/tmp/usr/share/man/man1/da_override.1
-       install -m 644 docs/melanie.1 debian/tmp/usr/share/man/man1/da_remove.1
-       install -m 644 docs/catherine.1 debian/tmp/usr/share/man/man1/da_poolize.1
+       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/*
 
+       install -d -m 755 debian/tmp/etc/katie/
+
        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/
@@ -62,6 +63,12 @@ binary-indep: checkroot build
        gzip -9v debian/tmp/usr/share/doc/katie/*
        install -m 644 debian/copyright debian/tmp/usr/share/doc/katie/
 
+       install -d debian/tmp/usr/share/doc/katie/examples/
+       install -m 644 examples/katie.conf debian/tmp/usr/share/doc/katie/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/*
+
        dpkg-shlibdeps sql-aptvc.so
        dpkg-gencontrol -isp
        chown -R root.root debian/tmp