Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8734840e74d2de07a760d9ae56ea1fadc802976e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8734840e74d2de07a760d9ae56ea1fadc802976e)
  • Date: Thu, 6 Mar 2014 13:29:54 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

haskell/haskell-git-annex/0001-add-missing-dependency-on-regex-compat.patch
| 26 ----------
haskell/haskell-git-annex/DEPENDS
| 2
haskell/haskell-git-annex/DETAILS
| 4 -
haskell/haskell-git-annex/HISTORY
| 7 ++
haskell/haskell-git-annex/PRE_BUILD
| 3 -
5 files changed, 11 insertions(+), 31 deletions(-)

New commits:
commit 8734840e74d2de07a760d9ae56ea1fadc802976e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-git-annex: version 5.20140306

diff --git
a/haskell/haskell-git-annex/0001-add-missing-dependency-on-regex-compat.patch
b/haskell/haskell-git-annex/0001-add-missing-dependency-on-regex-compat.patch
deleted file mode 100644
index adc0c13..0000000
---
a/haskell/haskell-git-annex/0001-add-missing-dependency-on-regex-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 08fa3057ad51eda30ca9a2bc8559c4177bb53e5f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 21 Feb 2014 18:29:44 +0100
-Subject: [PATCH] add missing dependency on regex-compat
-
----
- git-annex.cabal | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/git-annex.cabal b/git-annex.cabal
-index 8e3f3f3..b0d5257 100644
---- a/git-annex.cabal
-+++ b/git-annex.cabal
-@@ -93,7 +93,8 @@ Executable git-annex
- extensible-exceptions, dataenc, SHA, process, json,
- base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers,
- IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
-- SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3)
-+ SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3),
-+ regex-compat
- CC-Options: -Wall
- GHC-Options: -Wall
- Extensions: PackageImports
---
-1.9.0
-
diff --git a/haskell/haskell-git-annex/DEPENDS
b/haskell/haskell-git-annex/DEPENDS
index 5c5debe..9f2ca5f 100755
--- a/haskell/haskell-git-annex/DEPENDS
+++ b/haskell/haskell-git-annex/DEPENDS
@@ -3,7 +3,9 @@ depends ghc &&
depends haskell-async &&
depends haskell-aeson &&
depends haskell-bloomfilter &&
+depends haskell-case-insensitive &&
depends haskell-dataenc &&
+depends haskell-data-default &&
depends haskell-dlist &&
depends haskell-edit-distance &&
depends haskell-extensible-exceptions &&
diff --git a/haskell/haskell-git-annex/DETAILS
b/haskell/haskell-git-annex/DETAILS
index f66b0f5..5c84479 100755
--- a/haskell/haskell-git-annex/DETAILS
+++ b/haskell/haskell-git-annex/DETAILS
@@ -1,9 +1,9 @@
SPELL=haskell-git-annex
XSPELL=git-annex
- VERSION=5.20140221
+ VERSION=5.20140306
SOURCE="${XSPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${XSPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:39d335fc2ad696433b49e28fd9afee6c0e42a9d4e757159966ed85c70112dc06df6b98eff030efc85cb85bc38ff785a85452b66e3430d1fbeddd487b1d2e0c41
+
SOURCE_HASH=sha512:8f2980604f8172537a6e67241b7ddedfc7dbafc5dca64398f5ded381a6326b6cb7b5324b515e324f53ea6e2a7ff12b8a30c56a894ec0b18d9ca5c4b3bd31385a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${XSPELL}-${VERSION}"
WEB_SITE="Homepage: http://git-annex.branchable.com/";
LICENSE[0]=License: GPL-3
diff --git a/haskell/haskell-git-annex/HISTORY
b/haskell/haskell-git-annex/HISTORY
index cf90f4d..0f09df8 100644
--- a/haskell/haskell-git-annex/HISTORY
+++ b/haskell/haskell-git-annex/HISTORY
@@ -1,3 +1,10 @@
+2014-03-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.20140306
+ * DEPENDS: add dependencies on haskell-case-insensitive and
+ haskell-data-default
+ * PRE_BUILD, 0001-add-missing-dependency-on-regex-compat.patch:
+ remove obsolete patch
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.20140221
* PRE_BUILD, 0001-add-missing-dependency-on-regex-compat.patch:
diff --git a/haskell/haskell-git-annex/PRE_BUILD
b/haskell/haskell-git-annex/PRE_BUILD
deleted file mode 100755
index 5b795ca..0000000
--- a/haskell/haskell-git-annex/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 <
$SPELL_DIRECTORY/0001-add-missing-dependency-on-regex-compat.patch



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8734840e74d2de07a760d9ae56ea1fadc802976e), Florian Franzmann, 03/06/2014

Archive powered by MHonArc 2.6.24.

Top of Page