[Pkg-haskell-commits] darcs: helium: 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: eee22adf6776ba851e773f75a91a5d97

    M ./changelog -2 +8
    M ./control -1 +1
    M ./rules -1 +1

Sat Jan 15 15:06:21 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: eee22adf6776ba851e773f75a91a5d97
diff -rN -u old-helium/changelog new-helium/changelog
--- old-helium/changelog	2011-01-15 16:22:13.168118892 +0000
+++ new-helium/changelog	2011-01-15 16:22:13.188119947 +0000
@@ -1,3 +1,9 @@
+helium (1.6-7) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:41:38 -0200
+
 helium (1.6-6) unstable; urgency=low
 
   * Refresh patches to make them work with Lenny's dpkg.
@@ -30,11 +36,11 @@
 helium (1.6-4) unstable; urgency=low
   
   * Make helium compile with GHC 6.8.2:
-    - debian/patches/04_fixes-for-ghc6.dpatch: Add '-package containers'
+    - debian/patches/04_fixes-for-ghc.dpatch: Add '-package containers'
       to the GHC options as helium uses Data.Map which is in a separate
       package now.
     - debian/control:
-      + Add libghc6-parsec-dev to the build dependencies as the parsec
+      + Add libghc-parsec-dev to the build dependencies as the parsec
         module is in separate Debian package now.
       + Bump the build dependency on GHC to >= 6.8.2
   * debian/control:
diff -rN -u old-helium/control new-helium/control
--- old-helium/control	2011-01-15 16:22:13.168118892 +0000
+++ new-helium/control	2011-01-15 16:22:13.188119947 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Marco Túlio Gontijo e Silva <marcot at debian.org>
 Build-Depends: autotools-dev, debhelper (>= 7),
- ghc6 (>= 6.8.2), haddock, libghc6-mtl-dev, libghc6-parsec-dev, uuagc, libghc6-editline-dev
+ ghc (>= 6.8.2), haddock, libghc-mtl-dev, libghc-parsec-dev, uuagc, libghc-editline-dev
 Standards-Version: 3.8.4
 Homepage: http://www.cs.uu.nl/helium/index.html
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/helium
diff -rN -u old-helium/rules new-helium/rules
--- old-helium/rules	2011-01-15 16:22:13.168118892 +0000
+++ new-helium/rules	2011-01-15 16:22:13.172119103 +0000
@@ -38,7 +38,7 @@
 	    --host $(DEB_HOST_GNU_TYPE) 
 	cd helium && ./configure --prefix=/usr \
 	    --bindir=/usr/lib/helium/bin \
-	    --with-ag=/usr/bin/uuagc --with-ghc=/usr/bin/ghc6 \
+	    --with-ag=/usr/bin/uuagc --with-ghc=/usr/bin/ghc \
 	    --disable-logger $(CONFIGURE_FLAGS) 
 	touch configure-stamp