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

[Marco Silva]

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

    M ./changelog -9 +15
    M ./control -8 +8

Sat Jan 15 15:05:56 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 7a1be2d5de31bcae558618f38509b27
diff -rN -u old-haskell-haddock/changelog new-haskell-haddock/changelog
--- old-haskell-haddock/changelog	2011-01-15 15:32:19.010302594 +0000
+++ new-haskell-haddock/changelog	2011-01-15 15:32:19.014302804 +0000
@@ -1,3 +1,9 @@
+haskell-haddock (2.7.2-6) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:41:02 -0200
+
 haskell-haddock (2.7.2-5) unstable; urgency=low
 
   * Depend on ghc-paths-prof
@@ -7,7 +13,7 @@
 haskell-haddock (2.7.2-4) unstable; urgency=low
 
   * Further patch around missing ghci support, complete patch taken from
-    getallinfo-nothing-ghci-566331 in ghc6.
+    getallinfo-nothing-ghci-566331 in ghc.
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 02 Jul 2010 09:58:27 +0200
 
@@ -21,7 +27,7 @@
 
 haskell-haddock (2.7.2-2) unstable; urgency=low
 
-  * Depend on libghc6-ghc-paths-dev (Closes: #587807)
+  * Depend on libghc-ghc-paths-dev (Closes: #587807)
   * Upload to unstable (experimental was by accident) (Closes: #587808)
     Thanks to Aaron M. Ucko for pointing these out
 
@@ -30,7 +36,7 @@
 haskell-haddock (2.7.2-1) experimental; urgency=low
 
   * Re-upload haddock to Debian to provide the haddock haskell library 
-    The binary is still provided by ghc6.
+    The binary is still provided by ghc.
   * Take over by the Debian Haskell Group, redo packaging
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 24 Jun 2010 10:17:08 +0200
@@ -53,7 +59,7 @@
 
 haddock (2.4.2-2) unstable; urgency=low
 
-  * Build against ghc6 6.10.4.
+  * Build against ghc 6.10.4.
   * Standards-Version 3.8.2, use Section: haskell.
 
  -- Kari Pahula <kaol at debian.org>  Tue, 21 Jul 2009 01:04:36 +0300
@@ -68,7 +74,7 @@
 
 haddock (2.4.1-4) unstable; urgency=low
 
-  * Built against ghc6 6.10.1+dfsg1-13, giving .haddock files uniform
+  * Built against ghc 6.10.1+dfsg1-13, giving .haddock files uniform
     representation on 32 and 64 bit architectures. (Closes: #516424)
 
  -- Kari Pahula <kaol at debian.org>  Wed, 25 Feb 2009 15:28:37 +0200
@@ -127,7 +133,7 @@
   * Buildable with GHC 6.6. Closes: #393632.
   * Build using cabal:
     * Various debian/rules changes.
-    * Requires ghc6 >= 6.4.2.
+    * Requires ghc >= 6.4.2.
     * No longer uses config.sub/config.guess. Closes: #342419.
   * Build-dep on alex as cleaning removes the generated lexer .hs files.
   * Build-dep on happy as cleaning removes the generated parser .hs files.
@@ -172,8 +178,8 @@
 
 haddock (0.6-2) unstable; urgency=low
 
-  * Re-upload so haddock is compiled against the latest ghc6 on all
-    arches that have ghc6.
+  * Re-upload so haddock is compiled against the latest ghc on all
+    arches that have ghc.
 
  -- Ian Lynagh (wibble) <igloo at debian.org>  Sun, 25 Jul 2004 01:23:10 +0000
 
@@ -206,7 +212,7 @@
 
   * New upstream version.
   * New maintainer.
-  * Give ghc6 as an alternative build-dep to ghc5.
+  * Give ghc as an alternative build-dep to ghc5.
   * No longer use autoconf; update build-deps to match. Closes: #173762.
   * Hack configure and configure.in not to demand flex as the tarball has
     the relevant files pregenerated. Remove flex build-dep.
diff -rN -u old-haskell-haddock/control new-haskell-haddock/control
--- old-haskell-haddock/control	2011-01-15 15:32:19.010302594 +0000
+++ new-haskell-haddock/control	2011-01-15 15:32:19.014302804 +0000
@@ -6,19 +6,19 @@
 Build-Depends: debhelper (>= 7)
   , cdbs
   , haskell-devscripts (>= 0.7)
-  , ghc6
-  , ghc6-prof
-  , libghc6-ghc-paths-dev
-  , libghc6-ghc-paths-prof
+  , ghc
+  , ghc-prof
+  , libghc-ghc-paths-dev
+  , libghc-ghc-paths-prof
   , alex
   , happy
-Build-Depends-Indep: ghc6-doc
+Build-Depends-Indep: ghc-doc
 Standards-Version: 3.9.0
 Homepage: http://hackage.haskell.org/package/haddock
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-haddock
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-haddock
 
-Package: libghc6-haddock-dev
+Package: libghc-haddock-dev
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -33,7 +33,7 @@
  This package exposes the features of haddock as a library, to be used inside
  other haskell programs.
 
-Package: libghc6-haddock-prof
+Package: libghc-haddock-prof
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -49,7 +49,7 @@
  This package exposes the features of haddock as a library, to be used inside
  other haskell programs.
 
-Package: libghc6-haddock-doc
+Package: libghc-haddock-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, ${haskell:Depends}