[DHG_packages] 01/01: snap: patch for newer lens, aeson, HUnit, QuickCheck; enable testsuite

Clint Adams clint at moszumanska.debian.org
Wed Jul 19 12:02:12 UTC 2017


This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit 5703802bab947859826f81f6ac7800869fa4ef47
Author: Clint Adams <clint at debian.org>
Date:   Wed Jul 19 08:01:18 2017 -0400

    snap: patch for newer lens, aeson, HUnit, QuickCheck; enable testsuite
---
 p/haskell-snap/debian/changelog                    |  7 +++
 p/haskell-snap/debian/control                      | 26 +++++++++--
 p/haskell-snap/debian/patches/newer-directory      | 16 -------
 .../debian/patches/newer-metadata-from-hackage     | 50 ++++++++++++++++++++++
 p/haskell-snap/debian/patches/series               |  2 +-
 p/haskell-snap/debian/rules                        |  2 +
 6 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/p/haskell-snap/debian/changelog b/p/haskell-snap/debian/changelog
index 14ff725..1fa0a63 100644
--- a/p/haskell-snap/debian/changelog
+++ b/p/haskell-snap/debian/changelog
@@ -1,3 +1,10 @@
+haskell-snap (1.0.0.1-7) unstable; urgency=medium
+
+  * Patch for newer lens, aeson, HUnit, QuickCheck.  closes: #868866.
+  * Enable testsuite.
+
+ -- Clint Adams <clint at debian.org>  Wed, 19 Jul 2017 07:46:24 -0400
+
 haskell-snap (1.0.0.1-6) unstable; urgency=medium
 
   * Team upload.
diff --git a/p/haskell-snap/debian/control b/p/haskell-snap/debian/control
index 806f4ac..24ac4c8 100644
--- a/p/haskell-snap/debian/control
+++ b/p/haskell-snap/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
  ghc-ghci,
  ghc-prof,
  haskell-devscripts (>= 0.13),
- libghc-aeson-dev (<< 1.1),
  libghc-aeson-dev (>= 0.6),
+ libghc-aeson-dev (<< 1.2),
  libghc-aeson-prof,
  libghc-attoparsec-dev (<< 0.14),
  libghc-attoparsec-dev (>= 0.10),
@@ -38,8 +38,8 @@ Build-Depends:
  libghc-heist-dev (<< 1.1),
  libghc-heist-dev (>= 1.0),
  libghc-heist-prof,
- libghc-lens-dev (<< 4.15),
  libghc-lens-dev (>= 3.7.6),
+ libghc-lens-dev (<< 4.16),
  libghc-lens-prof,
  libghc-lifted-base-dev (<< 0.3),
  libghc-lifted-base-dev (>= 0.2),
@@ -80,6 +80,26 @@ Build-Depends:
  libghc-xmlhtml-dev (<< 0.3),
  libghc-xmlhtml-dev (>= 0.1),
  libghc-xmlhtml-prof,
+ libghc-async-dev (>= 2.0.1.5) <!nocheck>,
+ libghc-async-dev (<< 2.2) <!nocheck>,
+ libghc-glob-dev (>= 0.7.5) <!nocheck>,
+ libghc-glob-dev (<< 0.8) <!nocheck>,
+ libghc-http-streams-dev (>= 0.7.1.1) <!nocheck>,
+ libghc-http-streams-dev (<< 0.9) <!nocheck>,
+ libghc-hunit-dev (>= 1.2.5.2) <!nocheck>,
+ libghc-hunit-dev (<< 1.7) <!nocheck>,
+ libghc-quickcheck2-dev (>= 2.4.2) <!nocheck>,
+ libghc-quickcheck2-dev (<< 2.10) <!nocheck>,
+ libghc-smallcheck-dev (>= 1.1.1) <!nocheck>,
+ libghc-smallcheck-dev (<< 1.2) <!nocheck>,
+ libghc-test-framework-dev (>= 0.8.0.3) <!nocheck>,
+ libghc-test-framework-dev (<< 0.9) <!nocheck>,
+ libghc-test-framework-hunit-dev (>= 0.3.0.1) <!nocheck>,
+ libghc-test-framework-hunit-dev (<< 0.4) <!nocheck>,
+ libghc-test-framework-quickcheck2-dev (>= 0.3.0.3) <!nocheck>,
+ libghc-test-framework-quickcheck2-dev (<< 0.4) <!nocheck>,
+ libghc-test-framework-smallcheck-dev (>= 0.2) <!nocheck>,
+ libghc-test-framework-smallcheck-dev (<< 0.3) <!nocheck>,
 Build-Depends-Indep:
  ghc-doc,
  libghc-aeson-doc,
@@ -105,7 +125,7 @@ Build-Depends-Indep:
  libghc-transformers-base-doc,
  libghc-unordered-containers-doc,
  libghc-xmlhtml-doc,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: http://snapframework.com/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-snap
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git
diff --git a/p/haskell-snap/debian/patches/newer-directory b/p/haskell-snap/debian/patches/newer-directory
deleted file mode 100644
index bc36b49..0000000
--- a/p/haskell-snap/debian/patches/newer-directory
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Bump directory bounds on buildds.
-Author: Bhavani Shankar <bhavi at ubuntu.com>
-
---- haskell-snap-1.0.0.1.orig/snap.cabal
-+++ haskell-snap-1.0.0.1/snap.cabal
-@@ -111,8 +111,8 @@ Library
-     clientsession             >= 0.8      && < 0.10,
-     configurator              >= 0.1      && < 0.4,
-     containers                >= 0.2      && < 0.6,
--    directory                 >= 1.1      && < 1.3,
--    directory-tree            >= 0.10     && < 0.13,
-+    directory                 >= 1.1      && < 1.4,
-+    directory-tree            >= 0.10     && < 0.14,
-     dlist                     >= 0.5      && < 0.9,
-     filepath                  >= 1.3      && < 1.5,
-     -- hashable is broken from 1.2.0.0 through 1.2.0.5
diff --git a/p/haskell-snap/debian/patches/newer-metadata-from-hackage b/p/haskell-snap/debian/patches/newer-metadata-from-hackage
new file mode 100644
index 0000000..6b1cb82
--- /dev/null
+++ b/p/haskell-snap/debian/patches/newer-metadata-from-hackage
@@ -0,0 +1,50 @@
+Description: Bump directory bounds on buildds.
+Author: Bhavani Shankar <bhavi at ubuntu.com>
+
+--- a/snap.cabal
++++ b/snap.cabal
+@@ -103,7 +103,7 @@
+     Snap.Snaplet.Session.SecureCookie
+ 
+   build-depends:
+-    aeson                     >= 0.6      && < 1.1,
++    aeson                     >= 0.6      && < 1.2,
+     attoparsec                >= 0.10     && < 0.14,
+     base                      >= 4        && < 5,
+     bytestring                >= 0.9.1    && < 0.11,
+@@ -111,7 +111,7 @@
+     clientsession             >= 0.8      && < 0.10,
+     configurator              >= 0.1      && < 0.4,
+     containers                >= 0.2      && < 0.6,
+-    directory                 >= 1.1      && < 1.3,
++    directory                 >= 1.1      && < 1.4,
+     directory-tree            >= 0.10     && < 0.13,
+     dlist                     >= 0.5      && < 0.9,
+     filepath                  >= 1.3      && < 1.5,
+@@ -120,7 +120,7 @@
+     -- the version disjunction causes problems with dependency resolution.
+     hashable                  >= 1.2.0.6  && < 1.3,
+     heist                     >= 1.0      && < 1.1,
+-    lens                      >= 3.7.6    && < 4.15,
++    lens                      >= 3.7.6    && < 4.16,
+     lifted-base               >= 0.2      && < 0.3,
+     map-syntax                >= 0.2      && < 0.3,
+     monad-control             >= 0.3      && < 1.1,
+@@ -237,7 +237,7 @@
+     hashable,
+     heist,
+     http-streams               >= 0.7.1.1  && < 0.9,
+-    HUnit                      >= 1.2.5.2  && < 1.4,
++    HUnit                      >= 1.2.5.2  && < 1.7,
+     lens,
+     lifted-base,
+     map-syntax,
+@@ -245,7 +245,7 @@
+     mtl,
+     mwc-random,
+     pwstore-fast,
+-    QuickCheck                 >= 2.4.2    && < 2.9,
++    QuickCheck                 >= 2.4.2    && < 2.10,
+     smallcheck                 >= 1.1.1    && < 1.2,
+     snap-core,
+     snap-server,
diff --git a/p/haskell-snap/debian/patches/series b/p/haskell-snap/debian/patches/series
index 9c42677..e4ab113 100644
--- a/p/haskell-snap/debian/patches/series
+++ b/p/haskell-snap/debian/patches/series
@@ -1,2 +1,2 @@
 rename-snap-binary
-newer-directory
+newer-metadata-from-hackage
diff --git a/p/haskell-snap/debian/rules b/p/haskell-snap/debian/rules
index 683e77b..01f1aaf 100755
--- a/p/haskell-snap/debian/rules
+++ b/p/haskell-snap/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_ENABLE_TESTS = yes
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git



More information about the Pkg-haskell-commits mailing list