c2hs: Use ghc instead of ghc6

4 files changed, 27 insertions, 21 deletions

diff --git a/p/c2hs/debian/c2hs.install b/p/c2hs/debian/c2hs.install
index 666a18ec7..af6373943 100644
--- a/p/c2hs/debian/c2hs.install
+++ b/p/c2hs/debian/c2hs.install
@@ -1,2 +1,2 @@
-dist-ghc6/build/c2hs/c2hs		usr/bin
+dist-ghc/build/c2hs/c2hs		usr/bin
 C2HS.hs 						usr/share/c2hs
diff --git a/p/c2hs/debian/changelog b/p/c2hs/debian/changelog
index 15bef3003..a124b3071 100644
--- a/p/c2hs/debian/changelog
+++ b/p/c2hs/debian/changelog
@@ -1,13 +1,19 @@
+c2hs (0.16.2-2) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot@debian.org>  Sat, 15 Jan 2011 12:40:44 -0200
+
 c2hs (0.16.2-1) unstable; urgency=low
 
   [ Marco Túlio Gontijo e Silva ]
   * debian/copyright: Specify revision of Format-Specification:.
-  * debian/patches/04_ghc6-6.12.diff: Use DEP-3 format.
+  * debian/patches/04_ghc-6.12.diff: Use DEP-3 format.
   * Use debian/compat 7.
 
   [ Joachim Breitner ]
   * New upstream release. 
-  * Remove patch 04_ghc6-6.12.diff 
+  * Remove patch 04_ghc-6.12.diff 
 
  -- Joachim Breitner <nomeata@debian.org>  Fri, 23 Apr 2010 14:33:24 +0200
 
@@ -38,10 +44,10 @@ c2hs (0.16.0-1) unstable; urgency=low
   * debian/control: Use Vcs-Browser: field.
   * debian/control: Bump Standards-Version: to 3.8.4, no changes needed.
   * Use 3.0 (quilt) source format.
-  * Include patch to work with ghc6-6.12.
+  * Include patch to work with ghc-6.12.
   * debian/copyright: Use DEP-5 format.
   * debian/control: Bump Build-Depends: on haskell-devscripts to 0.7 and
-    remove versioned Build-Depends on ghc6.
+    remove versioned Build-Depends on ghc.
   * debian/control: Correct spacing of Homepage: field.
 
  -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Fri, 12 Feb 2010 22:34:33 -0200
@@ -71,7 +77,7 @@ c2hs (0.15.1-2) unstable; urgency=low
 
   * Update for GHC 6.8.2 which ships a new Cabal version:
     - debian/patches/00list: Disable 02_backport-to-old-cabal.
-    - debian/control: Bump build dependency on ghc6 to 6.8.2.
+    - debian/control: Bump build dependency on ghc to 6.8.2.
     - debian/rules: Remove installed license file COPYING.
 
  -- Arjan Oosting <arjan@debian.org>  Mon, 07 Jan 2008 11:16:19 +0100
@@ -179,7 +185,7 @@ c2hs (0.14.5-6) unstable; urgency=medium
 
 c2hs (0.14.5-5) unstable; urgency=low
 
-  * Stop using update-haskell-control and $ghc6_* variables, as it is not
+  * Stop using update-haskell-control and $ghc_* variables, as it is not
     necessary and not using it simplifies the work for porters and for me.
 
  -- Arjan Oosting <arjan@debian.org>  Sat, 21 Oct 2006 22:49:45 +0200
@@ -210,11 +216,11 @@ c2hs (0.14.5-3) unstable; urgency=low
 
 c2hs (0.14.5-2) unstable; urgency=low
 
-  * Update package for ghc6 version 6.4.2.
+  * Update package for ghc version 6.4.2.
   * debian/control.in:
-    - remove libghc6-cabal-dev from Build-Depends.
-    - add ghc6 (>= 6.4.2) to Build-Depends to get Cabal version >= 1.1.4.
-    - add ppc64 to Architectures as ghc6 is now available on ppc64.
+    - remove libghc-cabal-dev from Build-Depends.
+    - add ghc (>= 6.4.2) to Build-Depends to get Cabal version >= 1.1.4.
+    - add ppc64 to Architectures as ghc is now available on ppc64.
   * debian/patches/01_update-manpage.dpatch: updated. Fix typo.
   * debian/patches/06_fix-Setup-for-ghc-6.4.2.dpatch: added. Replace
     Setup.hs with version from upstream VCS to fix build with ghc 6.4.2.
@@ -224,13 +230,13 @@ c2hs (0.14.5-2) unstable; urgency=low
 c2hs (0.14.5-1) unstable; urgency=low
 
   * New upstream release. Closes: #372836
-    - no longer ships a library for ghc6.
+    - no longer ships a library for ghc.
   * New maintainer. Closes: #342801
   * debian/c2hs-doc.doc-base: change section to Apps/Programming. 
   * added debian/control.in
-    - drop the libghc6-c2hs-dev package.
-    - use $ghc6_app_bdeps, $ghc6_arches substitution variables from
-      update-haskell-control to get the build dependency on ghc6 and
+    - drop the libghc-c2hs-dev package.
+    - use $ghc_app_bdeps, $ghc_arches substitution variables from
+      update-haskell-control to get the build dependency on ghc and
       architecture list for c2hs.
     - replace ${Source-Version} with ${binary:Version} and
       ${source:Version} to make the package binNMU safe.
@@ -291,7 +297,7 @@ c2hs (0.13.6-2) unstable; urgency=low
 c2hs (0.13.6-1) unstable; urgency=low
 
   * New upstream version.
-  * Depends on ghc6. Closes: #274157.
+  * Depends on ghc. Closes: #274157.
   * Can be build in any architecture. Closes: #319915.
   * Upload sponsored by John Goerzen <jgoerzen@debian.org>.
   
@@ -306,7 +312,7 @@ c2hs (0.12.0-1) unstable; urgency=low
   * Removed "Recommends: ghc | ghc5" (seems redundant as ghc5 is being
     depended on and no other GHC is useful).
   * Force dependency to be on ghc5 rather than any other ghc (doesn't
-    get ghc6 dependencies right currently).
+    get ghc dependencies right currently).
 
  -- Ian Lynagh (wibble) <igloo@debian.org>  Tue, 18 Nov 2003 21:24:11 +0000
 
diff --git a/p/c2hs/debian/control b/p/c2hs/debian/control
index 08b21336a..faab8880a 100644
--- a/p/c2hs/debian/control
+++ b/p/c2hs/debian/control
@@ -6,16 +6,16 @@ Uploaders: Arjan Oosting <arjan@debian.org>, Erik de Castro Lopo <erikd@mega-ner
 Build-Depends: debhelper (>= 7),
  dpkg-dev (>= 1.14),
  cdbs,
- ghc6,
+ ghc,
  haskell-devscripts (>= 0.7),
  alex,
  happy,
- libghc6-language-c-dev,
+ libghc-language-c-dev,
  docbook,
  docbook-xsl,
  xsltproc,
  libxml2-utils
-Build-Conflicts: libghc6-wash-dev
+Build-Conflicts: libghc-wash-dev
 Standards-Version: 3.8.4
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/c2hs
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/c2hs
diff --git a/p/c2hs/debian/rules b/p/c2hs/debian/rules
index 6d6ea2f16..bd243d573 100755
--- a/p/c2hs/debian/rules
+++ b/p/c2hs/debian/rules
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-build/$(CABAL_PACKAGE) :: build-ghc6-stamp
+build/$(CABAL_PACKAGE) :: build-ghc-stamp
 
 build/$(CABAL_PACKAGE)-doc :: xml-docs