summaryrefslogtreecommitdiff
path: root/opie-help-en
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
committerHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
commitbadb3eafc9060609d6a484f1cc2e19925b5825c4 (patch)
tree24d23afd39a315ba7a5d0dae36d5d1c8d2579aaa /opie-help-en
parent3d5519e88c30876da6f211f62e226e23a98d3215 (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-help-en')
-rw-r--r--opie-help-en/opie-help-en_1.1.6.oe25
-rw-r--r--opie-help-en/opie-help-en_1.1.7.oe0
2 files changed, 0 insertions, 25 deletions
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 <opie@handhelds.org>"
-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
--- /dev/null
+++ b/opie-help-en/opie-help-en_1.1.7.oe