[Pkg-haskell-commits] darcs: happy: releasing version 1.18.6-1

[Joachim Breitner]

Tue Mar 29 08:30:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * releasing version 1.18.6-1
  Ignore-this: 7654501e3125bdf86a492c8e7e3ba6a1

    M ./changelog -2 +2
    M ./patches/templates_path.patch -7 +7

Tue Mar 29 08:30:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * releasing version 1.18.6-1
  Ignore-this: 7654501e3125bdf86a492c8e7e3ba6a1
diff -rN -u old-happy/changelog new-happy/changelog
--- old-happy/changelog	2011-03-29 08:30:10.372435625 +0000
+++ new-happy/changelog	2011-03-29 08:30:10.380436046 +0000
@@ -1,4 +1,4 @@
-happy (1.18.6-1) UNRELEASED; urgency=low
+happy (1.18.6-1) unstable; urgency=low
 
   [ Marco Silva ]
   * Use ghc instead of ghc6
@@ -6,7 +6,7 @@
   [ Joachim Breitner ]
   * New upstream release 
 
- -- Joachim Breitner <nomeata at debian.org>  Tue, 29 Mar 2011 13:52:39 +0530
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 29 Mar 2011 13:55:39 +0530
 
 happy (1.18.4-2) unstable; urgency=low
 
diff -rN -u old-happy/patches/templates_path.patch new-happy/patches/templates_path.patch
--- old-happy/patches/templates_path.patch	2011-03-29 08:30:10.372435625 +0000
+++ new-happy/patches/templates_path.patch	2011-03-29 08:30:10.376435835 +0000
@@ -1,19 +1,19 @@
 Build these templates in out/ to make it easier to install them. Otherwise they are installed in the buildroot which would make for a messy install file.
 
-Index: happy-1.18.4/Setup.lhs
+Index: happy-1.18.6/Setup.lhs
 ===================================================================
---- happy-1.18.4.orig/Setup.lhs	2009-09-30 13:24:58.367762731 +0100
-+++ happy-1.18.4/Setup.lhs	2009-09-30 13:25:28.111762814 +0100
+--- happy-1.18.6.orig/Setup.lhs	2010-11-17 17:00:24.000000000 +0530
++++ happy-1.18.6/Setup.lhs	2011-03-29 13:58:16.000000000 +0530
 @@ -33,9 +33,9 @@
          runProgram ghcProgram (["-o", dst, "-E", "-cpp", "templates" </> src] ++ opts)
  	runProgram perlProgram ["-i.bak", "-pe", crazy_perl_regexp, dst]
  
 -  sequence_ ([ cpp_template "GenericTemplate.hs" dst opts | (dst,opts) <- templates ] ++
--             [ cpp_template "GLR_Base.lhs"       dst opts | (dst,opts) <- glr_base_templates ] ++
--             [ cpp_template "GLR_Lib.lhs"        dst opts | (dst,opts) <- glr_templates ])
+-             [ cpp_template "GLR_Base.hs"       dst opts | (dst,opts) <- glr_base_templates ] ++
+-             [ cpp_template "GLR_Lib.hs"        dst opts | (dst,opts) <- glr_templates ])
 +  sequence_ ([ cpp_template "GenericTemplate.hs" ("out/" ++ dst) opts | (dst,opts) <- templates ] ++
-+             [ cpp_template "GLR_Base.lhs"       ("out/" ++ dst) opts | (dst,opts) <- glr_base_templates ] ++
-+             [ cpp_template "GLR_Lib.lhs"        ("out/" ++ dst) opts | (dst,opts) <- glr_templates ])
++             [ cpp_template "GLR_Base.hs"       ("out/" ++ dst) opts | (dst,opts) <- glr_base_templates ] ++
++             [ cpp_template "GLR_Lib.hs"        ("out/" ++ dst) opts | (dst,opts) <- glr_templates ])
  
  myPostClean _ _ _ _ = mapM_ (try . removeFile) all_template_files