diff options
author | Holger Freyther <zecke@selfish.org> | 2004-11-13 20:11:32 +0000 |
---|---|---|
committer | Holger Freyther <zecke@selfish.org> | 2004-11-13 20:11:32 +0000 |
commit | badb3eafc9060609d6a484f1cc2e19925b5825c4 (patch) | |
tree | 24d23afd39a315ba7a5d0dae36d5d1c8d2579aaa /libqpe | |
parent | 3d5519e88c30876da6f211f62e226e23a98d3215 (diff) |
Merge the conflict
2004/11/13 21:06:11+01:00 handhelds.org!zecke
Opie 1.1.7:
Remove CVSDATE and PR from the package files
2004/11/13 20:52:18+01:00 handhelds.org!zecke
Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions
2004/11/13 20:36:08+01:00 handhelds.org!zecke
Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation
of the next OpenZaurus/Familiar release.
Remove all occurrences of Opie1.1.6 in the files
BKrev: 41966a744AeMTtlPuskXFPg512ykqQ
Diffstat (limited to 'libqpe')
-rw-r--r-- | libqpe/libqpe-opie_1.1.6.oe | 53 | ||||
-rw-r--r-- | libqpe/libqpe-opie_1.1.7.oe | 0 |
2 files changed, 0 insertions, 53 deletions
diff --git a/libqpe/libqpe-opie_1.1.6.oe b/libqpe/libqpe-opie_1.1.6.oe deleted file mode 100644 index d3c62245d1..0000000000 --- a/libqpe/libqpe-opie_1.1.6.oe +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Base library for the Qt Palmtop Environment" -SECTION = "opie/libs" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL" -DEPENDS = "uicmoc-native qte-for-opie" -PROVIDES = "virtual/libqpe" - -TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/library" -S = "${WORKDIR}/library" - -inherit qmake - -QMAKE_PROFILES = "library.pro" -EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" -EXTRA_QMAKEVARS_POST = "DESTDIR=" - -CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" - -do_compile() { - mkdir -p ${STAGING_INCDIR}/qpe \ - ${STAGING_INCDIR}/qtopia \ - ${STAGING_INCDIR}/opie \ - ${STAGING_INCDIR}/opie2 \ - ${STAGING_INCDIR}/qtopia/private - for i in ${S}/*.h - do - install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i` - done - for i in ${S}/backend/*.h - do - install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i` - done - rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia - oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic -} - -do_stage() { - oe_libinstall -so libqpe ${STAGING_LIBDIR} - # include files already done during do_compile -} - -do_install() { - oe_libinstall -so libqpe ${D}/${palmtopdir}/lib -} - -PACKAGES = "libqpe1" -FILES_libqpe1 = "${palmtopdir}/lib" diff --git a/libqpe/libqpe-opie_1.1.7.oe b/libqpe/libqpe-opie_1.1.7.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libqpe/libqpe-opie_1.1.7.oe |