[Pkg-haskell-commits] darcs: haskell-debian: New upstream release

[Joachim Breitner]

Fri Aug 29 17:25:07 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog +6
    M ./control +10
    M ./patches/dont-build-tests.patch -14 +38

Fri Aug 29 17:25:07 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-haskell-debian/changelog new-haskell-debian/changelog
--- old-haskell-debian/changelog	2014-08-29 17:28:19.506040961 +0000
+++ new-haskell-debian/changelog	2014-08-29 17:28:19.514040959 +0000
@@ -1,3 +1,9 @@
+haskell-debian (3.83.3.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 29 Aug 2014 09:58:38 -0700
+
 haskell-debian (3.81-1) unstable; urgency=medium
 
   [ Joachim Breitner ]
diff -rN -u old-haskell-debian/control new-haskell-debian/control
--- old-haskell-debian/control	2014-08-29 17:28:19.506040961 +0000
+++ new-haskell-debian/control	2014-08-29 17:28:19.506040961 +0000
@@ -8,13 +8,20 @@
   , haskell-devscripts (>= 0.8.15)
   , ghc
   , ghc-prof
+  , libghc-either-dev
+  , libghc-either-prof
+  , libghc-exceptions-dev
+  , libghc-exceptions-prof
   , libghc-bzlib-dev
   , libghc-bzlib-prof
   , libghc-haxml-dev (>= 1:1.20)
   , libghc-haxml-prof
+  , libghc-listlike-dev (>= 4)
+  , libghc-listlike-prof
   , libghc-mtl-dev
   , libghc-mtl-prof
   , libghc-network-dev (>= 2.4)
+  , libghc-network-dev (<< 2.6)
   , libghc-network-prof
   , libghc-parsec3-dev
   , libghc-parsec3-prof
@@ -35,12 +42,15 @@
   , libghc-zlib-dev
   , libghc-zlib-prof
 Build-Depends-Indep: ghc-doc
+  , libghc-either-doc
+  , libghc-exceptions-doc
   , libghc-mtl-doc
   , libghc-parsec3-doc
   , libghc-regex-compat-doc
   , libghc-regex-tdfa-doc
   , libghc-bzlib-doc
   , libghc-haxml-doc
+  , libghc-listlike-doc
   , libghc-unixutils-doc
   , libghc-zlib-doc
   , libghc-network-doc
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	2014-08-29 17:28:19.502040963 +0000
+++ new-haskell-debian/patches/dont-build-tests.patch	2014-08-29 17:28:19.510040960 +0000
@@ -1,14 +1,16 @@
---- a/debian.cabal
-+++ b/debian.cabal
-@@ -32,7 +32,6 @@
-    directory,
+Index: debian-3.83.3.1/debian.cabal
+===================================================================
+--- debian-3.83.3.1.orig/debian.cabal	2014-08-29 10:01:11.647168975 -0700
++++ debian-3.83.3.1/debian.cabal	2014-08-29 10:06:49.767183397 -0700
+@@ -35,7 +35,6 @@
+    exceptions,
     filepath,
     HaXml >= 1.20,
 -   HUnit,
+    ListLike,
     mtl,
-    network >= 2.4,
     old-locale,
-@@ -93,11 +92,7 @@
+@@ -98,11 +97,7 @@
          Debian.UTF8,
          Debian.Util.FakeChanges
   other-modules:
@@ -20,16 +22,38 @@
 +        Debian.Version.Internal
  
  Executable fakechanges
-  Main-is: utils/FakeChanges.hs
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -8,8 +8,7 @@
+  Hs-Source-Dirs: utils
+@@ -129,19 +124,6 @@
+  ghc-options: -threaded -W -O2
+  Extensions:           ExistentialQuantification CPP
+ 
+-Executable debian-tests
+- Main-is: Test/Main.hs
+- ghc-options: -threaded -W -O2
+- Build-Depends: ansi-wl-pprint, base, bytestring, containers, debian, directory, exceptions, HUnit, ListLike, mtl, parsec, process, regex-compat, regex-tdfa, template-haskell, text, utf8-string
+- if flag(network-uri)
+-   Build-Depends: network >= 2.6, network-uri >= 2.6
+- else
+-   Build-Depends: network >= 2.4 && < 2.6
+- if flag(listlike)
+-   build-depends: process-listlike
+- else
+-   build-depends: process-extras
+-
+ source-repository head
+   type:     darcs
+   location: https://github.com/ddssff/debian-haskell
+Index: debian-3.83.3.1/Setup.hs
+===================================================================
+--- debian-3.83.3.1.orig/Setup.hs	2014-08-29 10:01:11.647168975 -0700
++++ debian-3.83.3.1/Setup.hs	2014-08-29 10:25:00.283229913 -0700
+@@ -10,8 +10,7 @@
  
  main = copyFile "debian/changelog" "changelog" >>
         defaultMainWithHooks simpleUserHooks {
--         postBuild = \ _ _ _ _ -> runTestScript
--       , runTests = \ _ _ _ _ -> runTestScript
-+        runTests = \ _ _ _ _ -> runTestScript
+-         postBuild = \ _ _ _ lbi -> runTestScript lbi
+-       , runTests = \ _ _ _ lbi -> runTestScript lbi
++         runTests = \ _ _ _ lbi -> runTestScript lbi
         }
  
- runTestScript =
+ runTestScript lbi =