merge of 883763a8bbaafe2d1fcab405b8e623657615d7ef

     and b4a513218154eb17b59ed896ac7e0037ab11fc14

19 files changed, 446 insertions, 386 deletions

diff --git a/packages/meta/gpe-image-blank-user.bb b/packages/meta/gpe-image-blank-user.bb
index 1400bde3f1..c8e24ae035 100644
--- a/packages/meta/gpe-image-blank-user.bb
+++ b/packages/meta/gpe-image-blank-user.bb
@@ -1,25 +1,9 @@
-include gpe-collections.bb
+include gpe-image.bb
 
 MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com"
 
-PR = "r4"
+PR = "r5"
 
 export IMAGE_BASENAME = "gpe-image-blank-user"
 
-DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
-	   ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \
-	   ${GPE_EXTRA_DEPENDS}"
-
-export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
-           	       ${GPE_PIM} ${GPE_BASE_SETTINGS} \
-	               ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_BASE_RDEPENDS} \
-		       ${GPE_EXTRA_INSTALL}"
-
-
 ROOTFS_POSTPROCESS_COMMAND += "adduser -D user"
-
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 572eef2230..a53c4d4dc0 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -8,44 +8,31 @@ PR = "r19"
 
 export IMAGE_BASENAME = "gpe-image"
 
-GUI_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-
 GPE_EXTRA_THEMES = "gpe-theme-industrial"
 
-GPE_EXTRA_DEPENDS_bigscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_none = ""
 GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-
-GPE_EXTRA_DEPENDS_smallscreen = "${GPE_EXTRA_THEMES}"
 GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
 
-#ship more stuff with devices with >16MB of flash
-GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
-        gpe-theme-clearlooks \
-        figment \
-",d)}'
-
+GUI_MACHINE_CLASS ?= "none"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
+#ship more stuff with devices with >16MB of flash
 GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
-		gpe-task-connectivity \
-		${GPE_BIGFLASH_DEPENDS} \
+    gpe-task-connectivity \
+    gpe-theme-clearlooks \
+    figment \		
 ",d)}'
 
-GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS}
 GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
 
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
-
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap \
-           meta-gpe \
-           ${GPE_EXTRA_DEPENDS}"
+DEPENDS = "task-bootstrap task-gpe"
+RDEPENDS = "${IPKG_INSTALL}"
 
-RDEPENDS = "\
+export IPKG_INSTALL = "\
+    task-bootstrap \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
@@ -53,12 +40,6 @@ RDEPENDS = "\
     ${XSERVER} \
     ${GPE_EXTRA_INSTALL}"
 
-export IPKG_INSTALL = "task-bootstrap gpe-task-base \
-           	       gpe-task-pim gpe-task-settings \
-	               gpe-task-apps ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_EXTRA_INSTALL}"
-
 #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 1e8c219929..cd9b132b7c 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -1,27 +1,17 @@
-PACKAGES = gpe-task-apps-extra gpe-task-games gpe-task-web gpe-task-desktopapps
 DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR="r1"
+LICENSE = MIT
+PR="r2"
 
 ALLOW_EMPTY = 1
+BUILD_ALL_DEPS = "1"
 
-RDEPENDS_gpe-task-apps-extra := "\
-    gpe-filemanager \
-    gpe-nmf \
-    gpe-soundbite \
-    mbmerlin"
+DEPENDS = "task-gpe"
 
-RDEPENDS_gpe-task-web := "\
-    gpe-irc \
-    minimo \
-    gaim"
+RDEPENDS = "\
+    gpe-task-apps-extra \
+    gpe-task-games \
+    gpe-task-web \
+    gpe-task-desktopapps"
 
-RDEPENDS_gpe-task-desktopapps := "\
-    firefox \
-    thunderbird \
-    galculator \
-    gnumeric \
-    gpdf \
-    totem"
 
-LICENSE = MIT
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 347608aaa1..d12621ad65 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,98 +1,18 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r41"
+LICENSE = "MIT"
+PR = "r42"
 
 ALLOW_EMPTY = "1"
-
-RDEPENDS_gpe-base-depends := "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_gpe-task-base := "\
-    gpe-bootsplash \
-    bluez-utils-dbus \
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gtk2-theme-angelistic \
-    matchbox-themes-gtk \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    ttf-bitstream-vera \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    libgtkstylus \
-    detect-stylus \
-    suspend-desktop \
-    teleport \
-    xauth \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc"
-
-RDEPENDS_gpe-task-pim := "\
-    gpe-timesheet \
-    gpe-todo \
-    gpe-calendar \
-    gpe-sketchbook \
-    gpe-contacts \
-    gpe-today \
-    gpesyncd"
-
-RDEPENDS_gpe-task-settings := "\
-    matchbox-panel-manager \
-    gpe-bluetooth \
-    gpe-beam \
-    gpe-su \
-    gpe-conf \
-    gpe-clock \
-    gpe-mininet \
-    gpe-mixer \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    minimix \
-    xmonobut"
-
-RDEPENDS_gpe-task-apps := "\
-    gpe-edit \
-    gpe-gallery \
-    gpe-calculator \
-    gpe-clock \
-    gpe-plucker \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    gpe-aerial \
-    gpe-soundbite \
-    rosetta"
-
-RDEPENDS_gpe-task-games := "\
-    gpe-go \
-    gpe-lights \
-    gpe-othello \
-    gpe-tetris \
-    gsoko \
-    xdemineur"
-
-RDEPENDS_gpe-task-connectivity := "\
-    gpe-mini-browser"
-#    gaim
-#    linphone-hh
-
-# FIXME - Some dependencies are broken somewhere for this to be needed
-DEPENDS += "matchbox-themes-extra"
-
-LICENSE = "MIT"
+BUILD_ALL_DEPS = "1"
+
+DEPENDS = "task-gpe"
+
+RDEPENDS = "\
+    gpe-base-depends \
+    gpe-task-base \
+    gpe-task-settings \
+    gpe-task-pim \
+    gpe-task-apps \
+    gpe-task-games \
+    gpe-task-connectivity"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 01bd572730..b0f32412d8 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -1,82 +1,17 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim sectest-task-apps gpe-task-games 
 DESCRIPTION = "Meta-package for GPE Security Testing Image"
 MAINTAINER = "Bob Davies tyggerbob@rogers.com>"
-PR = "r5"
+LICENSE = "MIT"
+PR = "r6"
 
 ALLOW_EMPTY = "1"
+BUILD_ALL_DEPS = "1"
 
-RDEPENDS_gpe-base-depends := "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_gpe-task-base := "\
-    bluez-utils-dbus \
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gtk2-theme-angelistic \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    ttf-bitstream-vera \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    libgtkstylus \
-    detect-stylus \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc"
-
-RDEPENDS_gpe-task-pim := "\
-    figment"
-
-RDEPENDS_gpe-task-settings := "\
-    matchbox-panel-manager \
-    gpe-bluetooth \
-    gpe-beam \
-    gpe-su \
-    gpe-conf \
-    gpe-clock \
-    gpe-mininet \
-    gpe-mixer \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    xmonobut"
+DEPENDS = "task-gpe"
 
-RDEPENDS_sectest-task-apps := "\
-    gpe-edit \
-    gpe-calculator \
-    gpe-clock \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    gpe-aerial \
-    mbmerlin \
-    nmap \
-    ettercap \
-    stunnel \
-    curl \
-    dsniff \
-    prismstumbler \
-    tcpdump \
-    kismet \
-    hydra \
-    thcrut \
-    driftnet \
-    miniclipboard"
-
-# FIXME - we shouldn't need this. which packages don't set their dependencies correctly?
-DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
-
-LICENSE = "MIT"
+RDEPENDS = "\
+    gpe-task-base \
+    gpe-base-depends \
+    gpe-task-base \
+    gpe-task-settings \
+    gpe-task-pim \
+    gpe-task-sectest"
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index 0d1dbfbcbb..39109245f1 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -1,45 +1,43 @@
 MAINTAINER = "Bob Davies  <tyggerbob@rogers.com>"
+LICENSE = MIT
+PR = "r5"
+
 FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
 
-PR = "r5"
-
 export IMAGE_BASENAME = "sectest-gpe-image"
 
-GUI_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-
-GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-extra-industrial"
-
-#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
-#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_bigscreen = "minimo"
-GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_THEMES = "\
+    gtk-theme-industrial \
+    gtk-industrial-engine \
+    matchbox-themes-extra-industrial"
 
-GPE_EXTRA_DEPENDS_smallscreen = ""
+GPE_EXTRA_INSTALL_none = ""
 GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
 
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
+GUI_MACHINE_CLASS ?= "none"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap \
-	   meta-sectest-gpe \
-	   ${GPE_EXTRA_DEPENDS}"
+DEPENDS = "task-bootstrap task-gpe"
+RDEPENDS = "${IPKG_INSTALL}"
 
-export IPKG_INSTALL = "task-bootstrap gpe-task-base \
-           	       gpe-task-pim gpe-task-settings \
-	               sectest-task-apps ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_EXTRA_INSTALL}"
+export IPKG_INSTALL = "\
+    task-bootstrap \
+    gpe-task-base \
+    gpe-task-pim \
+    gpe-task-settings \
+    gpe-task-sectest \
+    ${XSERVER} \
+    ${GPE_EXTRA_INSTALL}"
 
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
-LICENSE = MIT
+
diff --git a/packages/meta/task-gpe.bb b/packages/meta/task-gpe.bb
new file mode 100644
index 0000000000..49a456161c
--- /dev/null
+++ b/packages/meta/task-gpe.bb
@@ -0,0 +1,139 @@
+DESCRIPTION = "Task packages for GPE Palmtop Environment"
+PR = "r0"
+LICENSE = MIT
+ALLOW_EMPTY = "1"
+
+PACKAGES = "\
+    gpe-base-depends \
+    gpe-task-base \
+    gpe-task-settings \
+    gpe-task-pim \
+    gpe-task-apps \
+    gpe-task-games \ 
+    gpe-task-connectivity \
+    gpe-task-apps-extra \
+    gpe-task-games \
+    gpe-task-web \
+    gpe-task-desktopapps \
+    gpe-task-sectest"
+
+RDEPENDS_gpe-base-depends := "\
+    diet-x11 \
+    virtual/xserver"
+
+RDEPENDS_gpe-task-base := "\
+    gpe-bootsplash \
+    bluez-utils-dbus \
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gtk2-theme-angelistic \
+    matchbox-themes-gtk \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    ttf-bitstream-vera \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    libgtkstylus \
+    detect-stylus \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+RDEPENDS_gpe-task-pim := "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-sketchbook \
+    gpe-contacts \
+    gpe-today \
+    gpesyncd"
+
+RDEPENDS_gpe-task-settings := "\
+    matchbox-panel-manager \
+    gpe-bluetooth \
+    gpe-beam \
+    gpe-su \
+    gpe-conf \
+    gpe-clock \
+    gpe-mininet \
+    gpe-mixer \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    minimix \
+    xmonobut"
+
+RDEPENDS_gpe-task-apps := "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-clock \
+    gpe-plucker \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    gpe-aerial \
+    gpe-soundbite \
+    rosetta"
+
+RDEPENDS_gpe-task-games := "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris \
+    gsoko \
+    xdemineur"
+
+RDEPENDS_gpe-task-connectivity := "\
+    gpe-mini-browser"
+#    gaim
+#    linphone-hh
+
+RDEPENDS_gpe-task-apps-extra := "\
+    gpe-filemanager \
+    gpe-nmf \
+    gpe-soundbite \
+    mbmerlin"
+
+RDEPENDS_gpe-task-web := "\
+    gpe-irc \
+    minimo \
+    gaim"
+
+RDEPENDS_gpe-task-desktopapps := "\
+    firefox \
+    thunderbird \
+    galculator \
+    gnumeric \
+    gpdf \
+    totem"
+
+RDEPENDS_gpe-task-sectest := "\
+    mbmerlin \
+    nmap \
+    ettercap \
+    stunnel \
+    curl \
+    dsniff \
+    prismstumbler \
+    tcpdump \
+    kismet \
+    hydra \
+    thcrut \
+    driftnet \
+    miniclipboard"
diff --git a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff
new file mode 100644
index 0000000000..e871e8e1e4
--- /dev/null
+++ b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff
@@ -0,0 +1,25 @@
+Index: terminalwidget.cpp
+===================================================================
+RCS file: /cvs/opie/noncore/apps/opie-console/terminalwidget.cpp,v
+retrieving revision 1.12
+diff -u -u -r1.12 terminalwidget.cpp
+--- opie-console/terminalwidget.cpp	16 Oct 2004 21:06:28 -0000	1.12
++++ opie-console/terminalwidget.cpp	17 Jan 2006 10:00:13 -0000
+@@ -1,4 +1,5 @@
+ #include "terminalwidget.h"
++#include <qpe/config.h>
+ 
+ /* QT */
+ #include <qlabel.h>
+@@ -151,8 +152,10 @@
+         break;
+     };
+ 
++    Config qpecfg("qpe");
++    qpecfg.setGroup("Appearance");
+ 
+-    m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize"  ), prof.readEntry( "FontCharset") );
++    m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") );
+ 
+ //     switch( fontsize ) {
+ //     case Profile::Micro:
diff --git a/packages/opie-console/opie-console_1.2.1.bb b/packages/opie-console/opie-console_1.2.1.bb
index b9ba9e0e43..061c489c7e 100644
--- a/packages/opie-console/opie-console_1.2.1.bb
+++ b/packages/opie-console/opie-console_1.2.1.bb
@@ -1,9 +1,10 @@
 include ${PN}.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
 	   file://1686-bugfix.patch;patch=1 \
-	   file://1647-bugfix.patch;patch=1"
+	   file://1647-bugfix.patch;patch=1 \
+	   file://0117_opie-console-use-default-fixed.diff;patch=1"
diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch b/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch
deleted file mode 100644
index bd69318a5c..0000000000
--- a/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qpealarmclock_V1.0.4/AlarmDetails.h~fix-compile
-+++ qpealarmclock_V1.0.4/AlarmDetails.h
-@@ -64,25 +64,8 @@
-        WEEKDAYS_IGNORE    = 0xFF    // do not change any days
-     };
-        
--    static const Weekdays flags[] =
--    {
--      WEEKDAYS_MONDAY,
--      WEEKDAYS_TUESDAY,
--      WEEKDAYS_WEDNSDAY,
--      WEEKDAYS_THURSDAY,
--      WEEKDAYS_FRIDAY,
--      WEEKDAYS_SATURDAY,
--      WEEKDAYS_SUNDAY
--    };
--
--    static const AlarmDetails::Weekdays weekdaysGroups[] =
--    {
--      AlarmDetails::WEEKDAYS_NONE,
--      AlarmDetails::WEEKDAYS_ALL,
--      AlarmDetails::WEEKDAYS_WORKDAYS,
--      AlarmDetails::WEEKDAYS_WEEKEND,
--      AlarmDetails::WEEKDAYS_IGNORE
--    };
-+    static const Weekdays flags[];
-+    static const AlarmDetails::Weekdays weekdaysGroups[];
-   
-     AlarmDetails(int alarmNumberInit);
-     ~AlarmDetails();
---- qpealarmclock_V1.0.4/AlarmDetails.cpp~fix-compile
-+++ qpealarmclock_V1.0.4/AlarmDetails.cpp
-@@ -3,22 +3,39 @@
-  *
-  * Copyright (C) 2002 Dafydd Walters <dwalters@users.sourceforge.net>
-  * Modified by Anton Maslovsky <my-zaurus@narod.ru> 2003/01/28
-- * 
-+ *
-  * This program may be modified or redistributed under the terms of the GNU
-- * General Public License (GPL), version 2 or later. A copy of the GNU GPL 
-- * should have accompanied the source code of this program. If not, please 
-+ * General Public License (GPL), version 2 or later. A copy of the GNU GPL
-+ * should have accompanied the source code of this program. If not, please
-  * write to the Free Software Foundation Inc., 59 Temple Place - Suite 330,
-  * Boston, MA 02111-1307, USA.
-  *
-  * This program is distributed without any warranty.
-- */ 
-+ */
- 
- #include "AlarmDetails.h"
- #include <qpe/config.h>
- #include <qpe/alarmserver.h>
- 
--const AlarmDetails::Weekdays AlarmDetails::flags[];
--const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[];
-+const AlarmDetails::Weekdays AlarmDetails::flags[] =
-+{
-+    WEEKDAYS_MONDAY,
-+    WEEKDAYS_TUESDAY,
-+    WEEKDAYS_WEDNSDAY,
-+    WEEKDAYS_THURSDAY,
-+    WEEKDAYS_FRIDAY,
-+    WEEKDAYS_SATURDAY,
-+    WEEKDAYS_SUNDAY
-+};
-+
-+const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] =
-+{
-+    AlarmDetails::WEEKDAYS_NONE,
-+    AlarmDetails::WEEKDAYS_ALL,
-+    AlarmDetails::WEEKDAYS_WORKDAYS,
-+    AlarmDetails::WEEKDAYS_WEEKEND,
-+    AlarmDetails::WEEKDAYS_IGNORE
-+};
- 
- AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit)
- {
diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch b/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch
deleted file mode 100644
index 82e8c350ab..0000000000
--- a/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Nur in qpealarmclock_V1.0.4: AlarmDetails.h~.
-diff -ur qpealarmclock_V1.0.4.orig/qpealarmclock.desktop qpealarmclock_V1.0.4/qpealarmclock.desktop
---- qpealarmclock_V1.0.4.orig/qpealarmclock.desktop	2004-06-17 00:35:48.000000000 +0200
-+++ qpealarmclock_V1.0.4/qpealarmclock.desktop	2004-06-17 00:36:13.000000000 +0200
-@@ -3,7 +3,7 @@
- Comment[de]=Ein Wecker
- Comment[ru]=Будильник
- Exec=qpealarmclock
--Icon=QpeAlarmClock
-+Icon=qpealarmclock/QpeAlarmClock
- Name=Alarm Clock
- Name[de]=Wecker
- Type=Application
diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/.mtn2git_empty b/packages/qpealarmclock/qpealarmclock-1.0.9/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qpealarmclock/qpealarmclock-1.0.4/.mtn2git_empty
+++ b/packages/qpealarmclock/qpealarmclock-1.0.9/.mtn2git_empty
diff --git a/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch b/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch
new file mode 100644
index 0000000000..a39c91d796
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch
@@ -0,0 +1,67 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qpealarmclock/AlarmDetails.h~fix_compile
++++ qpealarmclock/AlarmDetails.h
+@@ -63,26 +63,9 @@
+ 
+        WEEKDAYS_IGNORE    = 0xFF    // do not change any days
+     };
+-       
+-    static const Weekdays flags[] =
+-    {
+-      WEEKDAYS_MONDAY,
+-      WEEKDAYS_TUESDAY,
+-      WEEKDAYS_WEDNSDAY,
+-      WEEKDAYS_THURSDAY,
+-      WEEKDAYS_FRIDAY,
+-      WEEKDAYS_SATURDAY,
+-      WEEKDAYS_SUNDAY
+-    };
+ 
+-    static const Weekdays weekdaysGroups[] =
+-    {
+-      WEEKDAYS_NONE,
+-      WEEKDAYS_ALL,
+-      WEEKDAYS_WORKDAYS,
+-      WEEKDAYS_WEEKEND,
+-      WEEKDAYS_IGNORE
+-    };
++    static const Weekdays flags[];
++    static const AlarmDetails::Weekdays weekdaysGroups[];
+   
+     AlarmDetails(int alarmNumberInit);
+     ~AlarmDetails();
+
+--- qpealarmclock/AlarmDetails.cpp~fix-compile-2
++++ qpealarmclock/AlarmDetails.cpp
+@@ -22,8 +22,25 @@
+ #include <qimage.h>
+ #include <qpixmap.h>
+ 
+-const AlarmDetails::Weekdays AlarmDetails::flags[];
+-const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[];
++const AlarmDetails::Weekdays AlarmDetails::flags[] =
++{
++    WEEKDAYS_MONDAY,
++    WEEKDAYS_TUESDAY,
++    WEEKDAYS_WEDNSDAY,
++    WEEKDAYS_THURSDAY,
++    WEEKDAYS_FRIDAY,
++    WEEKDAYS_SATURDAY,
++    WEEKDAYS_SUNDAY
++};
++
++const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] =
++{
++    AlarmDetails::WEEKDAYS_NONE,
++    AlarmDetails::WEEKDAYS_ALL,
++    AlarmDetails::WEEKDAYS_WORKDAYS,
++    AlarmDetails::WEEKDAYS_WEEKEND,
++    AlarmDetails::WEEKDAYS_IGNORE
++};
+ 
+ AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit)
+ {
diff --git a/packages/qpealarmclock/qpealarmclock_1.0.4.bb b/packages/qpealarmclock/qpealarmclock_1.0.4.bb
deleted file mode 100644
index 19b8532098..0000000000
--- a/packages/qpealarmclock/qpealarmclock_1.0.4.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Alarm Clock"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-AUTHOR = "Dafydd Walters"
-HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/applications-AlarmClock.html"
-
-SRC_URI = "http://handhelds.org/~zecke/oe_packages/qpealarmclock_V1.0.4.tar.gz \
-	   file://qpealarm.patch;patch=1 \
-	   file://fix-compile.patch;patch=1 "
-
-S = "${WORKDIR}/qpealarmclock_V${PV}"
-PR = "r1"
-
-APPNAME = "qpealarmclock"
-APPTYPE = "binary"
-APPDESKTOP = "${S}"
-
-do_install () {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
-}
-
-inherit opie
diff --git a/packages/qpealarmclock/qpealarmclock_1.0.9.bb b/packages/qpealarmclock/qpealarmclock_1.0.9.bb
new file mode 100644
index 0000000000..597c43fbb0
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclock_1.0.9.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Alarm Clock"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)"
+LICENSE = "GPL"
+AUTHOR = "Dafydd Walters & Anton Maslovsky"
+HOMEPAGE = "http://my-zaurus.narod.ru/"
+
+APPNAME = "qpealarmclock"
+APPTYPE = "binary"
+APPDESKTOP = "${S}/dist/opt/QtPalmtop/apps/Applications"
+
+SRC_URI = "http://my-zaurus.narod.ru/downloads/qpealarmclock-1.0.9.tar.gz \
+           file://fix-compile.patch;patch=1 "
+
+S = "${WORKDIR}/qpealarmclock"
+
+inherit palmtop
+
+do_install () {
+# create dirs
+  install -d ${D}${palmtopdir}/bin
+  install -d ${D}${palmtopdir}/apps/Applications
+  install -d ${D}${palmtopdir}/pics/qpealarmclock
+# move files
+  install -m 644 ${S}/dist/opt/QtPalmtop/apps/Applications/qpealarmclock.desktop ${D}${palmtopdir}/apps/Applications/qpealarmclock.desktop
+  install -m 755 ${S}/dist/opt/QtPalmtop/bin/qpealarmclock ${D}${palmtopdir}/bin/qpealarmclock
+  install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/frequency.png ${D}${palmtopdir}/pics/qpealarmclock/frequency.png
+  install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/led.png ${D}${palmtopdir}/pics/qpealarmclock/led.png
+  install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/QpeAlarmClock.png ${D}${palmtopdir}/pics/qpealarmclock/QpeAlarmClock.png
+  install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/smallalarm.png ${D}${palmtopdir}/pics/qpealarmclock/smallalarm.png
+  install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/sound.png ${D}${palmtopdir}/pics/qpealarmclock/sound.png
+}
diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty
diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch
new file mode 100644
index 0000000000..a39c91d796
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch
@@ -0,0 +1,67 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qpealarmclock/AlarmDetails.h~fix_compile
++++ qpealarmclock/AlarmDetails.h
+@@ -63,26 +63,9 @@
+ 
+        WEEKDAYS_IGNORE    = 0xFF    // do not change any days
+     };
+-       
+-    static const Weekdays flags[] =
+-    {
+-      WEEKDAYS_MONDAY,
+-      WEEKDAYS_TUESDAY,
+-      WEEKDAYS_WEDNSDAY,
+-      WEEKDAYS_THURSDAY,
+-      WEEKDAYS_FRIDAY,
+-      WEEKDAYS_SATURDAY,
+-      WEEKDAYS_SUNDAY
+-    };
+ 
+-    static const Weekdays weekdaysGroups[] =
+-    {
+-      WEEKDAYS_NONE,
+-      WEEKDAYS_ALL,
+-      WEEKDAYS_WORKDAYS,
+-      WEEKDAYS_WEEKEND,
+-      WEEKDAYS_IGNORE
+-    };
++    static const Weekdays flags[];
++    static const AlarmDetails::Weekdays weekdaysGroups[];
+   
+     AlarmDetails(int alarmNumberInit);
+     ~AlarmDetails();
+
+--- qpealarmclock/AlarmDetails.cpp~fix-compile-2
++++ qpealarmclock/AlarmDetails.cpp
+@@ -22,8 +22,25 @@
+ #include <qimage.h>
+ #include <qpixmap.h>
+ 
+-const AlarmDetails::Weekdays AlarmDetails::flags[];
+-const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[];
++const AlarmDetails::Weekdays AlarmDetails::flags[] =
++{
++    WEEKDAYS_MONDAY,
++    WEEKDAYS_TUESDAY,
++    WEEKDAYS_WEDNSDAY,
++    WEEKDAYS_THURSDAY,
++    WEEKDAYS_FRIDAY,
++    WEEKDAYS_SATURDAY,
++    WEEKDAYS_SUNDAY
++};
++
++const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] =
++{
++    AlarmDetails::WEEKDAYS_NONE,
++    AlarmDetails::WEEKDAYS_ALL,
++    AlarmDetails::WEEKDAYS_WORKDAYS,
++    AlarmDetails::WEEKDAYS_WEEKEND,
++    AlarmDetails::WEEKDAYS_IGNORE
++};
+ 
+ AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit)
+ {
diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz
new file mode 100644
index 0000000000..4779ce5945
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz
diff --git a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
new file mode 100644
index 0000000000..33dabde5e9
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Alarm Clock Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)"
+LICENSE = "GPL"
+AUTHOR = "Anton Maslovsky"
+HOMEPAGE = "http://my-zaurus.narod.ru/"
+RDEPENDS = "qpealarmclock"
+RCONFLICTS = "opie-clockapplet"
+RREPLACES = "opie-clockapplet"
+
+APPNAME = "qpealarmclockapplet"
+APPTYPE = "binary"
+
+SRC_URI = "http://my-zaurus.narod.ru/downloads/clockapplet.tar.gz \
+	   file://missing-files.tar.gz \
+	   file://fix-compile.patch;patch=1 "
+
+S = "${WORKDIR}/clockapplet"
+
+inherit palmtop
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+do_install () {
+# create dirs
+  install -d ${D}${palmtopdir}/plugins/applets
+# libs
+ oe_libinstall -so libclockapplet ${D}${palmtopdir}/plugins/applets
+}