"Update" Debian packaging

Whilst the packaging is obviously not for use, I'm finding it extremely
useful at least having the Build-Depends at a point where it will run the
tests.

It might be tempting to remove debian/ entirely, but Build-Depends is
just too useful for specifying, well, dependencies that tools such as
mk-build-deps can consume just like other packages.

Signed-off-by: Chris Lamb <lamby@debian.org>

diff --git a/debian/changelog b/debian/changelog
index 5213b3577e8b5bc07eebf63ef80ddab088d7df29..c126f3f57545e3573b58a30aff3380229ce4f0ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
-dak (0notforuse0-0) unstable; urgency=low
+dak (0notforuse0) 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>  Tue, 16 May 2006 21:55:42 -0500
-
-

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

diff --git a/debian/control b/debian/control
index 0402264bcdee6b8867192897185500c7e6a8f22a..f9a5e713cf6f8e518249f7797dcd927538a4c902 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,39 @@
 Source: dak
 Section: misc
 Priority: extra
-Build-Depends: python-all-dev
+Build-Depends: python-all-dev,
+               python-apt,
+               python-debian,
+               python-debianbts,
+               python-ldap,
+               python-psycopg2,
+               python-rrdtool,
+               python-sqlalchemy (<< 1.0),
+               python-yaml
 Maintainer: Debian FTP-Masters <ftpmaster@debian.org>
-Uploaders: Mark Hymers <mhy@debian.org>, Joerg Jaspert <joerg@debian.org>, Torsten Werner <twerner@debian.org>
-Standards-Version: 3.9.2
+Uploaders: Mark Hymers <mhy@debian.org>,
+           Joerg Jaspert <joerg@debian.org>,
+           Torsten Werner <twerner@debian.org>
+Standards-Version: 3.9.6.0
 
 Package: dak
 Architecture: all
-Depends: ${python:Depends}, python-psycopg2, python-sqlalchemy, python-apt,
-         gnupg, dpkg-dev, lintian, binutils-multiarch, python-yaml, less,
-         python-ldap, python-pyrss2gen, python-rrdtool, symlinks
+Depends: binutils-multiarch,
+         dpkg-dev,
+         gnupg,
+         less,
+         lintian,
+         python-apt,
+         python-debian,
+         python-debianbts,
+         python-ldap,
+         python-psycopg2,
+         python-pyrss2gen,
+         python-rrdtool,
+         python-sqlalchemy (<< 1.0),
+         python-yaml,
+         symlinks,
+         ${python:Depends}
 Description: Debian's archive maintenance scripts
  This is a collection of archive maintenance scripts used by the
  Debian project.

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index cda93b0..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-      # Default (blank) files so that programs at least run --help and stuff
-      touch /etc/dak/dak.conf
-fi

diff --git a/debian/python-dep b/debian/python-dep
deleted file mode 100644 (file)
index 27ca72f..0000000
--- a/debian/python-dep
+++ /dev/null
@@ -1,3 +0,0 @@
-import sys;
-
-print "python:Depends=python (>= %s), python (<< %s)" % (sys.version[:3],float(sys.version[:3])+0.1)

diff --git a/debian/rules b/debian/rules
index 2e7bbc8b521d4bf823783c7f59b1b53829890688..0a7139dda3f503b10903693814ce3472514b6b78 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,87 +1,9 @@
 #!/usr/bin/make -f
-# 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,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
-# 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]'`
+%:
+       dh $@
 
-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)
-       $(MAKE) -C docs
-       touch $@
-
-clean: checkroot
-       $(checkdir)
-       -rm -rf debian/tmp debian/*~ debian/files* debian/substvars build-stamp
-       $(MAKE) clean
-
-binary-indep: checkroot build
-       $(checkdir)
-       -rm -rf debian/tmp
-
-       $(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_dir) -m 755 debian/tmp/etc/dak/
-
-       $(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_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_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
-       dpkg-gencontrol -isp
-       chown -R root.root debian/tmp
-       chmod -R go=rX debian/tmp
-       dpkg --build debian/tmp ..
-
-binary-arch:
-
-define checkdir
-       test -f dak/ls.py -a -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary:        binary-indep binary-arch
-
-checkroot:
-       $(checkdir)
-       test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+       tests/test_all.py
+endif

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)