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

[Marco Silva]

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

    M ./changelog -3 +9
    M ./control -7 +7
    M ./cpphs.install -1 +1

Sat Jan 15 15:05:47 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 8a2200029979cb4ef6d9c7a02c8f801a
diff -rN -u old-cpphs/changelog new-cpphs/changelog
--- old-cpphs/changelog	2011-01-15 15:14:52.639143387 +0000
+++ new-cpphs/changelog	2011-01-15 15:14:52.643143598 +0000
@@ -1,3 +1,9 @@
+cpphs (1.11-4) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:45 -0200
+
 cpphs (1.11-3) unstable; urgency=low
 
   * control: Use versioned Replaces: and Conflicts:
@@ -100,7 +106,7 @@
 
   * Non-maintainer upload.
   * C++ ABI transition: It's linked against libgmp3 and needs rebuild.
-    Change build dependency order to prefer hugs over ghc6 since that is
+    Change build dependency order to prefer hugs over ghc since that is
     the only alternative that currently is installable.
     This also has as effect that the libgmp3 dependency gets dropped.
 
@@ -108,8 +114,8 @@
 
 cpphs (0.7-2) unstable; urgency=low
 
-  * Fix build-deps so arches without ghc6 ought to build.
-  * Remove mips from list of ghc6 arches as it is to be removed.
+  * Fix build-deps so arches without ghc ought to build.
+  * Remove mips from list of ghc arches as it is to be removed.
 
  -- Ian Lynagh (wibble) <igloo at debian.org>  Fri, 15 Oct 2004 01:59:16 +0000
 
diff -rN -u old-cpphs/control new-cpphs/control
--- old-cpphs/control	2011-01-15 15:14:52.639143387 +0000
+++ new-cpphs/control	2011-01-15 15:14:52.643143598 +0000
@@ -7,9 +7,9 @@
 Build-Depends: debhelper (>= 7)
   , cdbs
   , haskell-devscripts (>= 0.7)
-  , ghc6 
-  , ghc6-prof 
-  , ghc6-doc 
+  , ghc 
+  , ghc-prof 
+  , ghc-doc 
 Homepage: http://hackage.haskell.org/package/cpphs
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/cpphs
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/cpphs
@@ -18,7 +18,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
   , ${misc:Depends}
-Suggests: ghc6 | hugs
+Suggests: ghc | hugs
 Description: Simplified cpp-a-like preprocessor for Haskell
  The C pre-processor has been widely used in Haskell source code. It
  enables conditional compilation for different compilers, different
@@ -32,7 +32,7 @@
  incompatible with Haskell's syntax. This is a cpp-a-like designed with
  Haskell's syntax in mind.
 
-Package: libghc6-cpphs-dev
+Package: libghc-cpphs-dev
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -42,7 +42,7 @@
 Description: cpphs-library for haskell
  This package provides some of the features of cpphs as a haskell library.
 
-Package: libghc6-cpphs-prof
+Package: libghc-cpphs-prof
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -52,7 +52,7 @@
 Description: cpphs-library for haskell; profiling libraries
  This package provides some of the features of cpphs as a haskell library.
 
-Package: libghc6-cpphs-doc
+Package: libghc-cpphs-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
diff -rN -u old-cpphs/cpphs.install new-cpphs/cpphs.install
--- old-cpphs/cpphs.install	2011-01-15 15:14:52.639143387 +0000
+++ new-cpphs/cpphs.install	2011-01-15 15:14:52.643143598 +0000
@@ -1 +1 @@
-dist-ghc6/build/cpphs/cpphs /usr/bin
+dist-ghc/build/cpphs/cpphs /usr/bin