Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 gnome2-apps/pan/CONFLICTS  |    3 +--
 gnome2-apps/pan/DEPENDS    |    2 +-
 gnome2-apps/pan/DETAILS    |    8 ++++----
 gnome2-apps/pan/HISTORY    |    7 +++++++
 gnome2-apps/pan/PRE_BUILD  |    3 ---
 gnome2-apps/pan/glib.patch |   11 -----------
 6 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 8ff3912254eb8bb44393ace3786bc08eca254258
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    pan: Updated to version 0.133.  Updated options in DEPENDS for gtkspell.
    Removed pan from CONFLICTS.  Removed glib.patch.

diff --git a/gnome2-apps/pan/CONFLICTS b/gnome2-apps/pan/CONFLICTS
index d9f9e28..cce172a 100755
--- a/gnome2-apps/pan/CONFLICTS
+++ b/gnome2-apps/pan/CONFLICTS
@@ -1,2 +1 @@
-conflicts pan2 y  &&
-conflicts pan y
+conflicts pan2 y
diff --git a/gnome2-apps/pan/DEPENDS b/gnome2-apps/pan/DEPENDS
index 3a0749b..8003069 100755
--- a/gnome2-apps/pan/DEPENDS
+++ b/gnome2-apps/pan/DEPENDS
@@ -8,6 +8,6 @@ depends pcre    &&
 depends g++     &&
 
 optional_depends gtkspell                    \
-                    "--enable-gtkspell"      \
+                    "--with-gtkspell"      \
                     ""                       \
                     "Add gtkspell support"
diff --git a/gnome2-apps/pan/DETAILS b/gnome2-apps/pan/DETAILS
old mode 100755
new mode 100644
index 4a264b3..a933318
--- a/gnome2-apps/pan/DETAILS
+++ b/gnome2-apps/pan/DETAILS
@@ -11,17 +11,17 @@ if [ "$REL" == "cvs" ]; then
    SOURCE_IGNORE=volatile 
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
 elif [ "$REL" == "devel" ]; then
-         VERSION=0.132
+         VERSION=0.133
           SOURCE=$SPELL-$VERSION.tar.bz2
    
SOURCE_URL[0]=http://pan.rebelbase.com/download/releases/$VERSION/source/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
-     
SOURCE_HASH=sha512:fc65860206c3be8ff0a47501fe0d211e25c3dc733c73c5180001c530d0567d317edff1d1e6485bc442847730475081b2be8ab3070af8d1e8761f318df7d1608c
+     
SOURCE_HASH=sha512:154ce76e512db298f1e5020dc5b98df41c1e10bd934f218170db2024b518a234644f7c1e2378af6296e0fc6aec51338e51edeeea62b7b222873f7fdeee438c7b
 else
-         VERSION=0.132
+         VERSION=0.133
           SOURCE=$SPELL-$VERSION.tar.bz2
    
SOURCE_URL[0]=http://pan.rebelbase.com/download/releases/$VERSION/source/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
-     
SOURCE_HASH=sha512:fc65860206c3be8ff0a47501fe0d211e25c3dc733c73c5180001c530d0567d317edff1d1e6485bc442847730475081b2be8ab3070af8d1e8761f318df7d1608c
+     
SOURCE_HASH=sha512:154ce76e512db298f1e5020dc5b98df41c1e10bd934f218170db2024b518a234644f7c1e2378af6296e0fc6aec51338e51edeeea62b7b222873f7fdeee438c7b
 fi
       LICENSE[0]=GPL
         WEB_SITE=http://pan.rebelbase.com
diff --git a/gnome2-apps/pan/HISTORY b/gnome2-apps/pan/HISTORY
index 70006a7..105fb95 100644
--- a/gnome2-apps/pan/HISTORY
+++ b/gnome2-apps/pan/HISTORY
@@ -1,3 +1,10 @@
+2008-07-30 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 0.133
+       * PRE_BUILD: Removed glib.patch
+       * DEPENDS: Updated option for gtkspell
+       * CONFLICTS: Removed conflicts pan
+       * glib.patch: Removed.  Incorporated by upstream.
+
 2008-07-08 George Sherwood <george AT beernabeer.com>
        * PRE_BUILD: Do not patch the cvs version for glib2
 
diff --git a/gnome2-apps/pan/PRE_BUILD b/gnome2-apps/pan/PRE_BUILD
index 88ca91f..a14b50c 100755
--- a/gnome2-apps/pan/PRE_BUILD
+++ b/gnome2-apps/pan/PRE_BUILD
@@ -1,8 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
-if [   "$REL"   !=  "cvs"  ]; then
-patch -p0 < $SCRIPT_DIRECTORY/glib.patch
-fi  &&
 if  [  "$REL"  ==  "cvs"  ]; then
   NOCONFIGURE=Y  ./autogen.sh
 fi
diff --git a/gnome2-apps/pan/glib.patch b/gnome2-apps/pan/glib.patch
deleted file mode 100644
index c237251..0000000
--- a/gnome2-apps/pan/glib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pan/data-impl/my-tree.cc.orig      2008-03-28 22:22:43.000000000 +0400
-+++ pan/data-impl/my-tree.cc   2008-03-28 22:23:34.000000000 +0400
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- #include <cassert>
--#include <glib/gmessages.h> // for g_assert
-+#include <glib/gtestutils.h> // for g_assert
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
- #include <pan/general/quark.h>