[Pkg-haskell-commits] [SCM] HDBC ODBC support branch, master, updated. debian/2.2.3.0-1-11-g390f63f

[Iain Lane]

The following commit has been merged in the master branch:
commit 4b0c9022cfc38c1f5fc53f6cac07f0c2f42d2ef7
Merge: f63f9d6d2b8e11c1603b0da0c5236d58481ba4d6 8d850c31c70665064fcf2be44546ce1f460a5f1c
Author: Iain Lane <laney at debian.org>
Date:   Mon May 30 16:13:41 2011 +0100

    Merge commit 'debian/2.2.3.0-3'
    
    Conflicts:
    	debian/control

diff --combined debian/control
index de1e0f4,c3de716..a2eb911
--- a/debian/control
+++ b/debian/control
@@@ -5,34 -5,25 +5,34 @@@ Uploaders: John Goerzen <jgoerzen at compl
  Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
  Build-Depends:
   debhelper (>= 7),
 - ghc6 (>= 6.10),
 + ghc (>= 6.10),
 + ghc-prof (>= 6.10),
   haskell-devscripts (>= 0.6.18),
   cdbs,
   cpphs,
   haddock,
   hscolour,
 - libghc6-hdbc-dev (>= 2.2.0-2),
 + libghc-hdbc-dev (>= 2.2.0-2),
 + libghc-hdbc-prof (>= 2.2.0-2),
   unixodbc-dev (>= 2.2.11),
 - libghc6-mtl-dev,
 - libghc6-hunit-dev,
 - libghc6-time-dev,
 - libghc6-convertible-dev
 -Standards-Version: 3.8.3
 + libghc-mtl-dev,
 + libghc-hunit-dev,
 + libghc-time-dev,
 + libghc-convertible-dev,
 + libghc-mtl-prof,
 + libghc-hunit-prof,
 + libghc-time-prof,
 + libghc-convertible-prof
 +Standards-Version: 3.9.2
  Vcs-Git: git://git.debian.org/git/pkg-haskell/hdbc-odbc.git
  Vcs-Browser: http://git.debian.org/?p=pkg-haskell/hdbc-odbc.git;a=summary
  
 -Package: libghc6-hdbc-odbc-dev
 +Package: libghc-hdbc-odbc-dev
  Architecture: any
 -Depends: libghc6-hdbc-dev (>= 2.1.0), ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}, unixodbc-dev (>= 2.2.11)
 +Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}, unixodbc-dev (>= 2.2.11)
 +Recommends: ${haskell:Recommends}
 +Suggests: ${haskell:Suggests}
 +Provides: ${haskell:Provides}
  Description: unixODBC HDBC (Haskell Database Connectivity) Driver for GHC
   HDBC provides an abstraction layer between Haskell programs and SQL
   relational databases. This lets you write database code once, in
@@@ -41,21 -32,6 +41,21 @@@
   .
   This package provides the ODBC database driver for HDBC under GHC.
  
 +Package: libghc-hdbc-odbc-prof
 +Architecture: any
 +Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
 +Recommends: ${haskell:Recommends}
 +Suggests: ${haskell:Suggests}
 +Provides: ${haskell:Provides}
 +Description: unixODBC Haskell Database Connectivity Driver; profiling libraries
 + HDBC provides an abstraction layer between Haskell programs and SQL
 + relational databases. This lets you write database code once, in
 + Haskell, and have it work with any number of backend SQL databases
 + (MySQL, Oracle, PostgreSQL, ODBC-compliant databases, etc.)
 + .
 + This package provides the ODBC database driver for HDBC under GHC compiled for
 + profiling.
 +
  #Package: libhugs-hdbc-odbc
  #Section: libs
  #Architecture: any
@@@ -68,10 -44,10 +68,10 @@@
  # .
  # This package provides the ODBC database driver for HDBC under Hugs.
  
 -Package: libghc6-hdbc-odbc-doc
 +Package: libghc-hdbc-odbc-doc
- Replaces: haskell-hdbc-odbc-doc
- Conflicts: haskell-hdbc-odbc-doc
+ Replaces: haskell-hdbc-odbc-doc (<< 2.2.3.0-2)
+ Conflicts: haskell-hdbc-odbc-doc (<< 2.2.3.0-2)
 -Provides: haskell-hdbc-odbc-doc
 +Provides: haskell-hdbc-odbc-doc, ${haskell:Provides}
  Section: doc
  Architecture: all
  Depends: ${haskell:Depends}, ${misc:Depends}

-- 
HDBC ODBC support