diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-17 21:04:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-17 21:04:34 +0000 |
| commit | 4564c110bfe9eb9578bdf0c90ae99f833fcf20cc (patch) | |
| tree | 3d27a38e326430cee69cd199bbafce71e2cb18e6 | |
| parent | c15a761ab3c8d3a9fa740897640c8d57dc89a757 (diff) | |
| parent | 416c63fe0bd0356757d8fb63db74975a739e69a6 (diff) | |
merge of '0c96c7b5c31b29dbfc8df2a2ec577addd4bb9461'
and '6b8c5dfa1242c770d1d6c3f4939f19e2d8ea800d'
| -rw-r--r-- | packages/opie-dagger/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/opie-dagger/files/opie-dagger-missing-include.patch | 11 | ||||
| -rw-r--r-- | packages/opie-dagger/opie-dagger_1.2.3.bb | 3 | ||||
| -rw-r--r-- | packages/opie-dagger/opie-dagger_cvs.bb | 3 |
4 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 e69de29bb2..0000000000 --- a/packages/opie-dagger/files/.mtn2git_empty +++ /dev/null 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 f874e0bcf0..0000000000 --- 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 c207986409..cacd5552bb 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 d9191e26a9..8d8f93cf58 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" |