diff options
| author | Holger Freyther <zecke@selfish.org> | 2006-07-02 15:33:53 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-02 15:33:53 +0000 |
| commit | 41bd48366810c868f1991a4baf0bedee90af58b0 (patch) | |
| tree | 2f30862cba320e61d118bc2b2a7ef8da12e90832 | |
| parent | 8d9c2a3d933e3b957a687982d36bd5c5072c2022 (diff) | |
Opie: bump the CSV Opie version to 1.2.2+CSV, drop old backports
5 files changed, 2 insertions, 40 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 47f364a644..6430d46d6a 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -18,7 +18,7 @@ inherit palmtop # Note that when CVS changes to 1.2.2, the dash # should be removed from OPIE_CVS_PV to convert # to the standardised version format -OPIE_CVS_PV = "1.2.1+cvs-${SRCDATE}" +OPIE_CVS_PV = "1.2.2+cvs-${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" diff --git a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/.mtn2git_empty b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/add-hrw-to-authors.patch b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/add-hrw-to-authors.patch deleted file mode 100644 index 93a251ccac..0000000000 --- a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/add-hrw-to-authors.patch +++ /dev/null @@ -1,18 +0,0 @@ -Backport from CVS - -Index: widget.ui -=================================================================== -RCS file: /cvs/opie/core/applets/aboutapplet/widget.ui,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -u -r1.6 -r1.7 ---- aboutapplet/widget.ui 22 Apr 2005 13:01:47 -0000 1.6 -+++ aboutapplet/widget.ui 13 Nov 2005 14:40:31 -0000 1.7 -@@ -134,6 +134,7 @@ - <b>Holger 'Zecke' Freyther</b> (zecke@handhelds.org)<br/> - <b>Robert 'Sandman' Griebl</b> (sandman@handhelds.org)<br/> - <b>Alberto 'Skyhusker' Hierro</b> (skyhusker@handhelds.org)<br/> -+<b>Marcin 'Hrw' Juszkiewicz</b> (hrw@handhelds.org)<br/> - <b>Chris 'Kergoth' Larson</b> (kergoth@handhelds.org)<br/> - <b>Michael 'Mickey' Lauer</b> (mickeyl@handhelds.org)<br/> - <b>Lorn 'ljp' Potter</b> (ljp@handhelds.org)<br/> diff --git a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch deleted file mode 100644 index 31e66ced31..0000000000 --- a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -Backport from CVS - -Index: widget.ui -=================================================================== -RCS file: /cvs/opie/core/applets/aboutapplet/widget.ui,v -retrieving revision 1.7 -diff -u -u -r1.7 widget.ui ---- aboutapplet/widget.ui 13 Nov 2005 14:40:31 -0000 1.7 -+++ aboutapplet/widget.ui 22 Jan 2006 20:49:33 -0000 -@@ -42,7 +42,7 @@ - </property> - <property stdset="1"> - <name>text</name> -- <string><center><b>The Open Palmtop Integrated Environment V1.2</b></center></string> -+ <string><center><b>The Open Palmtop Integrated Environment V1.2.1</b></center></string> - </property> - </widget> - <widget row="1" column="1" > diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb index 963728e20b..65cb96a6e1 100644 --- a/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb +++ b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb @@ -1,6 +1,4 @@ include ${PN}.inc -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet \ - file://opie-1.2.2.patch;patch=1 \ - file://add-hrw-to-authors.patch;patch=1" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet" |