4 files changed, 4 insertions, 52 deletions
diff --git a/packages/opie-help-en/opie-help-en.inc b/packages/opie-help-en/opie-help-en.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-help-en/opie-help-en.inc
diff --git a/packages/opie-help-en/opie-help-en_1.1.9.bb b/packages/opie-help-en/opie-help-en_1.1.9.bb
deleted file mode 100644
index 0398dca0a0..0000000000
--- a/packages/opie-help-en/opie-help-en_1.1.9.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Opie Help Packages - English"
-SECTION = "opie/help"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-ALLOW_EMPTY = 1
-PR = "r1"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_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\|patch")
-	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 = bb.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/packages/opie-help-en/opie-help-en_1.2.0.bb b/packages/opie-help-en/opie-help-en_1.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-help-en/opie-help-en_1.2.0.bb
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 01a232e0d3..129ff492e0 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,27 +1,6 @@
-DESCRIPTION = "Opie Help Packages - English"
-SECTION = "opie/help"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-PV = "1.1.9+cvs-${CVSDATE}"
-ALLOW_EMPTY = 1
-PR = "r1"
+include ${PN}.inc
+    
+PV = "1.2.0+cvs-${CVSDATE}"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};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\|patch")
-	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 = bb.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/*')
-}