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

[Marco Silva]

Sat Jan 15 15:06:21 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 322f34c17fcf2c7072868d804e703a87

     ./libghc6-wash-dev.install -> ./libghc-wash-dev.install
    M ./changelog -6 +12
    M ./control -11 +11
    M ./libghc-wash-dev.install -1 +1

Sat Jan 15 15:06:21 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 322f34c17fcf2c7072868d804e703a87
diff -rN -u old-washngo/changelog new-washngo/changelog
--- old-washngo/changelog	2011-01-15 16:24:10.074281765 +0000
+++ new-washngo/changelog	2011-01-15 16:24:10.082282187 +0000
@@ -1,6 +1,12 @@
+washngo (2.12.0.1-5) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:41:41 -0200
+
 washngo (2.12.0.1-4) unstable; urgency=low
 
-  * Run ghc6 without active timer (+RTS -V0 -RTS). Should work around
+  * Run ghc without active timer (+RTS -V0 -RTS). Should work around
     http://hackage.haskell.org/trac/ghc/ticket/4074 on slow arches. Negative
     side effects not known (yet).  
 
@@ -14,7 +20,7 @@
 
 washngo (2.12.0.1-2) unstable; urgency=low
 
-  * Depend on libghc6-ghc-paths-dev (Closes: #581247)
+  * Depend on libghc-ghc-paths-dev (Closes: #581247)
 
  -- Joachim Breitner <nomeata at debian.org>  Wed, 12 May 2010 10:21:14 +0200
 
@@ -64,7 +70,7 @@
 
 washngo (2.12-3) unstable; urgency=low
 
-  * Added build-deps on libghc6-regex-compat-dev and libghc6-parsec-dev.
+  * Added build-deps on libghc-regex-compat-dev and libghc-parsec-dev.
     Closes: #465032.
   * Changed VCS lines in debian/control to new format and updated
     for Git.
@@ -96,7 +102,7 @@
 washngo (2.9-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
-  * Fix FTBFS with GHC 6.6 and fix uninstallable of libghc6-wash-dev
+  * Fix FTBFS with GHC 6.6 and fix uninstallable of libghc-wash-dev
     (Closes: #394655):
     - Setup.hs: updated for Cabal 1.1.6
     - WASH.cabal: drop the Depends on text-any.
@@ -104,9 +110,9 @@
       error.
     - WASH/CGI/SubmitXX: add -fallow-undecidable-instances to allow some
       illegal instance declarations.
-    - debian/control: bump Build-Depends on ghc6.
+    - debian/control: bump Build-Depends on ghc.
   * debian/changelog: converted to UTF-8.
-  * debian/libghc6-wash-dev.doc-base: declare a valid Section and fix the
+  * debian/libghc-wash-dev.doc-base: declare a valid Section and fix the
     path to the HTML files.
   * debian/manpage.sgml.ex: removed.
   * debian/rules: remove config.log and config.status on clean.
diff -rN -u old-washngo/control new-washngo/control
--- old-washngo/control	2011-01-15 16:24:10.074281765 +0000
+++ new-washngo/control	2011-01-15 16:24:10.082282187 +0000
@@ -6,20 +6,20 @@
 Build-Depends: debhelper (>= 7)
   , cdbs
   , haskell-devscripts (>= 0.7)
-  , ghc6
-  , ghc6-prof
-  , libghc6-regex-compat-dev
-  , libghc6-regex-compat-prof
-  , libghc6-parsec2-dev
-  , libghc6-parsec2-prof
-  , libghc6-ghc-paths-dev
-  , libghc6-ghc-paths-prof
+  , ghc
+  , ghc-prof
+  , libghc-regex-compat-dev
+  , libghc-regex-compat-prof
+  , libghc-parsec2-dev
+  , libghc-parsec2-prof
+  , libghc-ghc-paths-dev
+  , libghc-ghc-paths-prof
 Standards-Version: 3.8.4
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/washngo
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/washngo
 Homepage: http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/
 
-Package: libghc6-wash-dev
+Package: libghc-wash-dev
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -44,7 +44,7 @@
  .
  WASH/Mail for email processing
 
-Package: libghc6-wash-prof
+Package: libghc-wash-prof
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
@@ -60,7 +60,7 @@
  .
  This package provides the library compiled with profiling enabled.
 
-Package: libghc6-wash-doc
+Package: libghc-wash-doc
 Section: doc
 Architecture: all
 Depends: ${haskell:Depends}, ${misc:Depends}
diff -rN -u old-washngo/libghc6-wash-dev.install new-washngo/libghc6-wash-dev.install
--- old-washngo/libghc6-wash-dev.install	2011-01-15 16:24:10.074281765 +0000
+++ new-washngo/libghc6-wash-dev.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-dist-ghc6/build/wash2hs/wash2hs /usr/bin
diff -rN -u old-washngo/libghc-wash-dev.install new-washngo/libghc-wash-dev.install
--- old-washngo/libghc-wash-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ new-washngo/libghc-wash-dev.install	2011-01-15 16:24:10.078281976 +0000
@@ -0,0 +1 @@
+dist-ghc/build/wash2hs/wash2hs /usr/bin