[Pkg-haskell-commits] darcs: haskell-debian: patches/dont-build-teste.patch: Update patch to new upstream version.

[Marco Silva]

Sat Jun  4 00:05:23 UTC 2011  Marco Silva <marcot at debian.org>
  * patches/dont-build-teste.patch: Update patch to new upstream version.
  Ignore-this: 281785ee224d74081c3fa899aa700aea

    M ./changelog +2
    M ./patches/dont-build-tests.patch -8 +8

Sat Jun  4 00:05:23 UTC 2011  Marco Silva <marcot at debian.org>
  * patches/dont-build-teste.patch: Update patch to new upstream version.
  Ignore-this: 281785ee224d74081c3fa899aa700aea
diff -rN -u old-haskell-debian//changelog new-haskell-debian//changelog
--- old-haskell-debian//changelog	2011-06-13 13:33:07.179933907 +0000
+++ new-haskell-debian//changelog	2011-06-13 13:33:07.241297238 +0000
@@ -7,6 +7,8 @@
   * control: Standards-Version: Bump, no changes needed.
   * control: haskell-debian-utils: Adds Recommends: apt-file.
   * New upstream version.
+  * patches/dont-build-teste.patch: Update patch to new upstream
+    version.
 
  -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:54 -0200
 
diff -rN -u old-haskell-debian//patches/dont-build-tests.patch new-haskell-debian//patches/dont-build-tests.patch
--- old-haskell-debian//patches/dont-build-tests.patch	2011-06-13 13:33:07.176305726 +0000
+++ new-haskell-debian//patches/dont-build-tests.patch	2011-06-13 13:33:07.188797914 +0000
@@ -1,17 +1,17 @@
-Index: haskell-debian-3.47/debian.cabal
+Index: debian-3.55/debian.cabal
 ===================================================================
---- haskell-debian-3.47.orig/debian.cabal	2010-05-09 18:56:23.000000000 +0200
-+++ haskell-debian-3.47/debian.cabal	2010-05-09 18:58:10.000000000 +0200
+--- debian-3.55.orig/debian.cabal	2011-06-03 21:02:01.000000000 -0300
++++ debian-3.55/debian.cabal	2011-06-03 21:03:43.000000000 -0300
 @@ -22,7 +22,7 @@
  Library
   Build-Depends:  base >= 4 && < 5, bytestring, containers, directory,
                   filepath, mtl, network, old-locale, parsec >= 2 && <4, pretty, process,
--                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml < 1.14, Unixutils, zlib, HUnit
-+                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml < 1.14, Unixutils, zlib
-  ghc-options: -O2 -W -Wall
+-                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml == 1.20.*, Unixutils >= 1.32, zlib, HUnit,
++                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml == 1.20.*, Unixutils >= 1.32, zlib,
+                  utf8-string
+  ghc-options: -W -Wall
   if flag(cabal19)
-    build-depends: Cabal >= 1.9
-@@ -64,11 +64,7 @@
+@@ -65,11 +65,7 @@
          Distribution.Package.Debian.Bundled,
          Distribution.Package.Debian.Setup,
          Distribution.Package.Debian.Main,