[Pkg-haskell-commits] darcs: haskell-cabal-install: New upstream release
KAction at gnu.org
KAction at gnu.org
Wed Mar 18 18:57:04 UTC 2015
Wed Mar 18 18:56:14 UTC 2015 KAction at gnu.org
* New upstream release
M ./changelog -7 +13
M ./control -7 +9
R ./patches/DontSuggestUpgrading.patch
A ./patches/delete-import-of-missing-test.patch
M ./patches/series -1 +1
Wed Mar 18 18:56:14 UTC 2015 KAction at gnu.org
* New upstream release
diff -rN -u old-haskell-cabal-install/changelog new-haskell-cabal-install/changelog
--- old-haskell-cabal-install/changelog 2015-03-18 18:57:04.586573755 +0000
+++ new-haskell-cabal-install/changelog 2015-03-18 18:57:04.590573755 +0000
@@ -1,3 +1,9 @@
+haskell-cabal-install (1.22.0.1-1) experimental; urgency=medium
+
+ * New upstream version
+
+ -- Dmitry Bogatov <KAction at gnu.org> Sun, 15 Mar 2015 13:33:23 +0300
+
haskell-cabal-install (1.20.0.3-3) experimental; urgency=medium
* Depend specifically on the version of cabal, cabal-install was built
@@ -19,7 +25,7 @@
haskell-cabal-install (1.20.0.2-2) unstable; urgency=medium
- * Force newer HTTP, to avoid problem with http_proxy.
+ * Force newer HTTP, to avoid problem with http_proxy.
-- Joachim Breitner <nomeata at debian.org> Mon, 23 Jun 2014 18:23:49 -0700
@@ -47,8 +53,8 @@
haskell-cabal-install (0.14.0-2) unstable; urgency=low
- * Add forgotten build-dependencies on libghc-random-dev
- * Update my email address to d.o
+ * Add forgotten build-dependencies on libghc-random-dev
+ * Update my email address to d.o
-- Iain Lane <laney at debian.org> Wed, 18 Apr 2012 10:08:34 +0100
@@ -60,7 +66,7 @@
haskell-cabal-install (0.10.2-3) unstable; urgency=low
- * Actually apply the patch that Closes: #617467
+ * Actually apply the patch that Closes: #617467
-- Joachim Breitner <nomeata at debian.org> Wed, 15 Jun 2011 14:42:48 +0200
@@ -85,14 +91,14 @@
* Use ghc instead of ghc6
[ Joachim Breitner ]
- * New upstream release (Closes: #616732)
+ * New upstream release (Closes: #616732)
-- Joachim Breitner <nomeata at debian.org> Sun, 27 Mar 2011 11:31:35 +0530
haskell-cabal-install (0.8.0-1) unstable; urgency=low
[ Iain Lane ]
- * debian/copyright: Add missing entries for Main.hs and bash-completion/
+ * debian/copyright: Add missing entries for Main.hs and bash-completion/
* debian/control: Add GHC6 to recommends - commandline tool cannot be used
for its main purpose (building & installing packages) without this.
@@ -107,7 +113,7 @@
* debian/control: Bump Standards-Version: to 3.8.4, no changes needed.
[ Joachim Breitner ]
- * New upstream version
+ * New upstream version
* Bump haskell-devscripts dependency to 0.7
-- Joachim Breitner <nomeata at debian.org> Mon, 15 Feb 2010 09:16:20 +0100
diff -rN -u old-haskell-cabal-install/control new-haskell-cabal-install/control
--- old-haskell-cabal-install/control 2015-03-18 18:57:04.582573755 +0000
+++ new-haskell-cabal-install/control 2015-03-18 18:57:04.594573754 +0000
@@ -2,7 +2,7 @@
Priority: extra
Section: haskell
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Iain Lane <laney at debian.org>
+Uploaders: Iain Lane <laney at debian.org>, Dmitry Bogatov <KAction at gnu.org>
Build-Depends: debhelper (>= 9),
haskell-devscripts (>= 0.9),
cdbs,
@@ -10,16 +10,18 @@
ghc,
libghc-http-dev (>= 1:4000.2.17),
libghc-http-dev (<< 1:4000.3),
- libghc-network-dev (>= 2.0),
- libghc-network-dev (<< 2.6),
+ libghc-network-dev (>> 2.6),
+ libghc-network-dev (<< 2.7),
+ libghc-network-uri-dev (>> 2.6),
+ libghc-network-uri-dev (<< 2.7),
libghc-random-dev (>= 1),
- libghc-random-dev (<< 1.1),
+ libghc-random-dev (<< 1.2),
libghc-zlib-dev (>= 0.5.3),
libghc-zlib-dev (<< 0.6),
libghc-mtl-dev (>= 2.0),
libghc-mtl-dev (<< 3),
- libghc-cabal-dev (>= 1.20.0),
- libghc-cabal-dev (<< 1.21),
+ libghc-cabal-dev (>= 1.22),
+ libghc-cabal-dev (<< 1.23),
libghc-stm-dev (>= 2.0),
libghc-stm-dev (<< 3),
# for the test suite
@@ -28,7 +30,7 @@
libghc-test-framework-quickcheck2-dev (>= 0.3),
libghc-hunit-dev,
libghc-quickcheck2-dev (>= 2.5),
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Homepage: http://www.haskell.org/cabal/
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-cabal-install
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-cabal-install
diff -rN -u old-haskell-cabal-install/patches/DontSuggestUpgrading.patch new-haskell-cabal-install/patches/DontSuggestUpgrading.patch
--- old-haskell-cabal-install/patches/DontSuggestUpgrading.patch 2015-03-18 18:57:04.582573755 +0000
+++ new-haskell-cabal-install/patches/DontSuggestUpgrading.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# Description: Don't suggest upgrading cabal-install using cabal install
-# In debian, this is not the recommended way of upgrading cabal-install.
-# Author: Marco Túlio Gontijo e Silva <marcot at debian.org>
-# Bug-Debian: http://bugs.debian.org/617467
-# Forwarded: not-needed
-# Last-Update: 2011-05-22
-# Applied-Upstream: no
-Index: haskell-cabal-install-1.20.0.2/Distribution/Client/Update.hs
-===================================================================
---- haskell-cabal-install-1.20.0.2.orig/Distribution/Client/Update.hs 2014-06-09 11:35:50.807474725 +0200
-+++ haskell-cabal-install-1.20.0.2/Distribution/Client/Update.hs 2014-06-09 11:35:50.807474725 +0200
-@@ -47,9 +47,7 @@
- update verbosity [] =
- warn verbosity $ "No remote package servers have been specified. Usually "
- ++ "you would have one specified in the config file."
--update verbosity repos = do
-- mapM_ (updateRepo verbosity) repos
-- checkForSelfUpgrade verbosity repos
-+update verbosity repos = mapM_ (updateRepo verbosity) repos
-
- updateRepo :: Verbosity -> Repo -> IO ()
- updateRepo verbosity repo = case repoKind repo of
diff -rN -u old-haskell-cabal-install/patches/delete-import-of-missing-test.patch new-haskell-cabal-install/patches/delete-import-of-missing-test.patch
--- old-haskell-cabal-install/patches/delete-import-of-missing-test.patch 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-cabal-install/patches/delete-import-of-missing-test.patch 2015-03-18 18:57:04.594573754 +0000
@@ -0,0 +1,19 @@
+--- 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 -rN -u old-haskell-cabal-install/patches/series new-haskell-cabal-install/patches/series
--- old-haskell-cabal-install/patches/series 2015-03-18 18:57:04.578573755 +0000
+++ new-haskell-cabal-install/patches/series 2015-03-18 18:57:04.594573754 +0000
@@ -1 +1 @@
-DontSuggestUpgrading.patch
+delete-import-of-missing-test.patch
More information about the Pkg-haskell-commits
mailing list