haskell-x11: Use ghc instead of ghc6

2 files changed, 19 insertions, 14 deletions

diff --git a/p/haskell-x11/debian/changelog b/p/haskell-x11/debian/changelog
index 6506d11bc..7f12b8372 100644
--- a/p/haskell-x11/debian/changelog
+++ b/p/haskell-x11/debian/changelog
@@ -1,9 +1,13 @@
 haskell-x11 (1.5.0.0-3) UNRELEASED; urgency=low
 
+  [ Marco Túlio Gontijo e Silva ]
   * Use debian/compat 7.
   * debian/control: Use more sintetic link in Homepage:.
   * debian/source/format: Use 3.0 (quilt).
 
+  [ Marco Silva ]
+  * Use ghc instead of ghc
+
  -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Thu, 18 Feb 2010 22:41:07 -0200
 
 haskell-x11 (1.5.0.0-2) unstable; urgency=low
@@ -55,7 +59,7 @@ haskell-x11 (1.4.5-6) unstable; urgency=low
   * debian/control: Use haskell:Recommends and haskell:Suggests.
 
   [ Joachim Breitner ]
-  * Rebuild get rid of libghc6-x11-doc dependency on ghc6-doc
+  * Rebuild get rid of libghc-x11-doc dependency on ghc-doc
   * Bump build-dependencies
   * Bump standards version, changed section
 
@@ -63,21 +67,21 @@ haskell-x11 (1.4.5-6) unstable; urgency=low
 
 haskell-x11 (1.4.5-4) unstable; urgency=low
 
-  * Manually bump ghc6-doc dependency until this is handled by
+  * Manually bump ghc-doc dependency until this is handled by
     haskell-devscripts (Closes: #530238)
 
  -- Joachim Breitner <nomeata@debian.org>  Mon, 25 May 2009 09:16:51 +0200
 
 haskell-x11 (1.4.5-3) unstable; urgency=low
 
-  * Purge and reinstall ghc6 before building to get correct links to base
+  * Purge and reinstall ghc before building to get correct links to base
     packages in the documentation, due to #517514
 
  -- Joachim Breitner <nomeata@debian.org>  Sat, 28 Feb 2009 11:55:29 +0100
 
 haskell-x11 (1.4.5-2) unstable; urgency=low
 
-  * Rebuilt with ghc6 with arch-independent .haddock files
+  * Rebuilt with ghc with arch-independent .haddock files
 
  -- Joachim Breitner <nomeata@debian.org>  Sat, 28 Feb 2009 11:23:23 +0100
 
@@ -105,7 +109,7 @@ haskell-x11 (1.4.1-1) unstable; urgency=low
   * Upgrade to "Generic Haskell cabal library packaging files v10":
     * Versioned dependencies are now generated for the Cabal packages we
       depend on.
-    * Use the new ${impl:ghc6:*_deps} variables in debian/control.in.
+    * Use the new ${impl:ghc:*_deps} variables in debian/control.in.
     * Call canonicalise-comma-list on the depends and suggests fields in
       control.in. This works around bugs in lintian, where it gets
       confused and starts giving spurious warnings.
@@ -163,9 +167,9 @@ haskell-x11 (1.2.1-1) unstable; urgency=low
 haskell-x11 (1.2-3) unstable; urgency=low
 
   * Upgrade to "Generic Haskell cabal library debian/rules v0.6".
-    Tell setup to use ghc6 rather than ghc, so that the postinst/prerm
+    Tell setup to use ghc rather than ghc, so that the postinst/prerm
     scripts work when the ghc-pkg symlink doesn't exist or doesn't
-    point to ghc6's ghc-pkg.
+    point to ghc's ghc-pkg.
 
  -- Ian Lynagh (wibble) <igloo@debian.org>  Mon, 20 Nov 2006 20:50:42 +0000
 
@@ -181,6 +185,7 @@ haskell-x11 (1.2-2) unstable; urgency=low
 
 haskell-x11 (1.2-1) unstable; urgency=low
 
-  * Initial release (was part of ghc6 until version 6.6-1).
+  * Initial release (was part of ghc until version 6.6-1).
 
  -- Ian Lynagh (wibble) <igloo@debian.org>  Fri, 13 Oct 2006 16:43:11 +0000
+
diff --git a/p/haskell-x11/debian/control b/p/haskell-x11/debian/control
index d9b9e7af1..c7d0092f8 100644
--- a/p/haskell-x11/debian/control
+++ b/p/haskell-x11/debian/control
@@ -7,9 +7,9 @@ Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 7)
   , haskell-devscripts (>= 0.7)
   , cdbs
-  , ghc6
-  , ghc6-prof
-  , ghc6-doc
+  , ghc
+  , ghc-prof
+  , ghc-doc
   , libx11-dev
   , libxt-dev
   , libxinerama-dev
@@ -18,7 +18,7 @@ Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-x11/
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-x11
 
 
-Package: libghc6-x11-dev
+Package: libghc-x11-dev
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -37,7 +37,7 @@ Description: Haskell X11 binding for GHC
  documentation of these calls, refer to "The Xlib Programming
  Manual", available online at <http://tronche.com/gui/x/xlib/>.
 
-Package: libghc6-x11-prof
+Package: libghc-x11-prof
 Architecture: any
 Depends: ${haskell:Depends}
   , ${misc:Depends}
@@ -52,7 +52,7 @@ Description: Haskell X11 binding for GHC; profiling libraries
  documentation of these calls, refer to "The Xlib Programming
  Manual", available online at <http://tronche.com/gui/x/xlib/>.
 
-Package: libghc6-x11-doc
+Package: libghc-x11-doc
 Section: doc
 Architecture: all
 Depends: ${haskell:Depends}