haskell-pqueue: Fix up cabal-debian output.

4 files changed, 42 insertions, 24 deletions

diff --git a/p/haskell-pqueue/debian/changelog b/p/haskell-pqueue/debian/changelog
index 6a82791c5..e156a8e2c 100644
--- a/p/haskell-pqueue/debian/changelog
+++ b/p/haskell-pqueue/debian/changelog
@@ -1,5 +1,5 @@
-haskell-pqueue (1.3.1-1) UNRELEASED; urgency=low
+haskell-pqueue (1.3.1-1) unstable; urgency=low
 
   * Initial release
 
- -- Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>  Wed, 16 Mar 2016 21:24:02 +0100
+ -- Sven Bartscher <sven.bartscher@weltraumschlangen.de>  Thu, 17 Mar 2016 18:30:46 +0100
diff --git a/p/haskell-pqueue/debian/control b/p/haskell-pqueue/debian/control
index 72a36781c..7ec01d391 100644
--- a/p/haskell-pqueue/debian/control
+++ b/p/haskell-pqueue/debian/control
@@ -3,22 +3,14 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.or
 Priority: extra
 Section: haskell
 Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.9),
- cdbs,
+ dh-haskell (>= 0.1),
  ghc,
  ghc-prof,
- libghc-base-dev (>= 4),
- libghc-base-dev (<< 4.9),
- libghc-base-prof,
- libghc-deepseq-dev,
- libghc-deepseq-prof,
 Build-Depends-Indep: ghc-doc,
- libghc-base-doc,
- libghc-deepseq-doc,
 Standards-Version: 3.9.6
 Homepage: http://hackage.haskell.org/package/pqueue
-Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-pqueue
-Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-pqueue
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git
 X-Description: Reliable, persistent, fast priority queues.
  A fast, reliable priority queue implementation based on a binomial heap.
 
diff --git a/p/haskell-pqueue/debian/copyright b/p/haskell-pqueue/debian/copyright
index aa24d0232..4c5baffc2 100644
--- a/p/haskell-pqueue/debian/copyright
+++ b/p/haskell-pqueue/debian/copyright
@@ -5,13 +5,42 @@ Upstream-Contact: Lennart Spitzner <lsp@informatik.uni-kiel.de>
 Source: https://hackage.haskell.org/package/pqueue
 
 Files: *
-Copyright: (No copyright field in cabal file)
-License: BSD3
+Copyright: 2010 Louis Wasserman
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: held by the contributors mentioned in debian/changelog
-License: BSD3
+License: BSD-3-clause
 
-License: BSD3
- Copyright Louis Wasserman 2010
- BSD license
+License: BSD-3-clause
+  Copyright (c) 2010, Louis Wasserman
+  All rights reserved.
+  .
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  .
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  .
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the
+  distribution.
+  .
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/p/haskell-pqueue/debian/rules b/p/haskell-pqueue/debian/rules
index ccd0f0173..ef7d68708 100755
--- a/p/haskell-pqueue/debian/rules
+++ b/p/haskell-pqueue/debian/rules
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
 
-DEB_CABAL_PACKAGE = pqueue
-DEB_DEFAULT_COMPILER = ghc
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/hlibrary.mk
+%:
+	dh $@ --with haskell --buildsystem=haskell