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

[Marco Silva]

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

    M ./alex.install -2 +2
    M ./changelog -3 +7
    M ./control -1 +1
    M ./rules -3 +3

Sat Jan 15 15:06:26 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: cef7bb4a9b304f88b9e98d8c2274a5a8
diff -rN -u old-alex/alex.install new-alex/alex.install
--- old-alex/alex.install	2011-01-15 15:13:12.781879018 +0000
+++ new-alex/alex.install	2011-01-15 15:13:12.785879228 +0000
@@ -1,2 +1,2 @@
-dist-ghc6/build/alex/alex usr/bin
-debian/tmp-inst-ghc6/usr/share/alex* usr/share
+dist-ghc/build/alex/alex usr/bin
+debian/tmp-inst-ghc/usr/share/alex* usr/share
diff -rN -u old-alex/changelog new-alex/changelog
--- old-alex/changelog	2011-01-15 15:13:12.781879018 +0000
+++ new-alex/changelog	2011-01-15 15:13:12.789879439 +0000
@@ -1,8 +1,12 @@
 alex (2.3.4-1) UNRELEASED; urgency=low
 
+  [ Erik de Castro Lopo ]
   * New upstream.
   * Remove patches/00-fix-warnings-on-big-endian.diff (fixed upstream).
 
+  [ Marco Silva ]
+  * Use ghc instead of ghc
+
  -- Erik de Castro Lopo <erikd at mega-nerd.com>  Wed, 24 Nov 2010 20:23:08 +1100
 
 alex (2.3.3-2) experimental; urgency=low
@@ -38,7 +42,7 @@
   * debian/control: Use Vcs-Browser: field.
   * debian/control: Bump Standards-Version: to 3.8.4, no changes needed.
   * debian/control: Bump version of Build-Depends: on haskell-devscripts
-    to 0.7 and remove versioned Build-Depends: on ghc6.
+    to 0.7 and remove versioned Build-Depends: on ghc.
 
  -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Sun, 21 Feb 2010 09:30:03 -0300
 
@@ -74,7 +78,7 @@
     - Fixes a spelling mistake. (Closes: #419671)
   * debian/control:
     - Added Homepage field.
-    - Bump the build dependency on ghc6 to 6.8.2 as the packages needs
+    - Bump the build dependency on ghc to 6.8.2 as the packages needs
       Cabal 1.2 to build.
     - Bump the Standards-Version to 3.7.3. No changes needed.
   * debian/copyright:
@@ -98,7 +102,7 @@
     * Various debian/rules changes.
     * Create debian/get_version.hs for extracting the version from the cabal
       file.
-    * Requires ghc6 >= 6.4.2.
+    * Requires ghc >= 6.4.2.
     * No longer tries to detect platform. Closes: #332980, #340326.
   * Add 'XSLTPROC_OPTS = --nonet' to doc/config.mk.in.
   * Remove src/Parser.y and src/Scan.x before cleaning so the generated
diff -rN -u old-alex/control new-alex/control
--- old-alex/control	2011-01-15 15:13:12.781879018 +0000
+++ new-alex/control	2011-01-15 15:13:12.789879439 +0000
@@ -7,7 +7,7 @@
 Build-Depends: cdbs (>= 0.4.59),
                haskell-devscripts (>= 0.7),
                debhelper (>= 7),
-               ghc6,
+               ghc,
                alex,
                happy,
                jade,
diff -rN -u old-alex/rules new-alex/rules
--- old-alex/rules	2011-01-15 15:13:12.781879018 +0000
+++ new-alex/rules	2011-01-15 15:13:12.785879228 +0000
@@ -28,16 +28,16 @@
 	cd doc && autoconf && rm -r autom4te.cache &&  ./configure --prefix=/usr
 
 	# used in build to stick version into man page
-	ghc6 --make debian/get_version.hs -o debian/get_version
+	ghc --make debian/get_version.hs -o debian/get_version
 
-build/alex:: build-ghc6-stamp
+build/alex:: build-ghc-stamp
 	$(MAKE) -C doc html
 	sed -e "s#@LIBDIR@#/usr/lib/alex-`debian/get_version`#g" \
 	    -e "s#@DOCDIR@#/usr/share/doc/alex#g" \
 	    -e "s#@VERSION@#`debian/get_version`#g" \
 	  doc/alex.1.in > doc/alex.1
 
-install/alex:: debian/tmp-inst-ghc6
+install/alex:: debian/tmp-inst-ghc
 	dh_installdirs usr/share/doc/alex/html
 	cp -a doc/alex/* `pwd`/debian/`dh_listpackages`/usr/share/doc/alex/html