Commit 820e2178 authored by Clint Adams's avatar Clint Adams
Browse files

debian: Upgrading from 3.95 to 4.0.0

parent d68552ba

p/haskell-debian/debian/changelog

+6 −0
Original line number Diff line number Diff line 
haskell-debian (4.0.0-1) unstable; urgency=medium



  * New upstream release



 -- Clint Adams <clint@debian.org>  Sat, 31 Aug 2019 09:49:52 -0400



haskell-debian (3.95-2) unstable; urgency=medium



  [ Ilias Tsitsimpis ]

p/haskell-debian/debian/control

+4 −7
Original line number Diff line number Diff line
@@ -14,16 +14,12 @@ Build-Depends: 
 haskell-devscripts (>= 0.15),

 libghc-hunit-dev,

 libghc-hunit-prof,

 libghc-haxml-dev (>= 1:1.20),

 libghc-haxml-prof,

 libghc-listlike-dev (>= 4.3.5),

 libghc-listlike-prof,

 libghc-quickcheck2-dev,

 libghc-quickcheck2-prof,

 libghc-sha-dev,

 libghc-sha-prof,

 libghc-unixutils-dev (>= 1.52.4),

 libghc-unixutils-prof,

 libghc-bzlib-dev,

 libghc-bzlib-prof,

 libghc-either-dev,
@@ -48,6 +44,8 @@ Build-Depends: 
 libghc-regex-tdfa-prof,

 libghc-syb-dev,

 libghc-syb-prof,

 libghc-temporary-dev,

 libghc-temporary-prof,

 libghc-th-lift-dev,

 libghc-th-lift-prof,

 libghc-th-orphans-dev,
@@ -58,11 +56,9 @@ Build-Depends: 
 libghc-zlib-prof,

Build-Depends-Indep: ghc-doc,

 libghc-hunit-doc,

 libghc-haxml-doc,

 libghc-listlike-doc,

 libghc-quickcheck2-doc,

 libghc-sha-doc,

 libghc-unixutils-doc,

 libghc-bzlib-doc,

 libghc-either-doc,

 libghc-exceptions-doc,
@@ -75,6 +71,7 @@ Build-Depends-Indep: ghc-doc, 
 libghc-regex-compat-doc,

 libghc-regex-tdfa-doc,

 libghc-syb-doc,

 libghc-temporary-doc,

 libghc-th-lift-doc,

 libghc-th-orphans-doc,

 libghc-utf8-string-doc,
@@ -82,7 +79,7 @@ Build-Depends-Indep: ghc-doc, 
Build-Conflicts:

 libghc-parsec2-dev,

Standards-Version: 4.4.0

Homepage: https://github.com/ddssff/debian-haskell

Homepage: https://github.com/clinty/debian-haskell

Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-debian

Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-debian]

p/haskell-debian/debian/patches/fix-testsuite

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
--- a/Test/Control.hs

+++ b/Test/Control.hs

@@ -53,11 +53,11 @@

     , TestCase (parseDebianControlFromFile "Test/Control.hs" >>= \ vc ->

                 assertEqual "policy4"

                             -- Exceptions have bogus Eq instances, so we need to show then compare.

-                            "Left \"./Debian/Control/Policy.hs\"(line 77, column 54): ParseControlError \"Test/Control.hs\" (line 0, column 0):\nFailed to parse Test/Control.hs"

+                            "Left \"src/Debian/Control/Policy.hs\"(line 77, column 54): ParseControlError \"Test/Control.hs\" (line 0, column 0):\nFailed to parse Test/Control.hs"

                             (show (either Left (either Left Right . debianRelations "Foo") vc)))

     , TestCase (parseDebianControlFromFile "nonexistant" >>= \ vc ->

                 assertEqual "policy5"

-                            "Left \"./Debian/Control/Policy.hs\"(line 76, column 36): IOError nonexistant: openBinaryFile: does not exist (No such file or directory)"

+                            "Left \"src/Debian/Control/Policy.hs\"(line 76, column 36): IOError nonexistant: openBinaryFile: does not exist (No such file or directory)"

                             (replaceString "openFile" "openBinaryFile"

                              (show (either Left (debianRelations "Foo") (vc :: Either ControlFileError DebianControl)))))

p/haskell-debian/debian/patches/series

+0 −1
Original line number Diff line number Diff line 
threaded-option
 
fix-testsuite

p/haskell-debian/debian/patches/threaded-option

+4 −15
Original line number Diff line number Diff line 
--- a/debian.cabal

+++ b/debian.cabal

@@ -25,6 +25,10 @@

@@ -20,6 +20,10 @@

  Description: Get Network.URI from the network-uri package

  Default: True

  Manual: True

 

+flag threaded

+  description: build threaded
@@ -11,7 +11,7 @@ 
 Library

  Hs-Source-Dirs: src

  Build-Depends:

@@ -119,14 +123,18 @@

@@ -109,14 +113,18 @@

  Hs-Source-Dirs: utils

  Main-is: FakeChanges.hs

  Build-Depends: base, debian, directory, filepath
@@ -21,18 +21,7 @@ 
+   ghc-options: -threaded

  Extensions:           ExistentialQuantification CPP

 

 Executable debian-report

  Hs-Source-Dirs: utils

  Main-is: Report.hs

  Build-Depends: base, debian, HaXml, unix

- ghc-options: -threaded -W

+ ghc-options: -W

+ if flag(threaded)

+   ghc-options: -threaded

  C-Sources:           cbits/gwinsz.c

  Include-Dirs:        cbits

  Install-Includes:    gwinsz.h

@@ -137,7 +145,9 @@

 Executable apt-get-build-depends

  Hs-Source-Dirs: utils

  Main-is: AptGetBuildDeps.hs

  Build-Depends: base, debian, process