[oe-commits] : opie-dagger: remove patch (now merged upstream)

OE GIT Trial gittrial at amethyst.openembedded.net
Wed Sep 17 21:11:15 UTC 2008


Module: OE.dev
Branch: org.openembedded.dev
Commit: 0f33795c21de9b3177f12988af1c3defad35e5af
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=0f33795c21de9b3177f12988af1c3defad35e5af

Author:  <bluelightning at openembedded.org>
Date:   Wed Sep 17 20:43:59 2008 +0000

opie-dagger: remove patch (now merged upstream)

---

 .../files/opie-dagger-missing-include.patch        |   11 -----------
 packages/opie-dagger/opie-dagger_1.2.3.bb          |    3 +--
 packages/opie-dagger/opie-dagger_cvs.bb            |    3 +--
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/opie-dagger/files/.mtn2git_empty b/packages/opie-dagger/files/.mtn2git_empty
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/opie-dagger/files/opie-dagger-missing-include.patch b/packages/opie-dagger/files/opie-dagger-missing-include.patch
deleted file mode 100644
index f874e0b..0000000
--- a/packages/opie-dagger/files/opie-dagger-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur dagger.orig/opentextdlg.h dagger/opentextdlg.h
---- dagger.orig/opentextdlg.h	2004-04-06 18:00:07.000000000 +0200
-+++ dagger/opentextdlg.h	2007-03-12 15:09:02.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <qlistview.h>
- 
- #include <swmgr.h>
-+#include <swmodule.h>
- 
- class QPixmap;
- 
diff --git a/packages/opie-dagger/opie-dagger_1.2.3.bb b/packages/opie-dagger/opie-dagger_1.2.3.bb
index c207986..cacd555 100644
--- a/packages/opie-dagger/opie-dagger_1.2.3.bb
+++ b/packages/opie-dagger/opie-dagger_1.2.3.bb
@@ -1,9 +1,8 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 
-SRC_URI += " file://opie-dagger-missing-include.patch;patch=1"
diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb
index d9191e2..8d8f93c 100644
--- a/packages/opie-dagger/opie-dagger_cvs.bb
+++ b/packages/opie-dagger/opie-dagger_cvs.bb
@@ -1,10 +1,9 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/apps"
 
-SRC_URI += " file://opie-dagger-missing-include.patch;patch=1"





More information about the Openembedded-commits mailing list