Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

3 files changed, 0 insertions, 89 deletions

diff --git a/kdepimpi/files/libkcal.pro.patch b/kdepimpi/files/libkcal.pro.patch
deleted file mode 100644
index 48733e2176..0000000000
--- a/kdepimpi/files/libkcal.pro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdepim/libkcal/libkcalE.pro.orig	2004-06-29 18:51:39.000000000 +0200
-+++ kdepim/libkcal/libkcalE.pro	2004-07-05 21:58:01.000000000 +0200
-@@ -8,8 +8,8 @@
- OBJECTS_DIR = obj/$(PLATFORM)
- MOC_DIR = moc/$(PLATFORM)
- DESTDIR = $(QPEDIR)/lib
--LIBS += ../libical/lib/$(PLATFORM)/libical.a
--LIBS += ../libical/lib/$(PLATFORM)/libicalss.a
-+LIBS += ../dest/libical.a
-+LIBS += ../dest/libicalss.a
- 
- INTERFACES = \
- 
diff --git a/kdepimpi/files/manager.h.patch b/kdepimpi/files/manager.h.patch
deleted file mode 100644
index bea9863ec0..0000000000
--- a/kdepimpi/files/manager.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Strange patch - not always needed
-
-diff -ur kdepim/microkde/kresources/manager.h kdepim-moj/microkde/kresources/manager.h
---- kdepim/microkde/kresources/manager.h	2004-06-26 21:02:46.000000000 +0200
-+++ kdepim-moj/microkde/kresources/manager.h	2004-07-02 17:01:25.000000000 +0200
-@@ -26,6 +26,9 @@
- 
- #include <qdict.h>
- #include <qstringlist.h>
-+#include <iostream>
-+
-+using namespace std;
- 
- #include "factory.h"
- #include "managerimpl.h"
-@@ -235,7 +238,7 @@
- 
-     ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 )
-     {
--      return mFactory->resourceConfigWidget( type, parent );
-+      return mFactory->configWidget( type, parent );
-     }
- 
-     /**
diff --git a/kdepimpi/files/qinputdialog_inc.patch b/kdepimpi/files/qinputdialog_inc.patch
deleted file mode 100644
index 272de15593..0000000000
--- a/kdepimpi/files/qinputdialog_inc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-
-libqtaux contra libmicroqtcompat patch
-
-diff -ur kdepim/microkde/kresources/configpage.cpp kdepim-moj/microkde/kresources/configpage.cpp
---- kdepim/microkde/kresources/configpage.cpp	2004-06-26 21:02:47.000000000 +0200
-+++ kdepim-moj/microkde/kresources/configpage.cpp	2004-07-02 16:58:47.000000000 +0200
-@@ -22,7 +22,7 @@
- */
- 
- #include <qgroupbox.h>
--#include <qinputdialog.h>
-+#include <qtcompat/qinputdialog.h>
- #include <qlabel.h>
- #include <qlayout.h>
- 
-diff -ur kdepim/kaddressbook/xxport/csvimportdialog.cpp kdepim-moj/kaddressbook/xxport/csvimportdialog.cpp
---- kdepim/kaddressbook/xxport/csvimportdialog.cpp	2004-06-26 21:02:22.000000000 +0200
-+++ kdepim-moj/kaddressbook/xxport/csvimportdialog.cpp	2004-07-02 17:30:28.000000000 +0200
-@@ -30,7 +30,7 @@
- #include <qbuttongroup.h>
- #include <qcheckbox.h>
- #include <qcombobox.h>
--#include <qinputdialog.h>
-+#include <qtcompat/qinputdialog.h>
- #include <qlabel.h>
- #include <qlineedit.h>
- #include <qpushbutton.h>
-diff -ur kdepim/kabc/distributionlisteditor.cpp kdepim-moj/kabc/distributionlisteditor.cpp
---- kdepim/kabc/distributionlisteditor.cpp	2004-06-29 07:22:55.000000000 +0200
-+++ kdepim-moj/kabc/distributionlisteditor.cpp	2004-07-02 17:09:14.000000000 +0200
-@@ -22,7 +22,7 @@
- #include <qlayout.h>
- #include <qpushbutton.h>
- #include <qcombobox.h>
--#include <qinputdialog.h>
-+#include <qtcompat/qinputdialog.h>
- #include <qbuttongroup.h>
- #include <qradiobutton.h>
- 
-diff -ur kdepim/kaddressbook/keywidget.cpp kdepim-moj/kaddressbook/keywidget.cpp
---- kdepim/kaddressbook/keywidget.cpp	2004-06-26 21:02:14.000000000 +0200
-+++ kdepim-moj/kaddressbook/keywidget.cpp	2004-07-02 17:26:33.000000000 +0200
-@@ -23,7 +23,7 @@
- 
- #include <qfile.h>
- 
--#include <qinputdialog.h>
-+#include <qtcompat/qinputdialog.h>
- 
- #include <qlabel.h>
- #include <qlayout.h>