[Pkg-haskell-commits] [SCM] HDBC Sqlite3 driver branch, master, updated. debian/2.3.0.0-4

[Iain Lane]

The following commit has been merged in the master branch:
commit 650810106b96477fd23ea0545337c3aaf1e3df14
Merge: 4924a739772a3ddf851edcda3ba697b3cb25e844 684385cafb29c9201188622619458ffc5df23da5
Author: Iain Lane <laney at debian.org>
Date:   Sun May 29 12:55:03 2011 +0100

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

diff --combined debian/control
index 3a3c098,3d33845..62bc870
--- a/debian/control
+++ b/debian/control
@@@ -12,16 -12,16 +12,16 @@@ Build-Depends
   haddock,
   hscolour,
   libsqlite3-dev (>= 3.3),
 - libghc6-hdbc-dev (>= 2.2.0),
 - libghc6-mtl-dev,
 + libghc-hdbc-dev (>= 2.2.0),
 + libghc-mtl-dev,
  Build-Depends-Indep:
   ghc6-doc,
 - libghc6-hdbc-doc
 -Standards-Version: 3.8.3
 + libghc-hdbc-doc
 +Standards-Version: 3.9.2
  Vcs-Git: git://git.debian.org/git/pkg-haskell/hdbc-sqlite3.git
  Vcs-Browser: http://git.debian.org/?p=pkg-haskell/hdbc-sqlite3.git;a=summary
  
 -Package: libghc6-hdbc-sqlite3-dev
 +Package: libghc-hdbc-sqlite3-dev
  Architecture: any
  Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}, libsqlite3-dev (>= 3.3)
  Suggests: ${haskell:Suggests}
@@@ -45,9 -45,9 +45,9 @@@ Description: Sqlite v3 HDBC (Haskell Da
  # .
  # This package provides the Sqlite v3 database driver for HDBC under Hugs.
  #
 -Package: libghc6-hdbc-sqlite3-doc
 +Package: libghc-hdbc-sqlite3-doc
- Replaces: haskell-hdbc-sqlite3-doc
- Conflicts: haskell-hdbc-sqlite3-doc
+ Replaces: haskell-hdbc-sqlite3-doc (<< 2.3.0.0-2)
+ Conflicts: haskell-hdbc-sqlite3-doc (<< 2.3.0.0-2)
  Provides: haskell-hdbc-sqlite3-doc
  Section: doc
  Architecture: all

-- 
HDBC Sqlite3 driver