[Pkg-haskell-commits] [SCM] Data type conversions branch, master, updated. debian/1.0.9-1-11-g0dada36

[Iain Lane]

The following commit has been merged in the master branch:
commit f604af12e128d1d9b7448f0eecba1c8c8c7a7d7a
Merge: bc00b6262e875b98d79e8fd6b7af229463cf4ec3 83e1513da3e0d93a976b842a4bb5903d86820168
Author: Iain Lane <laney at debian.org>
Date:   Thu May 26 10:43:36 2011 +0100

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

diff --combined debian/control
index ca84900,d70b33b..32ca797
--- a/debian/control
+++ b/debian/control
@@@ -6,23 -6,23 +6,23 @@@ Build-Depends: debhelper (>= 5.0.0)
   cdbs,
   haddock,
   hscolour,
 - haskell-devscripts (>= 0.6.18),
 - ghc6 (>= 6.12), 
 + haskell-devscripts (>= 0.8),
 + ghc, 
   cpphs,
 - ghc6-doc,
 - libghc6-mtl-dev,
 - libghc6-time-dev,
 - libghc6-mtl-prof,
 - libghc6-time-prof,
 - libghc6-mtl-doc,
 - libghc6-time-doc
 -Standards-Version: 3.8.3
 + ghc-doc,
 + libghc-mtl-dev,
 + libghc-time-dev,
 + libghc-mtl-prof,
 + libghc-time-prof,
 + libghc-mtl-doc,
 + libghc-time-doc
 +Standards-Version: 3.9.2
  Section: haskell
  Homepage: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible
  Vcs-Git: git://git.debian.org/git/pkg-haskell/haskell-convertible.git
  Vcs-Browser: http://git.debian.org/?p=pkg-haskell/haskell-convertible.git;a=summary
  
 -Package: libghc6-convertible-dev
 +Package: libghc-convertible-dev
  Architecture: any
  Depends: ${misc:Depends},  ${haskell:Depends}, ${shlibs:Depends}
  Suggests: ${haskell:Suggests}
@@@ -48,7 -48,7 +48,7 @@@ Description: Typeclasses and instances 
   Convertible is backed by an extensive test suite and passes tests
   on GHC and Hugs.
  
 -Package: libghc6-convertible-prof
 +Package: libghc-convertible-prof
  Architecture: any
  Depends:  ${misc:Depends}, ${haskell:Depends}
  Description: Typeclasses and instances for converting between types, GHC profiling package
@@@ -73,9 -73,9 +73,9 @@@
   Convertible is backed by an extensive test suite and passes tests
   on GHC and Hugs.
  
 -Package: libghc6-convertible-doc
 +Package: libghc-convertible-doc
- Replaces: haskell-convertible-doc
- Conflicts: haskell-convertible-doc
+ Replaces: haskell-convertible-doc (<< 1.0.9-2)
+ Conflicts: haskell-convertible-doc (<< 1.0.9-2)
  Provides: haskell-convertible-doc
  Section: doc
  Architecture: all

-- 
Data type conversions