diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-09-18 14:55:26 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-18 14:55:26 +0000 |
| commit | 580812d45b4d728b2269ed2e94703b168342ea09 (patch) | |
| tree | 3816c7115f8a53eace6bc81b36e810d3fe45ad59 | |
| parent | fdfd54d3944bbc43910f74e4b50a17865a258195 (diff) | |
| parent | 8cfc4ee9260601448003c414ce308e0ed5c66435 (diff) | |
merge of d4dacf3f494f19480484b5e0d7806960a0ba7909
and e957dec81b0871cd7d43333a923a3249859c91f7
| -rw-r--r-- | packages/meta/opie-image.bb | 2 | ||||
| -rw-r--r-- | packages/ubahnnav/ubahnnav_0.3.1.bb | 32 | ||||
| -rw-r--r-- | packages/ubahnnav/ubahnnav_0.4.1.bb (renamed from packages/ubahnnav/ubahnnav_0.4.0.bb) | 9 |
3 files changed, 6 insertions, 37 deletions
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index b1cf207656..20a3518fd7 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -8,7 +8,7 @@ FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${D LICENSE = "MIT" PR = "r18" -DEPENDS = "meta-opie" +DEPENDS = "task-bootstrap meta-opie" extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}' diff --git a/packages/ubahnnav/ubahnnav_0.3.1.bb b/packages/ubahnnav/ubahnnav_0.3.1.bb deleted file mode 100644 index 01d1a8a192..0000000000 --- a/packages/ubahnnav/ubahnnav_0.3.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "U-Bahn Navigator helps you navigating through foreign public \ -transport networks. It finds the shortest or direct route from a start to a \ -destination station of the loaded subway map. U-Bahn Navigator is extensible \ -to support each public transport network." -PRIORITY = "optional" -SECTION = "opie/applications" -MAINTAINER = "Dimitri Brukakis" -LICENSE = "GPL" -APPNAME = "ubahnnav" -APPTYPE = "binary" -APPDESKTOP = "${S}/src/ubahnnav" -PR = "r2" - -SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \ - file://qmake.patch;patch=1" -S = "${WORKDIR}/ubahnnav-${PV}" - -inherit opie - -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST = "LIBS+=-L${S}" - -do_configure_prepend() { - find . -name "Makefile"|xargs rm -f -} - -do_install() { - oe_libinstall -so libsubwaymap ${D}${palmtopdir}/lib - install -d ${D}${palmtopdir}/pics ${D}${palmtopdir}/ubahn/maps - touch ${D}${palmtopdir}/ubahn/maps/.empty - install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png -} diff --git a/packages/ubahnnav/ubahnnav_0.4.0.bb b/packages/ubahnnav/ubahnnav_0.4.1.bb index 49e46ac8b0..16924681db 100644 --- a/packages/ubahnnav/ubahnnav_0.4.0.bb +++ b/packages/ubahnnav/ubahnnav_0.4.1.bb @@ -10,7 +10,7 @@ LICENSE = "GPL" APPNAME = "ubahnnav" APPTYPE = "binary" APPDESKTOP = "${S}/src/ubahnnav" -PR = "r2" +PR = "r0" SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \ file://qmake.patch;patch=1" @@ -19,7 +19,7 @@ S = "${WORKDIR}/ubahnnav-${PV}" inherit opie export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST = "LIBS+=-L${S} LIBS-=-lqtopia" +EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/libsubwaymap LIBS+=-L${S} LIBS-=-lqtopia" do_configure_prepend() { find . -name "Makefile"|xargs rm -f @@ -27,7 +27,8 @@ do_configure_prepend() { do_install() { oe_libinstall -so libsubwaymap ${D}${palmtopdir}/lib - install -d ${D}${palmtopdir}/pics ${D}${palmtopdir}/ubahn/maps + install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/ubahn/maps touch ${D}${palmtopdir}/ubahn/maps/.empty - install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png + install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png } |