Skip to Content.
Sympa Menu

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

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 (ce5f00f3a5d7b48c5676869d07286b2dc4d07d09)
  • Date: Fri, 21 Feb 2014 11:37:05 -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
| 3 -
haskell/haskell-git-annex/DETAILS
| 4 -
haskell/haskell-git-annex/HISTORY
| 6 ++
haskell/haskell-git-annex/PRE_BUILD
| 3 +
5 files changed, 39 insertions(+), 3 deletions(-)

New commits:
commit ce5f00f3a5d7b48c5676869d07286b2dc4d07d09
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.20140221

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
new file mode 100644
index 0000000..adc0c13
--- /dev/null
+++
b/haskell/haskell-git-annex/0001-add-missing-dependency-on-regex-compat.patch
@@ -0,0 +1,26 @@
+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 7ac8a45..5c5debe 100755
--- a/haskell/haskell-git-annex/DEPENDS
+++ b/haskell/haskell-git-annex/DEPENDS
@@ -23,4 +23,5 @@ depends haskell-sha &&
depends haskell-text &&
depends haskell-unix-compat &&
depends haskell-utf8-string &&
-depends haskell-uuid
+depends haskell-uuid &&
+depends haskell-regex-compat
diff --git a/haskell/haskell-git-annex/DETAILS
b/haskell/haskell-git-annex/DETAILS
index ae1e36f..f66b0f5 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.20140210
+ VERSION=5.20140221
SOURCE="${XSPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${XSPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:3b66a8d256a735c7ff94742ab0b335669993de158e14dbc093e37f0fcefad2d08d13cdb93560c00c51d24bff529b441bf72ab0a07b553fcd9683b97a930900fd
+
SOURCE_HASH=sha512:39d335fc2ad696433b49e28fd9afee6c0e42a9d4e757159966ed85c70112dc06df6b98eff030efc85cb85bc38ff785a85452b66e3430d1fbeddd487b1d2e0c41
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 8f537c3..cf90f4d 100644
--- a/haskell/haskell-git-annex/HISTORY
+++ b/haskell/haskell-git-annex/HISTORY
@@ -1,3 +1,9 @@
+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:
+ fix missing dependency in cabal file
+ * DEPENDS: add dependency on haskell-regex-compat
+
2014-02-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.20140210

diff --git a/haskell/haskell-git-annex/PRE_BUILD
b/haskell/haskell-git-annex/PRE_BUILD
new file mode 100755
index 0000000..5b795ca
--- /dev/null
+++ b/haskell/haskell-git-annex/PRE_BUILD
@@ -0,0 +1,3 @@
+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 (ce5f00f3a5d7b48c5676869d07286b2dc4d07d09), Florian Franzmann, 02/21/2014

Archive powered by MHonArc 2.6.24.

Top of Page