summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2013-04-12 13:59:01 +0200
committerTreeve Jelbert2013-04-13 10:50:19 +0200
commitcf69a7b782368ef82cb1df3932a076a04f168657 (patch)
tree98a5eafe93254530a02b2f0500e8942912ba1a1e
parent5beeef3ee640a8a7346f9990e5e2addb13151137 (diff)
camelot: => 13.04.13
-rwxr-xr-xpython-pypi/camelot/DEPENDS4
-rwxr-xr-xpython-pypi/camelot/DETAILS11
-rw-r--r--python-pypi/camelot/HISTORY5
-rwxr-xr-xpython-pypi/camelot/PRE_BUILD23
4 files changed, 12 insertions, 31 deletions
diff --git a/python-pypi/camelot/DEPENDS b/python-pypi/camelot/DEPENDS
index b2a33ed517..ca481dec1c 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 59374a7c0e..4689b78909 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 e5b76fa4ef..3d5eff71b5 100644
--- a/python-pypi/camelot/HISTORY
+++ b/python-pypi/camelot/HISTORY
@@ -1,3 +1,8 @@
+2013-04-13 Treeve Jelbert <treeve@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@sourcemage.org>
* PRE_BUILD: also edit another file
diff --git a/python-pypi/camelot/PRE_BUILD b/python-pypi/camelot/PRE_BUILD
index b384ae3664..068526cb58 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