diff options
| -rw-r--r-- | packages/gpe-conf/gpe-conf_cvs.bb | 22 | ||||
| -rw-r--r-- | packages/gpe-contacts/gpe-contacts_0.36.bb | 12 | ||||
| -rw-r--r-- | packages/gpe-contacts/gpe-contacts_0.45.bb (renamed from packages/gpe-contacts/gpe-contacts_0.42.bb) | 3 |
3 files changed, 4 insertions, 33 deletions
diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb index 552fc7def5..a0bec2b70f 100644 --- a/packages/gpe-conf/gpe-conf_cvs.bb +++ b/packages/gpe-conf/gpe-conf_cvs.bb @@ -2,13 +2,11 @@ DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" PV = "0.1.29+cvs${SRCDATE}" -PR = "r1" +PR = "r2" -inherit gpe +inherit autotools gpe -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN} \ - file://Makefile.dpkg_ipkg \ - file://Makefile.translation" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" PACKAGES = "gpe-conf gpe-conf-panel" LICENSE = "GPL" @@ -25,17 +23,3 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ ${datadir}/gpe-conf" FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile - mkdir build - cp ${WORKDIR}/Makefile.* build/ - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program -} - - diff --git a/packages/gpe-contacts/gpe-contacts_0.36.bb b/packages/gpe-contacts/gpe-contacts_0.36.bb deleted file mode 100644 index 28e93b48b0..0000000000 --- a/packages/gpe-contacts/gpe-contacts_0.36.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -PR = "r0" - -DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE contacts manager" - -FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" - diff --git a/packages/gpe-contacts/gpe-contacts_0.42.bb b/packages/gpe-contacts/gpe-contacts_0.45.bb index 32103b1867..b5afbb3a3c 100644 --- a/packages/gpe-contacts/gpe-contacts_0.42.bb +++ b/packages/gpe-contacts/gpe-contacts_0.45.bb @@ -1,10 +1,9 @@ LICENSE = "GPL" -MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" inherit gpe autotools PR = "r0" -DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" SECTION = "gpe" RDEPENDS = "gpe-icons" DESCRIPTION = "GPE contacts manager" |