Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 disk/gummiboot/CONFLICTS      |    1 +
 disk/gummiboot/DETAILS        |    2 +-
 disk/gummiboot/HISTORY        |    4 ++++
 printer/cups-filters/DETAILS  |    4 ++--
 printer/cups-filters/HISTORY  |    3 +++
 python-pypi/mercurial/DETAILS |    4 ++--
 python-pypi/mercurial/HISTORY |    3 +++
 utils/grep/DETAILS            |    2 +-
 utils/grep/HISTORY            |    3 +++
 9 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit f99c9e66444e5adca37d438722b059841236d818
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    grep: => 2.18

commit 20cbb008ff36bd9dc33e38d93ec457d90cfaf6e2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    mercurial: => 2.9.2

commit 29057328af102dab16732e66bb2d366e826e360a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gummiboot: => 44

commit 7bbba68007a5d8d538d54a2c71a5dc7031d200fb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    cups-filters: => 1.0.50

diff --git a/disk/gummiboot/CONFLICTS b/disk/gummiboot/CONFLICTS
new file mode 100755
index 0000000..ddeb535
--- /dev/null
+++ b/disk/gummiboot/CONFLICTS
@@ -0,0 +1 @@
+conflicts gummiboot y
diff --git a/disk/gummiboot/DETAILS b/disk/gummiboot/DETAILS
index cc9cef3..bb8c2b7 100755
--- a/disk/gummiboot/DETAILS
+++ b/disk/gummiboot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gummiboot
-         VERSION=43
+         VERSION=44
    SOURCE_IGNORE=volatile
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/gummiboot/HISTORY b/disk/gummiboot/HISTORY
index 8697c46..4918aa3 100644
--- a/disk/gummiboot/HISTORY
+++ b/disk/gummiboot/HISTORY
@@ -1,3 +1,7 @@
+2014-03-31 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 44
+       * CONFLICTS: added
+
 2014-02-07 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 43
          SOURCE_IGNORE=volatile, file is regenerated for each download
diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index 134052c..fd42b04 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cups-filters
-         VERSION=1.0.48
-     
SOURCE_HASH=sha512:63b8059f7b51ca87edbbdc0d33306532dab35e706564d7ff41bbdd7585bf18ccaecffc6fa3b66454fbff2b32eda384f2e176fceeb55d4c2b5f6d571a63cfb243
+         VERSION=1.0.50
+     
SOURCE_HASH=sha512:8b10b9cf5bd0a6da11e26e56f7bce3b7122f6eb330f1c79102023df0ca363a6ebccd4e2e1e38ef3de32a22fadd9fee73b89ff516c2fe23339bb23b56535e238d
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index 132e01e..4a35b0e 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,6 @@
+2014-03-30 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.50
+
 2014-03-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.48
 
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 4e2c26b..780dcbd 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mercurial
-         VERSION=2.9.1
-     
SOURCE_HASH=sha512:a1734ff7228f02454fc3ae4a0ed95d11b44ac344702c55e5357b4d64c4e81a84fadfcecdc8f67bb1aa8ef1a5708181670626ac7a64dcc74f47b7842525091168
+         VERSION=2.9.2
+     
SOURCE_HASH=sha512:60148bb953069228c1ccb043fdf6abb6f96b127bb0be8c2de6b32ca356140b7c3426f1c2ee09882e714672f6f1ba2dba4ee0622928896e9d4b79383ed50c347a
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://mercurial.selenic.com/release/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index a3262e8..719287b 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2014-04-03 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: updated to 2.9.2
+
 2014-03-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: updated to 2.9.1
 
diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index 2d5a540..d0cea70 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,5 +1,5 @@
            SPELL=grep
-         VERSION=2.16
+         VERSION=2.18
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index d4f12f5..a879b8c 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,6 @@
+2014-04-03 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.18
+
 2014-01-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.16