[Git][haskell-team/DHG_packages][master] 2 commits: hsx-jmacro: patch for newer wl-pprint-text
Clint Adams
gitlab at salsa.debian.org
Tue May 22 01:27:32 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
b89e3796 by Clint Adams at 2018-05-21T13:41:59-04:00
hsx-jmacro: patch for newer wl-pprint-text
- - - - -
cd8eb1f0 by Clint Adams at 2018-05-21T20:26:55-04:00
snap: patch for newer build-deps
- - - - -
9 changed files:
- p/haskell-hsx-jmacro/debian/changelog
- p/haskell-hsx-jmacro/debian/control
- + p/haskell-hsx-jmacro/debian/patches/newer-wl-pprint-text
- + p/haskell-hsx-jmacro/debian/patches/series
- p/haskell-snap/debian/changelog
- p/haskell-snap/debian/control
- + p/haskell-snap/debian/patches/newer-deps
- p/haskell-snap/debian/patches/no-test-framework-smallcheck
- p/haskell-snap/debian/patches/series
Changes:
=====================================
p/haskell-hsx-jmacro/debian/changelog
=====================================
--- a/p/haskell-hsx-jmacro/debian/changelog
+++ b/p/haskell-hsx-jmacro/debian/changelog
@@ -1,8 +1,9 @@
-haskell-hsx-jmacro (7.3.8-5) UNRELEASED; urgency=medium
+haskell-hsx-jmacro (7.3.8-6) unstable; urgency=medium
* Set Rules-Requires-Root to no.
+ * Patch for newer wl-pprint-text.
- -- Clint Adams <clint at debian.org> Sun, 06 May 2018 22:09:54 -0400
+ -- Clint Adams <clint at debian.org> Mon, 21 May 2018 13:41:42 -0400
haskell-hsx-jmacro (7.3.8-4) unstable; urgency=medium
=====================================
p/haskell-hsx-jmacro/debian/control
=====================================
--- a/p/haskell-hsx-jmacro/debian/control
+++ b/p/haskell-hsx-jmacro/debian/control
@@ -23,7 +23,6 @@ Build-Depends:
libghc-text-dev (<< 1.3),
libghc-text-dev (>= 0.11),
libghc-text-prof,
- libghc-wl-pprint-text-dev (<< 1.2),
libghc-wl-pprint-text-dev (>= 1.1),
libghc-wl-pprint-text-prof,
Build-Depends-Indep:
=====================================
p/haskell-hsx-jmacro/debian/patches/newer-wl-pprint-text
=====================================
--- /dev/null
+++ b/p/haskell-hsx-jmacro/debian/patches/newer-wl-pprint-text
@@ -0,0 +1,9 @@
+--- a/hsx-jmacro.cabal
++++ b/hsx-jmacro.cabal
+@@ -29,5 +29,5 @@
+ hsp >= 0.9 && < 0.11,
+ jmacro >= 0.6 && < 0.7,
+ mtl >= 2.0 && < 2.3,
+- wl-pprint-text == 1.1.*,
++ wl-pprint-text >= 1.1,
+ text >= 0.11 && < 1.3
=====================================
p/haskell-hsx-jmacro/debian/patches/series
=====================================
--- /dev/null
+++ b/p/haskell-hsx-jmacro/debian/patches/series
@@ -0,0 +1 @@
+newer-wl-pprint-text
=====================================
p/haskell-snap/debian/changelog
=====================================
--- a/p/haskell-snap/debian/changelog
+++ b/p/haskell-snap/debian/changelog
@@ -1,8 +1,9 @@
-haskell-snap (1.1.0.0-2) UNRELEASED; urgency=medium
+haskell-snap (1.1.0.0-3) unstable; urgency=medium
* Set Rules-Requires-Root to no.
+ * Patch for newer build-deps.
- -- Clint Adams <clint at debian.org> Sun, 06 May 2018 22:10:35 -0400
+ -- Clint Adams <clint at debian.org> Mon, 21 May 2018 20:26:32 -0400
haskell-snap (1.1.0.0-1) unstable; urgency=medium
=====================================
p/haskell-snap/debian/control
=====================================
--- a/p/haskell-snap/debian/control
+++ b/p/haskell-snap/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
ghc-prof,
haskell-devscripts (>= 0.13),
libghc-aeson-dev (>= 0.6),
- libghc-aeson-dev (<< 1.3),
+ libghc-aeson-dev (<< 1.4),
libghc-aeson-prof,
libghc-attoparsec-dev (<< 0.14),
libghc-attoparsec-dev (>= 0.10),
@@ -36,17 +36,17 @@ Build-Depends:
libghc-hashable-dev (<< 1.3),
libghc-hashable-dev (>= 1.2.0.6),
libghc-hashable-prof,
- libghc-heist-dev (<< 1.1),
libghc-heist-dev (>= 1.0),
+ libghc-heist-dev (<< 1.2),
libghc-heist-prof,
libghc-lens-dev (>= 3.7.6),
- libghc-lens-dev (<< 4.16),
+ libghc-lens-dev (<< 4.17),
libghc-lens-prof,
libghc-lifted-base-dev (<< 0.3),
libghc-lifted-base-dev (>= 0.2),
libghc-lifted-base-prof,
- libghc-map-syntax-dev (<< 0.3),
libghc-map-syntax-dev (>= 0.2),
+ libghc-map-syntax-dev (<< 0.4),
libghc-map-syntax-prof,
libghc-monad-control-dev (<< 1.1),
libghc-monad-control-dev (>= 0.3),
@@ -63,8 +63,8 @@ Build-Depends:
libghc-snap-core-dev (<< 1.1),
libghc-snap-core-dev (>= 1.0),
libghc-snap-core-prof,
- libghc-snap-server-dev (<< 1.1),
libghc-snap-server-dev (>= 1.0),
+ libghc-snap-server-dev (<< 1.2),
libghc-snap-server-prof,
libghc-stm-dev (<< 2.5),
libghc-stm-dev (>= 2.2),
@@ -85,9 +85,8 @@ Build-Depends:
libghc-hunit-dev (<< 1.7),
libghc-quickcheck2-dev (>= 2.4.2),
libghc-quickcheck2-dev (<< 2.11),
- libghc-aeson-dev,
libghc-async-dev (>= 2.0.1.5),
- libghc-async-dev (<< 2.2),
+ libghc-async-dev (<< 2.3),
libghc-attoparsec-dev,
libghc-cereal-dev,
libghc-clientsession-dev,
=====================================
p/haskell-snap/debian/patches/newer-deps
=====================================
--- /dev/null
+++ b/p/haskell-snap/debian/patches/newer-deps
@@ -0,0 +1,41 @@
+--- a/snap.cabal
++++ b/snap.cabal
+@@ -103,7 +103,7 @@
+ Snap.Snaplet.Session.SecureCookie
+
+ build-depends:
+- aeson >= 0.6 && < 1.3,
++ aeson >= 0.6 && < 1.4,
+ attoparsec >= 0.10 && < 0.14,
+ base >= 4 && < 4.11,
+ bytestring >= 0.9.1 && < 0.11,
+@@ -119,16 +119,16 @@
+ -- snap does work with hashable 1.1.*, but some have complained that
+ -- 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.16,
++ heist >= 1.0 && < 1.2,
++ lens >= 3.7.6 && < 4.17,
+ lifted-base >= 0.2 && < 0.3,
+- map-syntax >= 0.2 && < 0.3,
++ map-syntax >= 0.2 && < 0.4,
+ monad-control >= 0.3 && < 1.1,
+ mtl >= 2.0 && < 2.3,
+ mwc-random >= 0.8 && < 0.14,
+ pwstore-fast >= 2.2 && < 2.5,
+ snap-core >= 1.0 && < 1.1,
+- snap-server >= 1.0 && < 1.1,
++ snap-server >= 1.0 && < 1.2,
+ stm >= 2.2 && < 2.5,
+ text >= 0.11 && < 1.3,
+ time >= 1.1 && < 1.9,
+@@ -220,7 +220,7 @@
+
+ build-depends:
+ aeson,
+- async >= 2.0.1.5 && < 2.2,
++ async >= 2.0.1.5 && < 2.3,
+ attoparsec,
+ base,
+ bytestring,
=====================================
p/haskell-snap/debian/patches/no-test-framework-smallcheck
=====================================
--- a/p/haskell-snap/debian/patches/no-test-framework-smallcheck
+++ b/p/haskell-snap/debian/patches/no-test-framework-smallcheck
@@ -1,6 +1,6 @@
--- a/snap.cabal
+++ b/snap.cabal
-@@ -255,7 +255,6 @@
+@@ -254,7 +254,6 @@
test-framework >= 0.8.0.3 && < 0.9,
test-framework-hunit >= 0.3.0.1 && < 0.4,
test-framework-quickcheck2 >= 0.3.0.3 && < 0.4,
=====================================
p/haskell-snap/debian/patches/series
=====================================
--- a/p/haskell-snap/debian/patches/series
+++ b/p/haskell-snap/debian/patches/series
@@ -1,3 +1,4 @@
rename-snap-binary
no-test-framework-smallcheck
tests-timeout
+newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/ea01801178a9a36a8cc158679ce3a79ae05fbee1...cd8eb1f03c93c7f105af65172fa227ae8423faa4
---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/ea01801178a9a36a8cc158679ce3a79ae05fbee1...cd8eb1f03c93c7f105af65172fa227ae8423faa4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180522/2e45a135/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list