8 files changed, 20 insertions, 26 deletions
diff --git a/help/en/html/opie-advancedfm-help-en.control b/help/en/html/opie-advancedfm-help-en.control
index b3b7f5e..47bb08a 100644
--- a/help/en/html/opie-advancedfm-help-en.control
+++ b/help/en/html/opie-advancedfm-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-advancedfm-help-en
-Files: help/en/html/opie-advancedfm.html 
+Files: help/en/html/advancedfm.html 
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-advancedfm
 License: GPL
 Description: Opie Advanced file manager help files (english)
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-aqpkg-help-en.control b/help/en/html/opie-aqpkg-help-en.control
index 011191f..a4c73df 100644
--- a/help/en/html/opie-aqpkg-help-en.control
+++ b/help/en/html/opie-aqpkg-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-aqpkg-help-en
-Files: help/en/html/aqpkg.html
+Files: help/en/html/aqpkg.html help/en/html/aqpkg/*
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-aqpkg
 License: GPL
 Description: AQPkg Opie package manager help files (english)
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-console-help-en.control b/help/en/html/opie-console-help-en.control
index 3ac3954..d6ecf47 100644
--- a/help/en/html/opie-console-help-en.control
+++ b/help/en/html/opie-console-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-console-help-en
 Files: help/en/html/opie-console.html help/en/html/opie-console/*
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-console
 License: GPL
 Description: Opie terminal app help files (english)
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-embeddedkonsole-help-en.control b/help/en/html/opie-embeddedkonsole-help-en.control
index 560505e..4c6892a 100644
--- a/help/en/html/opie-embeddedkonsole-help-en.control
+++ b/help/en/html/opie-embeddedkonsole-help-en.control
@@ -1,11 +1,9 @@
 Package: opie-embeddedkonsole-help-en
-Files: help/en/html/opie-embeddedkonsole.html
+Files: help/en/html/embeddedkonsole.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: ljp <llornkcor@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Maintainer: Team Opie <opie@handhelds.org>
 Depends: opie-embeddedkonsole
 License: GPL
-Description: Open Embeddedkonsole help files (english)
- 
+Description: embeddedkonsole help files (en)
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-formatter-help-en.control b/help/en/html/opie-formatter-help-en.control
index f2fd4f7..3d7cb15 100644
--- a/help/en/html/opie-formatter-help-en.control
+++ b/help/en/html/opie-formatter-help-en.control
@@ -1,11 +1,9 @@
 Package: opie-formatter-help-en
-Files: help/en/html/opie-formatter.html
+Files: help/en/html/formatter.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: ljp <llornkcor@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Maintainer: Team Opie <opie@handhelds.org>
 Depends: opie-formatter
 License: GPL
-Description: Formatter help files (english)
- 
+Description: formatter help files (en)
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-keypebble-help-en.control b/help/en/html/opie-keypebble-help-en.control
index 9285cd0..c067c67 100644
--- a/help/en/html/opie-keypebble-help-en.control
+++ b/help/en/html/opie-keypebble-help-en.control
@@ -1,11 +1,9 @@
 Package: opie-keypebble-help-en
-Files: help/en/html/opie-keypebble.html 
+Files: help/en/html/keypebble.html help/en/html/keypebble
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: treke <treke@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Maintainer: Team Opie <opie@handhelds.org>
 Depends: opie-keypebble
 License: GPL
-Description: Opie VNC Viewer help files (english)
- 
+Description: keypebble help files (en)
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-vmemo-help-en.control b/help/en/html/opie-vmemo-help-en.control
index 726308c..c81f29a 100644
--- a/help/en/html/opie-vmemo-help-en.control
+++ b/help/en/html/opie-vmemo-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-vmemo-help-en
-Files: help/en/html/opie-vmemo.html
+Files: help/en/html/vmemo.html
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-vmemo
 License: GPL
 Description: Opie Vmemo voice recording help files (english)
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wellenreiter-help-en.control b/help/en/html/opie-wellenreiter-help-en.control
index 597b9ac..33aa974 100644
--- a/help/en/html/opie-wellenreiter-help-en.control
+++ b/help/en/html/opie-wellenreiter-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-wellenreiter-help-en
 Files: help/en/html/wellenreiter.html
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-wellenreiter
 License: GPL
 Description: Opie Wellenreiter help files (english)
  
+Version: $QPE_VERSION$EXTRAVERSION