[DHG_packages] 05/05: csv-conduit: patch for newer ghc-prim

Clint Adams clint at moszumanska.debian.org
Fri Oct 14 20:34:50 UTC 2016


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

clint pushed a commit to branch experimental
in repository DHG_packages.

commit f78969c2ffb0fae2dfd0528463f5b9325d303dc7
Author: Clint Adams <clint at debian.org>
Date:   Wed Oct 12 11:02:22 2016 -0400

    csv-conduit: patch for newer ghc-prim
---
 p/haskell-csv-conduit/debian/changelog             |  8 ++--
 p/haskell-csv-conduit/debian/control               | 48 +++++++++++-----------
 .../debian/patches/newer-ghc-prim                  | 11 +++++
 p/haskell-csv-conduit/debian/patches/series        |  1 +
 4 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/p/haskell-csv-conduit/debian/changelog b/p/haskell-csv-conduit/debian/changelog
index 5e0fec0..653d9cf 100644
--- a/p/haskell-csv-conduit/debian/changelog
+++ b/p/haskell-csv-conduit/debian/changelog
@@ -1,14 +1,14 @@
-haskell-csv-conduit (0.6.6-6) UNRELEASED; urgency=medium
+haskell-csv-conduit (0.6.6-6) experimental; urgency=medium
 
   [ Dmitry Bogatov ]
   * Use secure (https) uri in Vcs-Git field in 'debian/control'
   * Bump standards version to 3.9.8 (no changes needed)
   * Convert `debian/copyright' to dep5 format
 
-  [ Gianfranco Costamagna ]
-  * Fix VCS fields
+  [ Clint Adams ]
+  * Patch for newer ghc-prim.
 
- -- Dmitry Bogatov <KAction at gnu.org>  Tue, 10 May 2016 09:35:05 +0300
+ -- Clint Adams <clint at debian.org>  Wed, 12 Oct 2016 11:02:46 -0400
 
 haskell-csv-conduit (0.6.6-5) unstable; urgency=medium
 
diff --git a/p/haskell-csv-conduit/debian/control b/p/haskell-csv-conduit/debian/control
index b686fa6..5d746d2 100644
--- a/p/haskell-csv-conduit/debian/control
+++ b/p/haskell-csv-conduit/debian/control
@@ -3,22 +3,24 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.or
 Uploaders: Clint Adams <clint at debian.org>
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
+Build-Depends:
  cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-prof,
+ haskell-devscripts (>= 0.10),
  libghc-attoparsec-dev (>= 0.10),
  libghc-attoparsec-prof,
  libghc-blaze-builder-dev,
  libghc-blaze-builder-prof,
- libghc-conduit-dev (>= 1.0),
  libghc-conduit-dev (<< 2.0),
- libghc-conduit-prof,
+ libghc-conduit-dev (>= 1.0),
  libghc-conduit-extra-dev,
  libghc-conduit-extra-prof,
+ libghc-conduit-prof,
  libghc-data-default-dev,
  libghc-data-default-prof,
+ libghc-hunit-dev (>= 1.2),
  libghc-mmorph-dev,
  libghc-mmorph-prof,
  libghc-monad-control-dev,
@@ -29,16 +31,16 @@ Build-Depends: debhelper (>= 9),
  libghc-primitive-prof,
  libghc-resourcet-dev (>= 1.1.2.1),
  libghc-resourcet-prof,
+ libghc-test-framework-dev,
+ libghc-test-framework-hunit-dev,
  libghc-text-dev,
  libghc-text-prof,
  libghc-unordered-containers-dev,
  libghc-unordered-containers-prof,
  libghc-vector-dev,
  libghc-vector-prof,
- libghc-hunit-dev (>= 1.2),
- libghc-test-framework-dev,
- libghc-test-framework-hunit-dev,
-Build-Depends-Indep: ghc-doc,
+Build-Depends-Indep:
+ ghc-doc,
  libghc-attoparsec-doc,
  libghc-blaze-builder-doc,
  libghc-conduit-doc,
@@ -54,17 +56,15 @@ Build-Depends-Indep: ghc-doc,
  libghc-vector-doc,
 Standards-Version: 3.9.8
 Homepage: http://github.com/ozataman/csv-conduit
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-csv-conduit
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: libghc-csv-conduit-dev
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Depends: ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
 Description: fast, conduit-based CSV parser library${haskell:ShortBlurb}
  csv-conduit is a library that provides
  .
@@ -78,11 +78,10 @@ Description: fast, conduit-based CSV parser library${haskell:ShortBlurb}
 
 Package: libghc-csv-conduit-prof
 Architecture: any
-Depends: ${haskell:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Depends: ${haskell:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
 Description: fast, conduit-based CSV parser library${haskell:ShortBlurb}
  csv-conduit is a library that provides
  .
@@ -97,10 +96,9 @@ Description: fast, conduit-based CSV parser library${haskell:ShortBlurb}
 Package: libghc-csv-conduit-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends},
- ${haskell:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
+Depends: ${haskell:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
 Description: fast, conduit-based CSV parser library${haskell:ShortBlurb}
  csv-conduit is a library that provides
  .
diff --git a/p/haskell-csv-conduit/debian/patches/newer-ghc-prim b/p/haskell-csv-conduit/debian/patches/newer-ghc-prim
new file mode 100644
index 0000000..c47e1da
--- /dev/null
+++ b/p/haskell-csv-conduit/debian/patches/newer-ghc-prim
@@ -0,0 +1,11 @@
+--- a/csv-conduit.cabal
++++ b/csv-conduit.cabal
+@@ -95,7 +95,7 @@ library
+ 
+   if impl(ghc >= 7.2.1)
+     cpp-options: -DGENERICS
+-    build-depends: ghc-prim >= 0.2 && < 0.5
++    build-depends: ghc-prim >= 0.2 && < 0.6
+ 
+ 
+ test-suite test
diff --git a/p/haskell-csv-conduit/debian/patches/series b/p/haskell-csv-conduit/debian/patches/series
new file mode 100644
index 0000000..e329b59
--- /dev/null
+++ b/p/haskell-csv-conduit/debian/patches/series
@@ -0,0 +1 @@
+newer-ghc-prim

-- 
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