[Pkg-haskell-commits] darcs: haskell-yaml: New upstream version 0.4.1.1.

[clint at debian.org]

Sat Oct  8 17:09:58 UTC 2011  clint at debian.org
  * New upstream version 0.4.1.1.
  Ignore-this: f75f4f13e76ffb8f3e7ecfc49ee57828

    M ./changelog +7
    M ./control +1
    R ./patches/
    R ./patches/series
    R ./patches/use-shared-libyaml.diff
    M ./rules +2

Sat Oct  8 17:09:58 UTC 2011  clint at debian.org
  * New upstream version 0.4.1.1.
  Ignore-this: f75f4f13e76ffb8f3e7ecfc49ee57828
diff -rN -u old-haskell-yaml//changelog new-haskell-yaml//changelog
--- old-haskell-yaml//changelog	2011-10-08 17:10:12.710833047 +0000
+++ new-haskell-yaml//changelog	2011-10-08 17:10:12.714832537 +0000
@@ -1,3 +1,10 @@
+haskell-yaml (0.4.1.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Use system libyaml again.
+
+ -- Clint Adams <clint at debian.org>  Sat, 08 Oct 2011 12:55:05 -0400
+
 haskell-yaml (0.4.1-2) unstable; urgency=low
 
   * Disable patch to use system libyaml.
diff -rN -u old-haskell-yaml//control new-haskell-yaml//control
--- old-haskell-yaml//control	2011-10-08 17:10:12.710833047 +0000
+++ new-haskell-yaml//control	2011-10-08 17:10:12.718832453 +0000
@@ -15,6 +15,7 @@
   , libghc-transformers-dev
   , libghc-transformers-prof
   , libyaml-dev
+  , pkg-config
 Build-Depends-Indep: ghc-doc
   , libghc-bytestring-doc
   , libghc-enumerator-doc
diff -rN -u old-haskell-yaml//patches/series new-haskell-yaml//patches/series
--- old-haskell-yaml//patches/series	2011-10-08 17:10:12.710833047 +0000
+++ new-haskell-yaml//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#use-shared-libyaml.diff
diff -rN -u old-haskell-yaml//patches/use-shared-libyaml.diff new-haskell-yaml//patches/use-shared-libyaml.diff
--- old-haskell-yaml//patches/use-shared-libyaml.diff	2011-10-08 17:10:12.710833047 +0000
+++ new-haskell-yaml//patches/use-shared-libyaml.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
---- a/yaml.cabal
-+++ b/yaml.cabal
-@@ -11,9 +11,6 @@
- cabal-version:   >= 1.2
- build-type:      Simple
- homepage:        http://github.com/snoyberg/yaml/
--extra-source-files: c/helper.h,
--                    c/yaml_private.h,
--                    c/yaml.h
- 
- flag nolib
-   description: Skip building the library
-@@ -33,16 +30,7 @@
-                    , enumerator >= 0.4 && < 0.5
-     exposed-modules: Text.Libyaml
-     ghc-options:     -Wall
--    c-sources:       c/helper.c,
--                     c/api.c,
--                     c/dumper.c,
--                     c/emitter.c,
--                     c/loader.c,
--                     c/parser.c,
--                     c/reader.c,
--                     c/scanner.c,
--                     c/writer.c
--    include-dirs:    c
-+    extra-libraries: yaml
- 
- executable           runtests
-     if flag(buildtests)
-@@ -60,14 +48,5 @@
-     else
-         Buildable: False
-     ghc-options:     -Wall
--    c-sources:       c/helper.c,
--                     c/api.c,
--                     c/dumper.c,
--                     c/emitter.c,
--                     c/loader.c,
--                     c/parser.c,
--                     c/reader.c,
--                     c/scanner.c,
--                     c/writer.c
--    include-dirs:    c
-+    extra-libraries: yaml
-     main-is:         runtests.hs
diff -rN -u old-haskell-yaml//rules new-haskell-yaml//rules
--- old-haskell-yaml//rules	2011-10-08 17:10:12.706833324 +0000
+++ new-haskell-yaml//rules	2011-10-08 17:10:12.718832453 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_SETUP_GHC_CONFIGURE_ARGS := --flags=system-libyaml
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk