Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

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

 haskell/haskell-git-annex/0001-add-dependency-on-stm.patch    |   25 
----------
 haskell/haskell-git-annex/DETAILS                             |    4 -
 haskell/haskell-git-annex/HISTORY                             |    4 +
 haskell/haskell-git-annex/PRE_BUILD                           |    3 -
 kernels/linux/HISTORY                                         |    4 +
 kernels/linux/info/patches/maintenance_patches_3/patch-3.13.1 |    6 ++
 kernels/linux/latest.defaults                                 |    2 
 7 files changed, 17 insertions(+), 31 deletions(-)

New commits:
commit 03f1a80f0356b7de1041622a83b1412702574c69
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.20140129

commit 64b7d1bbb7a855d793e2295813c6d3ccfbea5f59
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kernels/linux: version 3.13.1

diff --git a/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch 
b/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
deleted file mode 100644
index 34f7aef..0000000
--- a/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5bfd934170589f547a2ab2b19a22c479df8deec5 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Wed, 1 Jan 2014 15:11:45 +0100
-Subject: [PATCH] add dependency on stm
-
----
- git-annex.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/git-annex.cabal b/git-annex.cabal
-index 8dccfed..6cfcb03 100644
---- a/git-annex.cabal
-+++ b/git-annex.cabal
-@@ -90,7 +90,7 @@ 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
-+   SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3)
-   CC-Options: -Wall
-   GHC-Options: -Wall
-   Extensions: PackageImports
--- 
-1.8.5.2
-
diff --git a/haskell/haskell-git-annex/DETAILS 
b/haskell/haskell-git-annex/DETAILS
index b5d46f8..2f31a55 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.20140116
+         VERSION=5.20140129
           SOURCE="${XSPELL}-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${XSPELL}/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:7aed476e52f070fffd9fd12502cbd629cd4aed87051d06a9dc4b68a9efcb28128acc54e391eaf2afdb6776b0ba549b25b165adfd66e2f63ca5d738012f9ab317
+     
SOURCE_HASH=sha512:3f6739e283f32ac7d01d3b2ef9d873443f8e0e62ba967011c599e52ec7927025200e5906cf3492bfeec0062113d63e83f3956c6d442501db4d0d9060d2ff9f96
 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 c351ef9..494753d 100644
--- a/haskell/haskell-git-annex/HISTORY
+++ b/haskell/haskell-git-annex/HISTORY
@@ -1,3 +1,7 @@
+2014-01-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 5.20140129
+       * 0001-add-dependency-on-stm.patch, PRE_BUILD: removed
+
 2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 5.20140116
 
diff --git a/haskell/haskell-git-annex/PRE_BUILD 
b/haskell/haskell-git-annex/PRE_BUILD
deleted file mode 100755
index 9ab0b08..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-dependency-on-stm.patch
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index ac9b4c5..72c9c10 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2014-01-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * info/patches/maintenance_patches_3/patch-3.13.1: added
+       * latest_defaults: version 3.13.1
+
 2014-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * PRE_BUILD: add support for xz compressed kernels
        * info/kernels/3.13, latest.defaults,
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.13.1 
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.13.1
new file mode 100755
index 0000000..b0ce1c1
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.13.1
@@ -0,0 +1,6 @@
+appliedkernels="3.13"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="ee699c5fdcfff2d82a7b890037c4e70ac2262559"
+
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 95f8af6..c9a58d1 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.13
 LATEST_2_6=2.6.39
 LATEST_PRE_2_6=patch-2.6.39
 LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.13
+LATEST_maintenance_patches_3=patch-3.13.1
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.37.9
 LATEST_PRE_2_4=patch-2.4.33-pre1