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

Marco Silva marcot at debian.org
Sat Jan 15 15:17:52 UTC 2011 

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

    M ./changelog -8 +14
    M ./control -2 +2
    M ./happy.install -1 +1
    M ./rules -2 +2

Sat Jan 15 15:05:48 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: b22de5213a5fe5070190daae2ca1297c
diff -rN -u old-happy/changelog new-happy/changelog
--- old-happy/changelog	2011-01-15 15:17:52.612631128 +0000
+++ new-happy/changelog	2011-01-15 15:17:52.620631550 +0000
@@ -1,3 +1,9 @@
+happy (1.18.4-3) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:47 -0200
+
 happy (1.18.4-2) unstable; urgency=low
 
   [ Iain Lane ]
@@ -12,7 +18,7 @@
   * debian/watch: Remove spaces, since they're not allowed by uscan.
   * 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.
   * Use 3.0 (quilt) format.
 
  -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Sun, 21 Feb 2010 07:31:12 -0300
@@ -63,10 +69,10 @@
     - Some performance improvements to Happy itsel
   * 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.
-    - Add happy and libghc6-mtl-dev to the build dependencies.
+    - Add happy and libghc-mtl-dev to the build dependencies.
   * debian/copyright:
     - Fix debian-copyright-file-uses-obsolete-national-encoding lintian
       warning.
@@ -90,7 +96,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: #340325, #332979.
     * Removed autotool-dev build-dep.
   * Add 'XSLTPROC_OPTS = --nonet' to doc/config.mk.in.
@@ -105,7 +111,7 @@
 
 happy (1.15-2) unstable; urgency=low
 
-  * Revert unnecessary strictification of ghc6 build-dep to make
+  * Revert unnecessary strictification of ghc build-dep to make
     backports simpler.
   * Build-dep on docbook-xml so we don't need to get things from the
     'net when building.
@@ -117,8 +123,8 @@
   * NMU to make installable in unstable.
   * Rebuild against newer GHC6 to link to appropriate libgmp.
   * Remove ghc5 from build-depends in debian/control.
-  * Updated build-depends on ghc6 to 6.4-4.1 to make sure that
-    the package gets built with the appropriate ghc6 that includes the
+  * Updated build-depends on ghc to 6.4-4.1 to make sure that
+    the package gets built with the appropriate ghc that includes the
     libgmp fix.
 
  -- John Goerzen <jgoerzen at complete.org>  Fri,  9 Sep 2005 06:33:04 -0500
@@ -182,7 +188,7 @@
   * Prefer simple changes in .diff.gz rather than a patch system, especially
     as the number needed has dropped (and will hopefully drop further in the
     future).
-  * Allow ghc6 as an alternative to ghc5 as a build-dep.
+  * Allow ghc as an alternative to ghc5 as a build-dep.
 
  -- Ian Lynagh (wibble) <igloo at debian.org>  Sat, 30 Aug 2003 13:21:53 +0000
 
diff -rN -u old-happy/control new-happy/control
--- old-happy/control	2011-01-15 15:17:52.608630917 +0000
+++ new-happy/control	2011-01-15 15:17:52.620631550 +0000
@@ -9,12 +9,12 @@
                debhelper (>= 7),
                autoconf,
                docbook-utils,
-               ghc6,
+               ghc,
                docbook-xsl,
                docbook-xml,
                xsltproc,
                happy,
-               libghc6-mtl-dev
+               libghc-mtl-dev
 Homepage: http://www.haskell.org/happy
 Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/happy
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/happy
diff -rN -u old-happy/happy.install new-happy/happy.install
--- old-happy/happy.install	2011-01-15 15:17:52.608630917 +0000
+++ new-happy/happy.install	2011-01-15 15:17:52.616631339 +0000
@@ -1,2 +1,2 @@
-dist-ghc6/build/happy/happy usr/bin
+dist-ghc/build/happy/happy usr/bin
 doc/happy/* usr/share/doc/happy/html
diff -rN -u old-happy/rules new-happy/rules
--- old-happy/rules	2011-01-15 15:17:52.608630917 +0000
+++ new-happy/rules	2011-01-15 15:17:52.620631550 +0000
@@ -29,9 +29,9 @@
 	[ -d out ] || mkdir out
 
 	# 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/happy:: build-ghc6-stamp
+build/happy:: build-ghc-stamp
 	$(MAKE) -C doc html
 	sed -e "s#@LIBDIR@#/usr/share/happy-`debian/get_version`#g" \
 	    -e "s#@DOCDIR@#/usr/share/doc/happy#g" \

More information about the Pkg-haskell-commits mailing list