[Pkg-haskell-commits] r962 - in /packages/haskelldb/trunk/debian: changelog control haskell-haskelldb-doc.doc-base haskelldb-doc.dirs haskelldb-doc.doc-base haskelldb-doc.docs patches/ patches/00list patches/01_update-cabal-file.dpatch rules

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Sun Jan 13 18:35:06 UTC 2008 

Author: arjan
Date: Sun Jan 13 18:35:06 2008
New Revision: 962

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=962
Log:
 r2449 at nebula:  arjan | 2008-01-13 19:33:14 +0100
 * Updated for GHC 6.8.2 and Cabal version 1.2.3.0:
   - debian/control:
     + Bump the build dependency on GHC to (>= 6.8.2) as we need a Cabal
       version >= 1.2
   - debian/patches/01_update-cabal-file.dpatch: 
     + Add directory, old-locale, old-time and pretty to the build
       dependecies.
     + Add FlexibleContexts, FlexibleInstances, FunctionalDependencies,
       PatternSignatures, RankNTypes, ScopedTypeVariables and
       TypeSynonymInstances to the list of needed Extensions.
   - Remove the haskelldb-bin binary package, which will now be build
   - Rename haskelldb-doc to haskell-haskelldb-doc so dh_haskell will
     detect it as an handled package and automatically generate the
     Haddock documentation.
   - Make haskelldb-doc an transitional package.
 * debian/watch: Update the uscan file to new upstream location.
   (Closes: #450071)
 

Added:
    packages/haskelldb/trunk/debian/haskell-haskelldb-doc.doc-base
      - copied, changed from r674, packages/haskelldb/trunk/debian/haskelldb-doc.doc-base
    packages/haskelldb/trunk/debian/patches/
    packages/haskelldb/trunk/debian/patches/00list
    packages/haskelldb/trunk/debian/patches/01_update-cabal-file.dpatch   (with props)
Removed:
    packages/haskelldb/trunk/debian/haskelldb-doc.dirs
    packages/haskelldb/trunk/debian/haskelldb-doc.doc-base
    packages/haskelldb/trunk/debian/haskelldb-doc.docs
Modified:
    packages/haskelldb/trunk/debian/changelog
    packages/haskelldb/trunk/debian/control
    packages/haskelldb/trunk/debian/rules

Modified: packages/haskelldb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/changelog?rev=962&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/changelog (original)
+++ packages/haskelldb/trunk/debian/changelog Sun Jan 13 18:35:06 2008
@@ -4,9 +4,19 @@
   * Because the Haskell library has been divided into a couple of Haskell
     libraries a couple of new Debian packages corresponding to the new
     libraries are introduced.
+  * Updated for GHC 6.8.2 and Cabal version 1.2.3.0:
+    - debian/control:
+      + Bump the build dependency on GHC to (>= 6.8.2) as we need a Cabal
+        version >= 1.2
+    - debian/patches/01_update-cabal-file.dpatch: 
+      + Add directory, old-locale, old-time and pretty to the build
+        dependecies.
+      + Add FlexibleContexts, FlexibleInstances, FunctionalDependencies,
+        PatternSignatures, RankNTypes, ScopedTypeVariables and
+        TypeSynonymInstances to the list of needed Extensions.
   * debian/control:
     - Remove all unneccesary build dependencies.
-    - Remove the haskelldb-bin binary package, which will now be build 
+    - Remove the haskelldb-bin binary package, which will now be build
       from haskelldb-dynamic source package.
     - Add Homepage field and use the official Vcs-* fields.
     - Bump build dependency on haskell-devscripts to 0.6.0 which ships
@@ -14,6 +24,10 @@
     - Bump Standards-Version to 3.7.3. No changes needed.
     - Make doc-base a Suggest instead of a Recommends.
     - Add ghc6-doc and libghc6-mtl-doc to the Recommends.
+    - Rename haskelldb-doc to haskell-haskelldb-doc so dh_haskell will
+      detect it as an handled package and automatically generate the
+      Haddock documentation.
+    - Make haskelldb-doc an transitional package.
   * debian/rules:
     - dh_haskell_install does not install empty directories anymore so no
       need to cleanup after it. It also adjusts the path to the
@@ -21,10 +35,10 @@
     - dh_haskell now handles the generating and installation of the
       haddock documentation so remove this code as well.
   * debian/mk-haskell-depends: Removed. Replaced by dh_haskell_depends.
-  * debian/watch: Update the uscan file to new upstream location. 
-    (Closes: #450071) 
- 
- -- Arjan Oosting <arjan at debian.org>  Thu, 10 Jan 2008 00:55:23 +0100
+  * debian/watch: Update the uscan file to new upstream location.
+    (Closes: #450071)
+  
+ -- Arjan Oosting <arjan at debian.org>  Sun, 13 Jan 2008 18:20:30 +0100
 
 haskelldb (0.9.cvs.601-18) unstable; urgency=low
 

Modified: packages/haskelldb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/control?rev=962&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/control (original)
+++ packages/haskelldb/trunk/debian/control Sun Jan 13 18:35:06 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Arjan Oosting <arjan at debian.org>
 Build-Depends: autotools-dev, dctrl-tools, debhelper (>= 5),
- dpatch, dpkg-dev (>= 0.13.19), ghc6 (>= 6.4.2), 
+ dpatch, dpkg-dev (>= 0.13.19), ghc6 (>= 6.8.2), 
  haskell-devscripts (>= 0.6.0), libghc6-mtl-dev, libghc6-mtl-prof
 Build-Depends-Indep: haddock, ghc6-doc, libghc6-mtl-doc
 Standards-Version: 3.7.3
@@ -14,7 +14,7 @@
 Package: libghc6-haskelldb-dev
 Section: libdevel
 Architecture: any
-Suggests: haskelldb-bin (= ${binary:Version}), haskelldb-doc (= ${source:Version})
+Suggests: haskelldb-bin (= ${binary:Version}), haskell-haskelldb-doc (= ${source:Version})
 Depends: ${haskell:Depends}, ${shlibs:Depends}
 Description: Haskell library for expressing database queries
  HaskellDB is library for expressing database queries and operations
@@ -26,6 +26,17 @@
  results as ordinary Haskell values.
 
 Package: haskelldb-doc
+Depends: haskell-haskelldb-doc
+Architecture: all
+Section: doc
+Description: transitional dummy package
+ This package is a dummy package and is used to easy the upgrade from
+ previous versions of haskelldb-doc to haskell-haskelldb-doc.
+ . 	 
+ This package can safely be removed.
+
+Package: haskell-haskelldb-doc
+Replaces: haskelldb-doc (<< 0.10-1)
 Architecture: all
 Section: doc
 Recommends: ghc6-doc, libghc6-mtl-doc

Copied: packages/haskelldb/trunk/debian/haskell-haskelldb-doc.doc-base (from r674, packages/haskelldb/trunk/debian/haskelldb-doc.doc-base)
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/haskell-haskelldb-doc.doc-base?rev=962&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/haskelldb-doc.doc-base (original)
+++ packages/haskelldb/trunk/debian/haskell-haskelldb-doc.doc-base Sun Jan 13 18:35:06 2008
@@ -5,5 +5,5 @@
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/haskelldb-doc/html/index.html
-Files: /usr/share/doc/haskelldb-doc/html/*.html
+Index: /usr/share/doc/haskell-haskelldb-doc/html/haskelldb/index.html
+Files: /usr/share/doc/haskell-haskelldb-doc/html/haskelldb/*.html

Added: packages/haskelldb/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/patches/00list?rev=962&op=file
==============================================================================
--- packages/haskelldb/trunk/debian/patches/00list (added)
+++ packages/haskelldb/trunk/debian/patches/00list Sun Jan 13 18:35:06 2008
@@ -1,0 +1,1 @@
+01_update-cabal-file

Added: packages/haskelldb/trunk/debian/patches/01_update-cabal-file.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/patches/01_update-cabal-file.dpatch?rev=962&op=file
==============================================================================
--- packages/haskelldb/trunk/debian/patches/01_update-cabal-file.dpatch (added)
+++ packages/haskelldb/trunk/debian/patches/01_update-cabal-file.dpatch Sun Jan 13 18:35:06 2008
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_update-cabal-file.dpatch by Arjan Oosting <arjan at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 at 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,

Propchange: packages/haskelldb/trunk/debian/patches/01_update-cabal-file.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/haskelldb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/rules?rev=962&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/rules (original)
+++ packages/haskelldb/trunk/debian/rules Sun Jan 13 18:35:06 2008
@@ -26,6 +26,7 @@
 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

More information about the Pkg-haskell-commits mailing list