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 /opie-ftplib | |
| 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 'opie-ftplib')
| -rw-r--r-- | opie-ftplib/opie-ftplib_1.1.6.oe | 27 | ||||
| -rw-r--r-- | opie-ftplib/opie-ftplib_1.1.7.oe | 0 |
2 files changed, 0 insertions, 27 deletions
diff --git a/opie-ftplib/opie-ftplib_1.1.6.oe b/opie-ftplib/opie-ftplib_1.1.6.oe deleted file mode 100644 index 72ace97d7b..0000000000 --- a/opie-ftplib/opie-ftplib_1.1.6.oe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Opie FTP Library" -SECTION = "opie/libs" -MAINTAINER = "Team Opie <opie@handhelds.org>" -PRIORITY = "optional" -LICENSE = "GPL" -PROVIDES = "libftplib1" -I18N_FILES = "libftplib.ts" - -PR = "r1" - -TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/net/ftplib" -S = "${WORKDIR}/ftplib" - -inherit palmtop -inherit opie_i18n - -EXTRA_QMAKEVARS_POST = "DESTDIR=${S}" - -do_stage () { - install -m 0664 ${S}/ftplib.h ${STAGING_INCDIR}/ - oe_libinstall -so libftplib ${STAGING_LIBDIR} -} - -do_install() { - oe_libinstall -so libftplib ${D}/${palmtopdir}/lib -} diff --git a/opie-ftplib/opie-ftplib_1.1.7.oe b/opie-ftplib/opie-ftplib_1.1.7.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/opie-ftplib/opie-ftplib_1.1.7.oe |