[Pkg-haskell-commits] darcs: haskell-cabal-install: Use ghc instead of ghc6

[Marco Silva]

Sat Jan 15 15:05:49 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 35ae448df815ca764c590e2e03e1261f

    M ./cabal-install.install -1 +1
    M ./changelog +4
    M ./control -8 +8
    M ./rules -1 +1

Sat Jan 15 15:05:49 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 35ae448df815ca764c590e2e03e1261f
diff -rN -u old-haskell-cabal-install/cabal-install.install new-haskell-cabal-install/cabal-install.install
--- old-haskell-cabal-install/cabal-install.install	2011-01-15 15:20:28.188832450 +0000
+++ new-haskell-cabal-install/cabal-install.install	2011-01-15 15:20:28.188832450 +0000
@@ -1 +1 @@
-dist-ghc6/build/cabal/cabal usr/bin
+dist-ghc/build/cabal/cabal usr/bin
diff -rN -u old-haskell-cabal-install/changelog new-haskell-cabal-install/changelog
--- old-haskell-cabal-install/changelog	2011-01-15 15:20:28.188832450 +0000
+++ new-haskell-cabal-install/changelog	2011-01-15 15:20:28.192832661 +0000
@@ -1,7 +1,11 @@
 haskell-cabal-install (0.8.0-2) UNRELEASED; urgency=low
 
+  [ Marco Túlio Gontijo e Silva ]
   * debian/source/format: Use 3.0 (quilt).
 
+  [ Marco Silva ]
+  * Use ghc instead of ghc
+
  -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Sun, 21 Feb 2010 07:45:42 -0300
 
 haskell-cabal-install (0.8.0-1) unstable; urgency=low
diff -rN -u old-haskell-cabal-install/control new-haskell-cabal-install/control
--- old-haskell-cabal-install/control	2011-01-15 15:20:28.188832450 +0000
+++ new-haskell-cabal-install/control	2011-01-15 15:20:28.188832450 +0000
@@ -7,13 +7,13 @@
                haskell-devscripts (>= 0.7),
                cdbs,
                bash-completion (>= 1.0),
-               ghc6 (>= 6.8),
-               libghc6-http-dev (>= 40000002),
-               libghc6-http-dev (<< 40000100),
-               libghc6-network-dev (>= 1),
-               libghc6-network-dev (<< 3),
-               libghc6-zlib-dev (>= 0.4),
-               libghc6-zlib-dev (<< 0.6)
+               ghc (>= 6.8),
+               libghc-http-dev (>= 40000002),
+               libghc-http-dev (<< 40000100),
+               libghc-network-dev (>= 1),
+               libghc-network-dev (<< 3),
+               libghc-zlib-dev (>= 0.4),
+               libghc-zlib-dev (<< 0.6)
 Standards-Version: 3.8.4
 Homepage: http://www.haskell.org/cabal/
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-cabal-install
@@ -24,7 +24,7 @@
 Depends: ${shlibs:Depends},
          ${haskell:Depends},
          ${misc:Depends}
-Recommends: ${haskell:Recommends}, ghc6
+Recommends: ${haskell:Recommends}, ghc
 Suggests: ${haskell:Suggests}
 Description: command-line interface for Cabal and Hackage
  The 'cabal' command-line program simplifies the process of managing
diff -rN -u old-haskell-cabal-install/rules new-haskell-cabal-install/rules
--- old-haskell-cabal-install/rules	2011-01-15 15:20:28.188832450 +0000
+++ new-haskell-cabal-install/rules	2011-01-15 15:20:28.192832661 +0000
@@ -2,7 +2,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-build/cabal-install:: build-ghc6-stamp
+build/cabal-install:: build-ghc-stamp
 
 binary-post-install/cabal-install::
 	dh_bash-completion