[Pkg-haskell-commits] r1024 - in /packages/haskelldb-hsql/trunk/debian: ./ patches/

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Sun Jan 27 13:36:25 UTC 2008


Author: arjan
Date: Sun Jan 27 13:36:25 2008
New Revision: 1024

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1024
Log:
 r2549 at nebula:  arjan | 2008-01-21 07:01:05 +0100
  * Bump build dependency on libghc6-hsql-dev to >= 1.7 and drop the 01_fix-compilation patch.
  * We use haskell-devscripts >= 0.6 so:
    - Remove debhelper files no longer needed
    - Remove debian/mk-haskell-depends

Added:
    packages/haskelldb-hsql/trunk/debian/haskell-haskelldb-hsql-doc.doc-base
      - copied, changed from r935, packages/haskelldb-hsql/trunk/debian/haskelldb-hsql-doc.doc-base
    packages/haskelldb-hsql/trunk/debian/patches/01_update-cabal-file.dpatch   (with props)
Removed:
    packages/haskelldb-hsql/trunk/debian/haskelldb-hsql-dev.dirs
    packages/haskelldb-hsql/trunk/debian/haskelldb-hsql-dev.install
    packages/haskelldb-hsql/trunk/debian/haskelldb-hsql-doc.dirs
    packages/haskelldb-hsql/trunk/debian/haskelldb-hsql-doc.doc-base
    packages/haskelldb-hsql/trunk/debian/haskelldb-hsql-doc.docs
    packages/haskelldb-hsql/trunk/debian/mk-haskell-depends
    packages/haskelldb-hsql/trunk/debian/patches/01_fix-compilation.dpatch
Modified:
    packages/haskelldb-hsql/trunk/debian/control
    packages/haskelldb-hsql/trunk/debian/patches/00list

Modified: packages/haskelldb-hsql/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-hsql/trunk/debian/control?rev=1024&op=diff
==============================================================================
--- packages/haskelldb-hsql/trunk/debian/control (original)
+++ packages/haskelldb-hsql/trunk/debian/control Sun Jan 27 13:36:25 2008
@@ -3,11 +3,12 @@
 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), 
- haskell-devscripts (>= 0.5.6), libghc6-haskelldb-dev,
- libghc6-hsql-dev, libghc6-mtl-dev
-Build-Depends-Indep: haddock, ghc6-doc, haskelldb-doc, libghc6-mtl-doc
-Standards-Version: 3.7.2
+ dpatch, dpkg-dev (>= 0.13.19), ghc6 (>= 6.8.2), 
+ haskell-devscripts (>= 0.6.0), libghc6-haskelldb-dev,
+ libghc6-hsql-dev (>= 1.7), libghc6-mtl-dev
+Build-Depends-Indep: haddock, ghc6-doc, haskell-haskelldb-doc,
+ haskell-hsql-doc, libghc6-mtl-doc
+Standards-Version: 3.7.3
 Homepage: http://haskelldb.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskelldb-hdbc
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-hdbc
@@ -26,10 +27,10 @@
  the operations to the database for processing, and returns the results
  as ordinary Haskell values.
 
-Package: haskelldb-hsql-doc
+Package: haskell-haskelldb-hsql-doc
 Architecture: all
 Section: doc
-Recommends: ghc6-doc, haskelldb-doc, libghc6-mtl-doc
+Recommends: ghc6-doc, haskell-haskelldb-doc, haskell-hsql-doc, libghc6-mtl-doc
 Suggests: doc-base
 Description: API documentation of haskelldb-hsql library
  The API documentation of HSQL backend of HaskellDB, a Haskell library

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

Modified: packages/haskelldb-hsql/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-hsql/trunk/debian/patches/00list?rev=1024&op=diff
==============================================================================
--- packages/haskelldb-hsql/trunk/debian/patches/00list (original)
+++ packages/haskelldb-hsql/trunk/debian/patches/00list Sun Jan 27 13:36:25 2008
@@ -1,1 +1,1 @@
-01_fix-compilation
+01_update-cabal-file

Added: packages/haskelldb-hsql/trunk/debian/patches/01_update-cabal-file.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-hsql/trunk/debian/patches/01_update-cabal-file.dpatch?rev=1024&op=file
==============================================================================
--- packages/haskelldb-hsql/trunk/debian/patches/01_update-cabal-file.dpatch (added)
+++ packages/haskelldb-hsql/trunk/debian/patches/01_update-cabal-file.dpatch Sun Jan 27 13:36:25 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_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-hsql~/haskelldb-hsql.cabal haskelldb-hsql/haskelldb-hsql.cabal
+--- haskelldb-hsql~/haskelldb-hsql.cabal	2007-11-11 22:11:56.000000000 +0100
++++ haskelldb-hsql/haskelldb-hsql.cabal	2008-01-21 01:46:44.000000000 +0100
+@@ -4,7 +4,7 @@
+ 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, haskelldb, hsql
++build-depends: haskell98, base, mtl, haskelldb, hsql, old-time
+ Extensions: ExistentialQuantification,
+             OverlappingInstances,
+             UndecidableInstances,

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




More information about the Pkg-haskell-commits mailing list