[DHG_packages] 02/05: cabal-install: Upgrading from 1.22.9.0 to 1.24.0.0

Clint Adams clint at moszumanska.debian.org
Sun Oct 16 06:25:54 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 8da7c4b26729e0de8b1f4380a16f6d7fe41d2bac
Author: Clint Adams <clint at debian.org>
Date:   Fri Oct 7 19:41:25 2016 -0400

    cabal-install: Upgrading from 1.22.9.0 to 1.24.0.0
---
 p/haskell-cabal-install/debian/changelog           |  8 ++--
 p/haskell-cabal-install/debian/control             | 53 ++++++++++++++--------
 .../patches/delete-import-of-missing-test.patch    | 19 --------
 p/haskell-cabal-install/debian/patches/series      |  2 +-
 .../debian/patches/use-cryptohash                  | 11 +++++
 5 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/p/haskell-cabal-install/debian/changelog b/p/haskell-cabal-install/debian/changelog
index d76924f..634be1c 100644
--- a/p/haskell-cabal-install/debian/changelog
+++ b/p/haskell-cabal-install/debian/changelog
@@ -1,8 +1,8 @@
-haskell-cabal-install (1.22.9.0-2) UNRELEASED; urgency=medium
+haskell-cabal-install (1.24.0.0-1) experimental; urgency=medium
 
-  * Fix VCS fields
+  * New upstream version.
 
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 02 Jun 2016 19:12:17 +0200
+ -- Clint Adams <clint at debian.org>  Fri, 07 Oct 2016 19:41:24 -0400
 
 haskell-cabal-install (1.22.9.0-1) unstable; urgency=medium
 
@@ -19,7 +19,7 @@ haskell-cabal-install (1.22.7.0-1) unstable; urgency=medium
   [ Sven Bartscher ]
   * New upstream release
     - Lifted upper bound on Build-Dependency to libghc-zlib-dev
-      (Closes: #814993) 
+      (Closes: #814993)
 
  -- Clint Adams <clint at debian.org>  Wed, 25 May 2016 13:06:48 -0400
 
diff --git a/p/haskell-cabal-install/debian/control b/p/haskell-cabal-install/debian/control
index 62d65e4..6130e67 100644
--- a/p/haskell-cabal-install/debian/control
+++ b/p/haskell-cabal-install/debian/control
@@ -1,42 +1,59 @@
 Source: haskell-cabal-install
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Iain Lane <laney at debian.org>, Dmitry Bogatov <KAction at gnu.org>
+Uploaders:
+ Iain Lane <laney at debian.org>,
+ Dmitry Bogatov <KAction at gnu.org>,
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
- cdbs,
+Build-Depends:
  bash-completion (>= 1.0),
- ghc,
+ cdbs,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-prof,
- libghc-cabal-dev (>= 1.22.2),
- libghc-cabal-dev (<< 1.23),
- libghc-http-dev (>= 1:4000.2.5),
+ haskell-devscripts (>= 0.10),
+ libghc-async-dev (<< 3),
+ libghc-async-dev (>= 2.0),
+ libghc-base16-bytestring-dev (<< 0.2),
+ libghc-base16-bytestring-dev (>= 0.1.1),
+ libghc-cryptohash-dev,
+ libghc-hackage-security-dev (<< 0.6),
+ libghc-hackage-security-dev (>= 0.5.1),
+ libghc-hashable-dev (<< 2),
+ libghc-hashable-dev (>= 1.0),
  libghc-http-dev (<< 1:4000.4),
- libghc-mtl-dev (>= 2.0),
+ libghc-http-dev (>= 1:4000.2.5),
  libghc-mtl-dev (<< 3),
+ libghc-mtl-dev (>= 2.0),
+ libghc-network-dev (<< 2.7),
  libghc-network-dev (>= 2.6),
+ libghc-network-uri-dev (<< 2.7),
  libghc-network-uri-dev (>= 2.6),
- libghc-random-dev (>= 1),
  libghc-random-dev (<< 1.2),
- libghc-stm-dev (>= 2.0),
+ libghc-random-dev (>= 1),
  libghc-stm-dev (<< 3),
- libghc-zlib-dev (>= 0.5.3),
+ libghc-stm-dev (>= 2.0),
+ libghc-tar-dev (<< 0.6),
+ libghc-tar-dev (>= 0.5.0.1),
  libghc-zlib-dev (<< 0.7),
+ libghc-zlib-dev (>= 0.5.3),
 Standards-Version: 3.9.8
 Homepage: http://www.haskell.org/cabal/
-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-cabal-install
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: cabal-install
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
+ ghc (>= 8),
  ${haskell:Depends},
  ${misc:Depends},
- ghc (>= 7.10) | libghc-cabal-dev (>= 1.22)
-Recommends: ${haskell:Recommends},
- ghc,
-Suggests: ${haskell:Suggests},
+ ${shlibs:Depends},
+Recommends:
+ ghc (>= 8),
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
 Description: command-line interface for Cabal and Hackage
  The 'cabal' command-line program simplifies the process of managing
  Haskell software by automating the fetching, configuration, compilation
diff --git a/p/haskell-cabal-install/debian/patches/delete-import-of-missing-test.patch b/p/haskell-cabal-install/debian/patches/delete-import-of-missing-test.patch
deleted file mode 100644
index a706bcd..0000000
--- a/p/haskell-cabal-install/debian/patches/delete-import-of-missing-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tests/PackageTests.hs
-+++ b/tests/PackageTests.hs
-@@ -35,7 +35,6 @@ import PackageTests.PackageTester ( Test
- -- Modules containing the tests.
- import qualified PackageTests.Exec.Check
- import qualified PackageTests.Freeze.Check
--import qualified PackageTests.MultipleSource.Check
-
- -- List of tests to run. Each test will be called with the path to the
- -- cabal binary to use.
-@@ -43,7 +42,7 @@ tests :: PackageTests.PackageTester.Test
- tests paths =
-     [ testGroup "Freeze"         $ PackageTests.Freeze.Check.tests         paths
-     , testGroup "Exec"           $ PackageTests.Exec.Check.tests           paths
--    , testGroup "MultipleSource" $ PackageTests.MultipleSource.Check.tests paths
-+
-     ]
-
- cabalProgram :: Program
diff --git a/p/haskell-cabal-install/debian/patches/series b/p/haskell-cabal-install/debian/patches/series
index d9d12e3..087bcfb 100644
--- a/p/haskell-cabal-install/debian/patches/series
+++ b/p/haskell-cabal-install/debian/patches/series
@@ -1 +1 @@
-delete-import-of-missing-test.patch
+use-cryptohash
diff --git a/p/haskell-cabal-install/debian/patches/use-cryptohash b/p/haskell-cabal-install/debian/patches/use-cryptohash
new file mode 100644
index 0000000..be699e2
--- /dev/null
+++ b/p/haskell-cabal-install/debian/patches/use-cryptohash
@@ -0,0 +1,11 @@
+--- a/cabal-install.cabal
++++ b/cabal-install.cabal
+@@ -253,7 +253,7 @@ executable cabal
+         bytestring >= 0.9      && < 1,
+         Cabal      >= 1.24     && < 1.25,
+         containers >= 0.4      && < 0.6,
+-        cryptohash-sha256 >= 0.11 && < 0.12,
++        cryptohash,
+         filepath   >= 1.3      && < 1.5,
+         hashable   >= 1.0      && < 2,
+         HTTP       >= 4000.1.5 && < 4000.4,

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