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-time-parsers | |
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-time-parsers')
-rw-r--r-- | p/haskell-time-parsers/debian/changelog | 6 | ||||
-rw-r--r-- | p/haskell-time-parsers/debian/control | 2 | ||||
-rw-r--r-- | p/haskell-time-parsers/debian/patches/new-metadata-from-hackage | 13 | ||||
-rw-r--r-- | p/haskell-time-parsers/debian/patches/series | 1 |
4 files changed, 4 insertions, 18 deletions
diff --git a/p/haskell-time-parsers/debian/changelog b/p/haskell-time-parsers/debian/changelog index 4e596c316..141b2b31f 100644 --- a/p/haskell-time-parsers/debian/changelog +++ b/p/haskell-time-parsers/debian/changelog @@ -1,8 +1,8 @@ -haskell-time-parsers (0.1.0.0-3) UNRELEASED; urgency=medium +haskell-time-parsers (0.1.1.0-1) unstable; urgency=medium - * Fix VCS fields + * New upstream verison. - -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 02 Jun 2016 19:13:09 +0200 + -- Clint Adams <clint@debian.org> Tue, 20 Sep 2016 14:24:09 -0400 haskell-time-parsers (0.1.0.0-2) unstable; urgency=medium diff --git a/p/haskell-time-parsers/debian/control b/p/haskell-time-parsers/debian/control index a7c09f5b7..85863aaf7 100644 --- a/p/haskell-time-parsers/debian/control +++ b/p/haskell-time-parsers/debian/control @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9), libghc-attoparsec-dev (>= 0.12.1.6), libghc-attoparsec-dev (<< 0.14), libghc-bifunctors-dev (>= 4.2.1), - libghc-bifunctors-dev (<< 5.4), + libghc-bifunctors-dev (<< 5.5), libghc-parsec3-dev (>= 3.1.9), libghc-parsec3-dev (<< 3.2), libghc-parsers-dev (>= 0.12.3), diff --git a/p/haskell-time-parsers/debian/patches/new-metadata-from-hackage b/p/haskell-time-parsers/debian/patches/new-metadata-from-hackage deleted file mode 100644 index 3949f27c6..000000000 --- a/p/haskell-time-parsers/debian/patches/new-metadata-from-hackage +++ /dev/null @@ -1,13 +0,0 @@ -Index: haskell-time-parsers/time-parsers.cabal -=================================================================== ---- haskell-time-parsers.orig/time-parsers.cabal 2015-12-25 16:07:28.000000000 +0100 -+++ haskell-time-parsers/time-parsers.cabal 2016-06-01 10:02:45.818655961 +0200 -@@ -51,7 +51,7 @@ - , time >=1.4.2 && <1.7 - , time-parsers - , attoparsec >=0.12.1.6 && <0.14 -- , bifunctors >=4.2.1 && <5.2 -+ , bifunctors >=4.2.1 && <5.4 - , parsec >=3.1.9 && <3.2 - , parsers >=0.12.3 && <0.13 - , tasty >=0.10.1.2 && <0.12 diff --git a/p/haskell-time-parsers/debian/patches/series b/p/haskell-time-parsers/debian/patches/series deleted file mode 100644 index 0131f75d3..000000000 --- a/p/haskell-time-parsers/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -new-metadata-from-hackage |