[Pkg-haskell-commits] darcs: haskell-cgi: 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: c95a78caa83ff8c4ce77cf7ac471553c

    M ./changelog -5 +11
    M ./control -18 +18

Sat Jan 15 15:05:49 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: c95a78caa83ff8c4ce77cf7ac471553c
diff -rN -u old-haskell-cgi/changelog new-haskell-cgi/changelog
--- old-haskell-cgi/changelog	2011-01-15 15:21:00.542537972 +0000
+++ new-haskell-cgi/changelog	2011-01-15 15:21:00.542537972 +0000
@@ -1,3 +1,9 @@
+haskell-cgi (3001.1.7.2-2) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:50 -0200
+
 haskell-cgi (3001.1.7.2-1) unstable; urgency=low
 
   * New upstream release, part of the Haskell Platform
@@ -14,7 +20,7 @@
 haskell-cgi (3001.1.7.1-2) unstable; urgency=low
 
   [ Kari Pahula ]
-  * Added missing build dependency on libghc6-mtl-dev (Closes: #536584)
+  * Added missing build dependency on libghc-mtl-dev (Closes: #536584)
   * Bumped Standards-Version to 3.8.2.
     * Use Section: haskell.
 
@@ -33,7 +39,7 @@
   * 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.
@@ -91,9 +97,9 @@
 haskell-cgi (2006.9.6-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 at debian.org>  Mon, 20 Nov 2006 20:50:42 +0000
 
@@ -109,7 +115,7 @@
 
 haskell-cgi (2006.9.6-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 at debian.org>  Fri, 13 Oct 2006 16:43:11 +0000
 
diff -rN -u old-haskell-cgi/control new-haskell-cgi/control
--- old-haskell-cgi/control	2011-01-15 15:21:00.542537972 +0000
+++ new-haskell-cgi/control	2011-01-15 15:21:00.542537972 +0000
@@ -7,27 +7,27 @@
 Build-Depends: debhelper (>= 7)
   , haskell-devscripts (>= 0.7)
   , cdbs
-  , ghc6
-  , ghc6-prof
-  , ghc6-doc
-  , libghc6-mtl-dev (>= 1.0)
-  , libghc6-mtl-prof
-  , libghc6-mtl-doc
-  , libghc6-network-dev (>= 2.0)
-  , libghc6-network-prof
-  , libghc6-network-doc
-  , libghc6-parsec2-dev (>= 2.0)
-  , libghc6-parsec2-prof
-  , libghc6-parsec2-doc
-  , libghc6-xhtml-dev (>= 3000.0.0)
-  , libghc6-xhtml-prof
-  , libghc6-xhtml-doc
+  , ghc
+  , ghc-prof
+  , ghc-doc
+  , libghc-mtl-dev (>= 1.0)
+  , libghc-mtl-prof
+  , libghc-mtl-doc
+  , libghc-network-dev (>= 2.0)
+  , libghc-network-prof
+  , libghc-network-doc
+  , libghc-parsec2-dev (>= 2.0)
+  , libghc-parsec2-prof
+  , libghc-parsec2-doc
+  , libghc-xhtml-dev (>= 3000.0.0)
+  , libghc-xhtml-prof
+  , libghc-xhtml-doc
 Homepage: http://hackage.haskell.org/package/cgi
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-cgi
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-cgi
 
 
-Package: libghc6-cgi-dev
+Package: libghc-cgi-dev
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -40,7 +40,7 @@
  .
  This library is for writing CGI programs.
 
-Package: libghc6-cgi-prof
+Package: libghc-cgi-prof
 Architecture: any
 Depends: ${haskell:Depends}
   , ${misc:Depends}
@@ -52,7 +52,7 @@
  .
  This library is for writing CGI programs.
 
-Package: libghc6-cgi-doc
+Package: libghc-cgi-doc
 Section: doc
 Architecture: all
 Depends: ${haskell:Depends}