From 89f1a8087bb92e853ae09b2bd25a10eede6b6cb5 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 31 Jan 2005 14:08:06 +0000
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into
 marcinj.local:/home/hrw/zaurus/bb/openembedded

2005/01/31 15:07:30+01:00 local!hrw
kdepimpi updated to 2.0.0

BKrev: 41fe3bc6Rm9keN9-yojNYP3wGO67rA
---
 packages/kdepimpi/files/qinputdialog_inc.patch | 11 -----------
 packages/kdepimpi/files/qt2310.patch           |  0
 packages/kdepimpi/kdepimpi-base.inc            |  1 +
 packages/kdepimpi/kdepimpi_1.9.16.bb           |  0
 packages/kdepimpi/kdepimpi_2.0.0.bb            |  0
 packages/kdepimpi/kdepimpi_cvs.bb              |  2 +-
 6 files changed, 2 insertions(+), 12 deletions(-)
 create mode 100644 packages/kdepimpi/files/qt2310.patch
 delete mode 100644 packages/kdepimpi/kdepimpi_1.9.16.bb
 create mode 100644 packages/kdepimpi/kdepimpi_2.0.0.bb

(limited to 'packages')

diff --git a/packages/kdepimpi/files/qinputdialog_inc.patch b/packages/kdepimpi/files/qinputdialog_inc.patch
index 6044ae5c14..50a925c64d 100644
--- a/packages/kdepimpi/files/qinputdialog_inc.patch
+++ b/packages/kdepimpi/files/qinputdialog_inc.patch
@@ -25,17 +25,6 @@
  #include <qlabel.h>
  #include <qlineedit.h>
  #include <qpushbutton.h>
---- kdepim/kabc/distributionlisteditor.cpp~qinputdialog_inc.patch
-+++ kdepim/kabc/distributionlisteditor.cpp
-@@ -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>
- 
 --- kdepim/kaddressbook/keywidget.cpp~qinputdialog_inc.patch
 +++ kdepim/kaddressbook/keywidget.cpp
 @@ -23,7 +23,7 @@
diff --git a/packages/kdepimpi/files/qt2310.patch b/packages/kdepimpi/files/qt2310.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index 8702419b4e..6e8340ccc3 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -18,6 +18,7 @@ HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
 # libetpan & libmailwrapper as replacement for kdepim/pi versions
 
 SRC_URI += "\
+file://qt2310.patch;patch=1 \
 file://qinputdialog_inc.patch;patch=1 \
 file://libkcal.pro.patch;patch=1 \
 "
diff --git a/packages/kdepimpi/kdepimpi_1.9.16.bb b/packages/kdepimpi/kdepimpi_1.9.16.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/kdepimpi/kdepimpi_2.0.0.bb b/packages/kdepimpi/kdepimpi_2.0.0.bb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/kdepimpi/kdepimpi_cvs.bb b/packages/kdepimpi/kdepimpi_cvs.bb
index b520981d7c..343ce7d8ed 100644
--- a/packages/kdepimpi/kdepimpi_cvs.bb
+++ b/packages/kdepimpi/kdepimpi_cvs.bb
@@ -1,4 +1,4 @@
-PV = "1.9.16+cvs-${CVSDATE}"
+PV = "2.0.0+cvs-${CVSDATE}"
 
 DEFAULT_PREFERENCE = "-1"
 
-- 
cgit v1.2.3