diff options
| author | Clint Adams <clint@debian.org> | 2016-10-12 18:53:42 -0400 |
|---|---|---|
| committer | Clint Adams <clint@debian.org> | 2016-10-12 18:53:42 -0400 |
| commit | 160c84c1046cc804e786663ae34b12a0b108e567 (patch) | |
| tree | bf2ddb453cd2eb41edb735828a34ac87c04d72af /p/haskell-http2 | |
| parent | e7d091a0222b0dbc897436def874f092d4874f47 (diff) | |
| parent | 82ce455936337280b4fddaf8fbc7bed0d015167d (diff) | |
| download | DHG_packages-160c84c1046cc804e786663ae34b12a0b108e567.tar.gz | |
Merge branch 'master' into experimental
what a mess
Diffstat (limited to 'p/haskell-http2')
4 files changed, 18 insertions, 18 deletions
diff --git a/p/haskell-http2/debian/changelog b/p/haskell-http2/debian/changelog index ae77457cd..f2be404f5 100644 --- a/p/haskell-http2/debian/changelog +++ b/p/haskell-http2/debian/changelog @@ -1,8 +1,14 @@ -haskell-http2 (1.6.0-2) UNRELEASED; urgency=medium +haskell-http2 (1.6.2-1) unstable; urgency=medium - * Fix VCS fields + * New upstream release + + -- Clint Adams <clint@debian.org> Thu, 25 Aug 2016 22:31:33 -0400 + +haskell-http2 (1.6.1-1) unstable; urgency=medium + + * New upstream release - -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 02 Jun 2016 19:12:40 +0200 + -- Clint Adams <clint@debian.org> Tue, 12 Jul 2016 16:57:48 -0400 haskell-http2 (1.6.0-1) unstable; urgency=medium diff --git a/p/haskell-http2/debian/patches/disable-doctest b/p/haskell-http2/debian/patches/disable-doctest index 698b33acc..0b6652193 100644 --- a/p/haskell-http2/debian/patches/disable-doctest +++ b/p/haskell-http2/debian/patches/disable-doctest @@ -1,7 +1,5 @@ -Index: haskell-http2/http2.cabal -=================================================================== ---- haskell-http2.orig/http2.cabal 2016-05-29 12:17:06.186758726 +0200 -+++ haskell-http2/http2.cabal 2016-05-29 12:17:06.182758617 +0200 +--- a/http2.cabal ++++ b/http2.cabal @@ -89,15 +89,6 @@ ---------------------------------------------------------------- diff --git a/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases b/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases index 7b9387e95..e28c91c62 100644 --- a/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases +++ b/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases @@ -1,7 +1,5 @@ -Index: haskell-http2/http2.cabal -=================================================================== ---- haskell-http2.orig/http2.cabal 2016-05-29 12:19:59.091286217 +0200 -+++ haskell-http2/http2.cabal 2016-05-29 12:19:59.087286117 +0200 +--- a/http2.cabal ++++ b/http2.cabal @@ -112,52 +112,6 @@ , stm , word8 diff --git a/p/haskell-http2/debian/patches/no-bytestring-builder b/p/haskell-http2/debian/patches/no-bytestring-builder index 10fbbf557..c65c875c4 100644 --- a/p/haskell-http2/debian/patches/no-bytestring-builder +++ b/p/haskell-http2/debian/patches/no-bytestring-builder @@ -1,7 +1,5 @@ -Index: haskell-http2/http2.cabal -=================================================================== ---- haskell-http2.orig/http2.cabal 2016-05-29 12:17:20.179143186 +0200 -+++ haskell-http2/http2.cabal 2016-05-29 12:18:21.984800917 +0200 +--- a/http2.cabal ++++ b/http2.cabal @@ -81,7 +81,6 @@ Build-Depends: base >= 4.6 && < 5 , array @@ -18,7 +16,7 @@ Index: haskell-http2/http2.cabal , case-insensitive , containers , hex -@@ -178,7 +130,6 @@ +@@ -178,7 +176,6 @@ , aeson-pretty , array , bytestring @@ -26,7 +24,7 @@ Index: haskell-http2/http2.cabal , case-insensitive , containers , hex -@@ -200,7 +151,6 @@ +@@ -200,7 +197,6 @@ , aeson , array , bytestring @@ -34,7 +32,7 @@ Index: haskell-http2/http2.cabal , case-insensitive , containers , hex -@@ -223,7 +173,6 @@ +@@ -223,7 +219,6 @@ , aeson-pretty , array , bytestring |