From ea1f4abc2d35e40392047ee24f76f6aeb37e1e86 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 23 May 2004 09:12:35 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/05/23 01:40:00+02:00 uni-frankfurt.de!mickeyl
add more stuff to opie-image and regroup a few things

2004/05/22 23:48:02+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 23:16:51+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 23:06:40+02:00 uni-frankfurt.de!mickeyl
make pyqwt no longer apply the sip-staging-patch

BKrev: 40b06b03mFday80aqNYfS2HaBMptQQ
---
 python/python-pyqwt-3.10/qtmod-sip-staging.patch | 16 ----------------
 python/python-pyqwt_3.10.oe                      |  1 -
 2 files changed, 17 deletions(-)
 delete mode 100644 python/python-pyqwt-3.10/qtmod-sip-staging.patch

(limited to 'python')

diff --git a/python/python-pyqwt-3.10/qtmod-sip-staging.patch b/python/python-pyqwt-3.10/qtmod-sip-staging.patch
deleted file mode 100644
index bb90bc10ce..0000000000
--- a/python/python-pyqwt-3.10/qtmod-sip-staging.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# 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 6d89f9f62c..beaaf2a8a0 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -9,7 +9,6 @@ SRCNAME = "pyqwt"
 
 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"
 S = "${WORKDIR}/PyQwt-20040118"
 
-- 
cgit v1.2.3