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/CONFIGURE |    6 ++++++
 python-pypi/camelot/DEPENDS   |    9 +++++++--
 python-pypi/camelot/DETAILS   |    4 ++--
 python-pypi/camelot/HISTORY   |    8 ++++++++
 python-pypi/camelot/PRE_BUILD |   30 ++++++++++++++++++++++++++++++
 5 files changed, 53 insertions(+), 4 deletions(-)

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

    camelot: => 11.12.30

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

    camelot: => 11.12.29

diff --git a/python-pypi/camelot/CONFIGURE b/python-pypi/camelot/CONFIGURE
new file mode 100755
index 0000000..7492e15
--- /dev/null
+++ b/python-pypi/camelot/CONFIGURE
@@ -0,0 +1,6 @@
+message "${MESSAGE_COLOR}Camelot now supports two different bindings to 
Qt.\n\
+PySide (LGPL) - sibling project to Qt, financed by Nokia\n\
+PyQt4  (GPL)  - developed by Riverbank Computing\n\
+PySide tends to track Qt changes faster and has more frequent releases.\
+${DEFAULT_COLOR}"
+config_query_list CAMBIND 'which Qt binding' pyside pyqt4
diff --git a/python-pypi/camelot/DEPENDS b/python-pypi/camelot/DEPENDS
index 934c33d..b2a33ed 100755
--- a/python-pypi/camelot/DEPENDS
+++ b/python-pypi/camelot/DEPENDS
@@ -7,6 +7,11 @@ depends chardet    &&
 depends jinja2      &&
 depends xlrd       &&
 depends xlwt       &&
-depends pyqt4  
-depends qt4
+depends qt4        &&
+if [[ $CAMBIND == pyside ]];then
+  depends pyside &&
+  depends pyside-tools
+else
+  depends pyqt4  
+fi
 
diff --git a/python-pypi/camelot/DETAILS b/python-pypi/camelot/DETAILS
index 829cd26..15d94ba 100755
--- a/python-pypi/camelot/DETAILS
+++ b/python-pypi/camelot/DETAILS
@@ -1,7 +1,7 @@
            SPELL=camelot
           SPELLX=Camelot
-         VERSION=11.11.16
-     
SOURCE_HASH=sha512:0bf3415a3ae5ee3eef79a70a8cf0f33f7206598be96a77d82cd9408474a1bbd3fb2ec90b7365366a2c2ab9f3b46ab7474a44865276f91c4ca0df26a9eb1f38d4
+         VERSION=11.12.30
+     
SOURCE_HASH=sha512:f80bcd633dbcb68d081f99017d41510bb0a5a452260a8f56f76b852f2aa6b14ac5cdb2b00efadb9228653014036d8ad67b178e9c5d11b4bb27405f850fc9f4a1
          SOURCE=$SPELLX-$VERSION.tar.gz
       SOURCE_URL=http://pypi.python.org/packages/source/C/$SPELLX/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/camelot/HISTORY b/python-pypi/camelot/HISTORY
index faf6fe1..ea7e9e2 100644
--- a/python-pypi/camelot/HISTORY
+++ b/python-pypi/camelot/HISTORY
@@ -1,3 +1,11 @@
+2011-12-30 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 11.12.30
+
+2011-12-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 11.12.29
+       * PRE_BUILD, CONFIGURE: added; choice of pyside/pyqt4
+       * DEPENDS: support pyside
+
 2011-12-08 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 11.11.16
 
diff --git a/python-pypi/camelot/PRE_BUILD b/python-pypi/camelot/PRE_BUILD
new file mode 100755
index 0000000..7461f04
--- /dev/null
+++ b/python-pypi/camelot/PRE_BUILD
@@ -0,0 +1,30 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if is_depends_enabled $SPELL pyside;then
+message convert to use PySide
+
+python camelot/bin/camelot_admin.py to_pyside  camelot &&
+rm -r camelot &&
+mv to_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
+fi