haskelldb: Update packaging to current common practice

6 files changed, 20 insertions, 122 deletions

diff --git a/p/haskelldb/debian/changelog b/p/haskelldb/debian/changelog
index 6fcd46fd9..eb3b0b991 100644
--- a/p/haskelldb/debian/changelog
+++ b/p/haskelldb/debian/changelog
@@ -7,6 +7,7 @@ haskelldb (0.12-1) UNRELEASED; urgency=low
 
   [ Joachim Breitner ]
   * New upstream release.
+  * Update packaging to current common practice
 
  -- Joachim Breitner <nomeata@debian.org>  Tue, 08 Sep 2009 18:21:59 +0200
 
diff --git a/p/haskelldb/debian/compat b/p/haskelldb/debian/compat
index 7ed6ff82d..7f8f011eb 100644
--- a/p/haskelldb/debian/compat
+++ b/p/haskelldb/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/p/haskelldb/debian/control b/p/haskelldb/debian/control
index cc85761fc..5c772b31f 100644
--- a/p/haskelldb/debian/control
+++ b/p/haskelldb/debian/control
@@ -1,27 +1,26 @@
 Source: haskelldb
-Section: devel
+Section: haskell
 Priority: optional
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5)
- , dpatch
+Uploaders: Joachim Breitner <nomeata@debian.org>
+Build-Depends: debhelper (>= 8)
+ , cdbs
+ , haskell-devscripts
  , dpkg-dev (>= 0.13.19)
- , ghc6 (>= 6.8.2)
- , haskell-devscripts (>= 0.6.0)
+ , ghc6 (>= 6.10)
  , libghc6-mtl-dev
-Build-Depends-Indep: haddock
+ , haddock
+ , hscolour
  , ghc6-doc
  , libghc6-mtl-doc
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Homepage: http://haskelldb.sourceforge.net/
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskelldb/
 
 Package: libghc6-haskelldb-dev
-Section: libdevel
 Architecture: any
-Suggests: haskelldb-bin
- , haskell-haskelldb-doc (= ${source:Version})
-Depends: ${haskell:Depends}
- , ${shlibs:Depends}
+Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: ${haskell:Suggests}
 Description: Haskell library for expressing database queries
  HaskellDB is library for expressing database queries and operations
  in a type safe and declarative way. This package contains the library
@@ -45,9 +44,9 @@ Package: haskell-haskelldb-doc
 Replaces: haskelldb-doc (<< 0.10-1)
 Architecture: all
 Section: doc
-Recommends: ghc6-doc
- , libghc6-mtl-doc
-Suggests: doc-base
+Depends: ${haskell:Depends}
+Suggests: ${haskell:Suggests}
+Recommends: ${haskell:Recommends}
 Description: API documentation of haskelldb
  The API documentation of HaskellDB, a Haskell library for expressing
  database queries and operations in a type safe and declarative way.
diff --git a/p/haskelldb/debian/patches/00list b/p/haskelldb/debian/patches/00list
deleted file mode 100644
index 16fdbe527..000000000
--- a/p/haskelldb/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_update-cabal-file
diff --git a/p/haskelldb/debian/patches/01_update-cabal-file.dpatch b/p/haskelldb/debian/patches/01_update-cabal-file.dpatch
deleted file mode 100755
index cffccd5b7..000000000
--- a/p/haskelldb/debian/patches/01_update-cabal-file.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_update-cabal-file.dpatch by Arjan Oosting <arjan@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad haskelldb~/haskelldb.cabal haskelldb/haskelldb.cabal
---- haskelldb~/haskelldb.cabal	2008-01-13 18:57:06.000000000 +0100
-+++ haskelldb/haskelldb.cabal	2008-01-13 18:58:05.000000000 +0100
-@@ -4,11 +4,18 @@
- Maintainer: haskelldb-users@lists.sourceforge.net
- Author: Daan Leijen, Conny Andersson, Martin Andersson, Mary Bergman, Victor Blomqvist, Bjorn Bringert, Anders Hockersten, Torbjorn Martin, Jeremy Shaw
- License: BSD3
--build-depends: haskell98, base, mtl
-+build-depends: haskell98, base, directory, mtl, old-locale, old-time, pretty
- Extensions: ExistentialQuantification,
-             OverlappingInstances,
-             UndecidableInstances,
-             MultiParamTypeClasses
-+            PatternSignatures
-+	    ScopedTypeVariables
-+            FunctionalDependencies
-+            TypeSynonymInstances
-+            FlexibleInstances
-+            RankNTypes
-+            FlexibleContexts
- Synopsis: SQL unwrapper for Haskell.
- Exposed-Modules:
-         Database.HaskellDB,
diff --git a/p/haskelldb/debian/rules b/p/haskelldb/debian/rules
index 0af02701c..3ce13cbf0 100755
--- a/p/haskelldb/debian/rules
+++ b/p/haskelldb/debian/rules
@@ -1,78 +1,7 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-#
-# Based on dh-make template containing work of Joey Hess, Craig Small
-# and Bill Allombert.
-#
 
-# Include dpatch
-include /usr/share/dpatch/dpatch.make
+DEB_BUILD_DEPENDENCIES = build-arch
+DEB_HADDOCK_HTML_DIR = /usr/share/doc/haskell-$(CABAL_PACKAGE)-doc/html/
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-setup: patch-stamp
-	dh_testdir
-	ghc --make Setup -o setup -package Cabal
-
-build: build-stamp
-build-stamp: setup
-	touch $@
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	if [ -x setup ] && [ -e .setup-config ]; then ./setup clean ; fi
-	rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html
-	dh_clean
-
-install: install-arch install-indep
-install-arch: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-	dh_haskell -s
-	dh_install -s
-
-install-indep: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-	dh_haskell -i
-	dh_install -i
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_strip
-	dh_compress -X.haddock
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_haskell_depends
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: binary binary-arch binary-indep build clean clean-patched install install-arch install-indep
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk