[Pkg-haskell-commits] darcs: haskell-augeas: Remove patch applied upstream

[Joachim Breitner]

Sat Jun 18 08:37:19 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove patch applied upstream
  Ignore-this: f199dc479048fea4f988a3671350fac0

    R ./patches/Setup-test-buildDir.patch
    M ./patches/no-tests.patch -4 +7
    M ./patches/series -1

Sat Jun 18 08:37:19 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove patch applied upstream
  Ignore-this: f199dc479048fea4f988a3671350fac0
diff -rN -u old-haskell-augeas//patches/no-tests.patch new-haskell-augeas//patches/no-tests.patch
--- old-haskell-augeas//patches/no-tests.patch	2011-06-18 08:38:30.696275821 +0000
+++ new-haskell-augeas//patches/no-tests.patch	2011-06-18 08:38:30.712282283 +0000
@@ -1,16 +1,19 @@
 Do not run tests (otherwise, HUnit becomes a dependency of the library, which
 should not happen. TODO: Investigate how to avoid this, and whether this is a
 Cabal bug/limitation).
---- haskell-augeas-0.3.4.orig/augeas.cabal
-+++ haskell-augeas-0.3.4/augeas.cabal
-@@ -22,14 +22,3 @@ library
-         GHC-options: -Wall -fwarn-dodgy-imports
+Index: haskell-augeas-0.4.0/augeas.cabal
+===================================================================
+--- haskell-augeas-0.4.0.orig/augeas.cabal	2011-04-13 15:26:17.000000000 +0200
++++ haskell-augeas-0.4.0/augeas.cabal	2011-06-18 10:30:06.000000000 +0200
+@@ -23,15 +23,3 @@
+         Include-Dirs: .
          Extensions: CPP
          Pkgconfig-Depends: augeas
 -
 -executable "test-haskell-augeas"
 -        Main-is: HUnitAug.hs
 -        Build-Depends: HUnit
+-        Include-Dirs: .
 -        Other-Modules: System.Augeas, System.AugeasHsc
 -        extra-libraries: augeas
 -        GHC-options: -Wall -fwarn-dodgy-imports 
diff -rN -u old-haskell-augeas//patches/series new-haskell-augeas//patches/series
--- old-haskell-augeas//patches/series	2011-06-18 08:38:30.696275821 +0000
+++ new-haskell-augeas//patches/series	2011-06-18 08:38:30.712282283 +0000
@@ -1,2 +1 @@
-Setup-test-buildDir.patch
 no-tests.patch
diff -rN -u old-haskell-augeas//patches/Setup-test-buildDir.patch new-haskell-augeas//patches/Setup-test-buildDir.patch
--- old-haskell-augeas//patches/Setup-test-buildDir.patch	2011-06-18 08:38:30.708278247 +0000
+++ new-haskell-augeas//patches/Setup-test-buildDir.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
---- haskell-augeas-0.3.4.orig/Setup.hs
-+++ haskell-augeas-0.3.4/Setup.hs
-@@ -24,6 +24,7 @@
- import Data.List (isInfixOf)
- import Distribution.PackageDescription
- import Distribution.Simple
-+import Distribution.Simple.LocalBuildInfo (buildDir)
- import System.Process 
- 
- -- main = defaultMain
-@@ -32,8 +33,8 @@ import System.Process
- main = defaultMainWithHooks autoconfUserHooks { runTests = _runTests, instHook = _instHook }
-     where
-         -- Run all executables with names that end in -tests
--        _runTests _ _ pd _ = do
--            let exeNames = ["dist/build/" ++ fp ++ "/" ++ fp | fp <- map exeName (executables pd)]
-+        _runTests _ _ pd lbi = do
-+            let exeNames = [buildDir lbi ++ "/" ++ fp ++ "/" ++ fp | fp <- map exeName (executables pd)]
-             sequence [_runTest e | e <- exeNames, isInfixOf "test-" e]
-             return ()
-         _runTest fp = do