Merge openembedded@openembedded.bkbits.net:packages

into hyperion.(none):/home/kergoth/code/projects/packages

2004/05/22 20:38:07+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/05/22 20:36:41+02:00 uni-frankfurt.de!mickeyl
fix SRC_URI. Updating to a more recent snapshot can not be
done easily since the pyqwt team did patches to qwt which are not upstream (yet, hopefully) and I don't feel like
adding a dedicated qwt-pyqwt to keep pyqwt happy.

BKrev: 40af9e10fBOQNBWX7SyfZ6Fb85-H2w

diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index b4c6d5e..af661ce 100644 (file)
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -36,10 +36,10 @@ do_configure_prepend() {
 }
 
 do_stage() {
-    install -d ${STAGING_SIPDIR}
+    install -d ${STAGING_SIPDIR}/qt/
     for module in ${SIP_MODULES}
     do
-        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/
+        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
        install -m 0755 ${module}/libcmodule.so ${STAGING_LIBDIR}/python2.3/site-packages/lib${module}cmodule.so
     done
 }

diff --git a/python/python-pyqwt-3.10/qtmod-sip-staging.patch b/python/python-pyqwt-3.10/qtmod-sip-staging.patch
index e69de29..bb90bc1 100644 (file)
--- a/python/python-pyqwt-3.10/qtmod-sip-staging.patch
+++ b/python/python-pyqwt-3.10/qtmod-sip-staging.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- PyQwt-20040118/sip/qwtmod.sip~qtmod-sip-staging    2004-02-14 15:48:17.000000000 +0100
++++ PyQwt-20040118/sip/qwtmod.sip      2004-02-14 15:52:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ 
+ %Include features.sip
+ 
+-%Import qt/qtmod.sip
++%Import qtmod.sip
+ 
+ %ModuleHeaderCode
+ #include <qwt_python.h>

diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index 5d0ef8f..6d89f9f 100644 (file)
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -7,7 +7,7 @@ RDEPENDS = "python-core python-pyqt (${PV}) python-numeric qwt"
 DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
 SRCNAME = "pyqwt"
 
-SRC_URI = "http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
+SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \
            file://qt2.x-compat.patch;patch=1 \
            file://qtmod-sip-staging.patch;patch=1 \
            file://features"
@@ -40,15 +40,15 @@ do_generate_prepend() {
     echo 'HEADERS = $H' >>sip/qwtmod.sip
     echo "%End" >>sip/qwtmod.sip
 
-    mkdir sip/qwt/
+    mkdir -p sip/qwt/
     mv sip/*.* sip/qwt/
 }
 
 do_stage() {
-    install -d ${STAGING_SIPDIR}
+    install -d ${STAGING_SIPDIR}/qwt/
     for module in ${SIP_MODULES}
     do
-        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/
+        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qwt/
         install -m 0755 ${module}/libcmodule.so ${STAGING_LIBDIR}/python2.3/site-packages/lib${module}cmodule.so
     done
 }

diff --git a/qwt/qwt-pyqwt-20040505.oe b/qwt/qwt-pyqwt-20040505.oe
new file mode 100644 (file)
index 0000000..e69de29