Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 archive/star/DETAILS              |    4 ++--
 archive/star/HISTORY              |    3 +++
 database/openrpt/CONFLICTS        |    1 +
 database/openrpt/DETAILS          |    8 ++++----
 database/openrpt/HISTORY          |    6 ++++++
 database/openrpt/PRE_BUILD        |    2 --
 database/openrpt/multidb.diff.bz2 |    0 
 dev/null                          |binary
 8 files changed, 16 insertions(+), 8 deletions(-)

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

    openrpt-2.1.0

commit 295c65c198ee662abb0ddd76170ef4908d64b80c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    star-1.5a83

diff --git a/archive/star/DETAILS b/archive/star/DETAILS
index 1570dc1..9472b0f 100755
--- a/archive/star/DETAILS
+++ b/archive/star/DETAILS
@@ -1,6 +1,6 @@
            SPELL=star
-         VERSION=1.5a82
-     
SOURCE_HASH=sha512:c3f3df4cdcdd1c6e6dddce1c2a4b7c3aec6ff68b12cbf92d251a6ea57b245b8e7c2606c315e705fffc94d7491bfc784cf793138edbdf24ffd22a107ee33adb39
+         VERSION=1.5a83
+     
SOURCE_HASH=sha512:32b28e008ee28cbc02b3cbd87b1f81da57300c6724e0dd59aa50f10707e7a84bb9a629600723598a65912c45477c36ede33f03aa066f26ffa54c72198b29ccce
            ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%a*}
diff --git a/archive/star/HISTORY b/archive/star/HISTORY
index d2b090a..80dd522 100644
--- a/archive/star/HISTORY
+++ b/archive/star/HISTORY
@@ -1,3 +1,6 @@
+2007-07-17 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.5a83
+
 2007-06-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.5a82
 
diff --git a/database/openrpt/CONFLICTS b/database/openrpt/CONFLICTS
new file mode 100755
index 0000000..c552ef9
--- /dev/null
+++ b/database/openrpt/CONFLICTS
@@ -0,0 +1 @@
+conflicts openrpt y
diff --git a/database/openrpt/DETAILS b/database/openrpt/DETAILS
index eb86907..05cfa7d 100755
--- a/database/openrpt/DETAILS
+++ b/database/openrpt/DETAILS
@@ -1,8 +1,8 @@
            SPELL=openrpt
-         VERSION=2.0.0
-     
SOURCE_HASH=sha512:cd3a03ae8c05addbe5e68d4823c0c8f3b13f8a33306bdbf538b49b794c779d598e6bce6d0e12dbcc2eaf9115fa3735bc76196788a5e0964504050c9294af2611
-          SOURCE=$SPELL-$VERSION-source.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-source
+         VERSION=2.1.0
+     
SOURCE_HASH=sha512:1967d2db1a458a85ae49f85785f95d5e46cc05a39e47b68216a22c9a675c69f751a33b840de291acfad7e6db2be27479b946982f6a82a41a85e5520696c64eda
+          SOURCE=$SPELL-$VERSION-src.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
         WEB_SITE=http://www.openrpt.com/
       PATCHLEVEL=1
diff --git a/database/openrpt/HISTORY b/database/openrpt/HISTORY
index 01ea583..d92e25c 100644
--- a/database/openrpt/HISTORY
+++ b/database/openrpt/HISTORY
@@ -1,3 +1,9 @@
+2007-06-27 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.1.0
+       * PRE_BUILD: no longer apply patch
+       * multidb.diff.bz2: deleted, already applied upstream
+       * CONFLICTS: added, remove previous version first
+
 2007-01-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.0
          PRE_BUILD: apply upstream patch to allow any dbms
diff --git a/database/openrpt/PRE_BUILD b/database/openrpt/PRE_BUILD
index b3278b0..abbcc0d 100755
--- a/database/openrpt/PRE_BUILD
+++ b/database/openrpt/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY      &&
-# allow access to any dbms
-bzcat $SPELL_DIRECTORY/multidb.diff.bz2 | patch -p0  &&
 # use dynamic libraries
 sed -i -e "s/staticlib//" common/common.pro OpenRPT/renderer/renderer.pro \
      OpenRPT/wrtembed/wrtembed.pro
diff --git a/database/openrpt/multidb.diff.bz2 
b/database/openrpt/multidb.diff.bz2
deleted file mode 100644
index 756164a..0000000
Binary files a/database/openrpt/multidb.diff.bz2 and /dev/null differ