From badb3eafc9060609d6a484f1cc2e19925b5825c4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 13 Nov 2004 20:11:32 +0000 Subject: 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 --- opie-help-en/opie-help-en_1.1.6.oe | 25 ------------------------- opie-help-en/opie-help-en_1.1.7.oe | 0 2 files changed, 25 deletions(-) delete mode 100644 opie-help-en/opie-help-en_1.1.6.oe create mode 100644 opie-help-en/opie-help-en_1.1.7.oe (limited to 'opie-help-en') diff --git a/opie-help-en/opie-help-en_1.1.6.oe b/opie-help-en/opie-help-en_1.1.6.oe deleted file mode 100644 index 069d3ac38a..0000000000 --- a/opie-help-en/opie-help-en_1.1.6.oe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Opie Help Packages - English" -SECTION = "opie/help" -PRIORITY = "optional" -MAINTAINER = "Team Opie " -LICENSE = "GPL" - -TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/help/en/html " -S = "${WORKDIR}/html" - -do_install() { - install -d ${D}${palmtopdir}/help/en/html/ - install -m 0644 ${WORKDIR}/html/*.html ${D}${palmtopdir}/help/en/html/ - for d in $(find . -type d | grep -v CVS) - do - install -d ${D}${palmtopdir}/help/en/html/$d - install -m 0644 ${WORKDIR}/html/$d/*.html ${D}${palmtopdir}/help/en/html/$d/ - done -} - -python populate_packages_prepend () { - help_dir = oe.data.expand('${palmtopdir}/help/en/html/', d) - - do_split_packages(d, help_dir, file_regex='^(.*)\.html$', output_pattern='opie-%s-help-en', description='Opie Help for %s - English', aux_files_pattern=help_dir + '%s/*') -} diff --git a/opie-help-en/opie-help-en_1.1.7.oe b/opie-help-en/opie-help-en_1.1.7.oe new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3