Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 python-pypi/camelot/DEPENDS   |    4 +---
 python-pypi/camelot/DETAILS   |   11 +++++------
 python-pypi/camelot/HISTORY   |    5 +++++
 python-pypi/camelot/PRE_BUILD |   23 +----------------------
 python-pypi/fdb/DEPENDS       |    2 +-
 python-pypi/fdb/DETAILS       |    4 ++--
 python-pypi/fdb/HISTORY       |    4 ++++
 7 files changed, 19 insertions(+), 34 deletions(-)

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

    camelot: => 13.04.13

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

    fdb: => 1.1

diff --git a/python-pypi/camelot/DEPENDS b/python-pypi/camelot/DEPENDS
index b2a33ed..ca481de 100755
--- a/python-pypi/camelot/DEPENDS
+++ b/python-pypi/camelot/DEPENDS
@@ -1,8 +1,6 @@
-depends python     &&
+depends PYTHON     &&
 depends SETUPTOOLS &&
 depends sqlalchemy &&
-depends sqlalchemy-migrate &&
-depends elixir     &&
 depends chardet    &&
 depends jinja2      &&
 depends xlrd       &&
diff --git a/python-pypi/camelot/DETAILS b/python-pypi/camelot/DETAILS
index 59374a7..4689b78 100755
--- a/python-pypi/camelot/DETAILS
+++ b/python-pypi/camelot/DETAILS
@@ -1,10 +1,10 @@
            SPELL=camelot
           SPELLX=Camelot
-         VERSION=12.06.29
-     
SOURCE_HASH=sha512:202471d2313a08f063bdc3bb95888d91b397ea3d5c742b26313913a97d001a9279405f27055f157f64d4cebaa54c8cc423237c1fc97cf9fb1086dea563837ffe
-         SOURCE=$SPELLX-$VERSION.tar.gz
+         VERSION=13.04.13
+     
SOURCE_HASH=sha512:946bb30d66f4014ad9aa356b35ddaec934967a053e0896ebb5378c3ed74f37e5f3cd8df7fe7d77df2f70ac9b8ee1619f100470f06646b91d998c1faeda5f20e9
+         SOURCE=$SPELLX-$VERSION-gpl-pyqt.tar.gz
       SOURCE_URL=http://pypi.python.org/packages/source/C/$SPELLX/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION-gpl-pyqt
    WEB_SITE=http://www.python-camelot.com/
       LICENSE[0]=GPL
          ENTERED=20100915
@@ -12,6 +12,5 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
            SHORT="open source RAD framework"
 cat << EOF
 Camelot is an open source RAD framework that leverages Python, Sqlalchemy
-and Qt to build rich
-desktop applications.
+and Qt to build rich desktop applications.
 EOF
diff --git a/python-pypi/camelot/HISTORY b/python-pypi/camelot/HISTORY
index e5b76fa..3d5eff7 100644
--- a/python-pypi/camelot/HISTORY
+++ b/python-pypi/camelot/HISTORY
@@ -1,3 +1,8 @@
+2013-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 13.04.13
+       * DEPENDS: remove sqlalchemy-migrate, elixir, python => PYTHON
+       * PRE_BUILD: only use upstream pyside conversion
+
 2012-06-30 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD: also  edit another file
 
diff --git a/python-pypi/camelot/PRE_BUILD b/python-pypi/camelot/PRE_BUILD
index b384ae3..068526c 100755
--- a/python-pypi/camelot/PRE_BUILD
+++ b/python-pypi/camelot/PRE_BUILD
@@ -6,26 +6,5 @@ message convert to use PySide
 
 python camelot/bin/camelot_admin.py to_pyside  camelot pyside &&
 rm -r camelot &&
-mv pyside camelot  &&
-
-# tidyup some junk
-sed -i -e "/variant_to_pyobject/,/return value/D" \
-     camelot/core/utils.py &&
-sed -i -e "s/QtCore.PYQT_VERSION_STR/PySide.__version__/" \
-  camelot/admin/application_admin.py \
-  camelot/view/main.py &&
-
-sed -i -e "/%L/s/(.*$/(value)/" camelot/view/controls/editors/floateditor.py 
&&
-
-# variant_to_pyobject is an obsolete construct, not needed with pyside
-sed -i \
-   -e "/import variant_to_pyobject/D" \
-   -e "s/, variant_to_pyobject//" \
-   -e "s/variant_to_pyobject,//" \
-   -e "s/variant_to_pyobject//" \
-  camelot/view/action_steps/*.py \
-  camelot/view/controls/*.py \
-  camelot/view/controls/delegates/*.py \
-  camelot/view/controls/editors/*.py \
-  camelot/view/proxy/collection_proxy.py
+mv pyside camelot
 fi
diff --git a/python-pypi/fdb/DEPENDS b/python-pypi/fdb/DEPENDS
index b0cb54f..3e04ca2 100755
--- a/python-pypi/fdb/DEPENDS
+++ b/python-pypi/fdb/DEPENDS
@@ -1,2 +1,2 @@
-depends python     &&
+depends PYTHON     &&
 depends SETUPTOOLS
diff --git a/python-pypi/fdb/DETAILS b/python-pypi/fdb/DETAILS
index e74594f..620d14f 100755
--- a/python-pypi/fdb/DETAILS
+++ b/python-pypi/fdb/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fdb
-         VERSION=0.9.9
-     
SOURCE_HASH=sha512:abe55a8db0bd74dfbe3c865140a776e28b17f71c09e7dfd578b3195c6d8ca1f82f155451c7d66011546a6f63c1e34bdeafeaf6faaf665e9b6814568d9311a6cf
+         VERSION=1.1
+     
SOURCE_HASH=sha512:14b855b446159fc2e628a93a1876a98d75c8e7ae21bdeb2eb305e0b866ef407e6e90e023c740c94c534890be56f841d79d395214774cbc97919c7ff50dbaac09
        SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_URL=http://pypi.python.org/packages/source/f/$SPELL/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/fdb/HISTORY b/python-pypi/fdb/HISTORY
index f396492..1159aec 100644
--- a/python-pypi/fdb/HISTORY
+++ b/python-pypi/fdb/HISTORY
@@ -1,3 +1,7 @@
+2013-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1
+       * DEPENDS: python => PYTHON
+
 2012-11-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.9