From 253608582b3f7eab91b39c1d0b8c57a00da8e6d9 Mon Sep 17 00:00:00 2001
From: Rene Wagner <rw@handhelds.org>
Date: Thu, 27 Jul 2006 11:51:03 +0200
Subject: [PATCH] libopie2: remove remove duplicate code from h2200-keys.patch.

Signed-off-by: Rene Wagner <rw@handhelds.org>
---
 .../libopie/libopie2/h2200-keys.patch         | 29 +++++++++++--------
 .../packages/libopie/libopie2_1.2.1.bb        |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/org.handhelds.familiar/packages/libopie/libopie2/h2200-keys.patch b/org.handhelds.familiar/packages/libopie/libopie2/h2200-keys.patch
index 493ecef..2f718b3 100644
--- a/org.handhelds.familiar/packages/libopie/libopie2/h2200-keys.patch
+++ b/org.handhelds.familiar/packages/libopie/libopie2/h2200-keys.patch
@@ -1,21 +1,26 @@
 --- libopie2/opiecore/device/odevice_ipaq.cpp.orig	2006-07-26 20:26:54.000000000 +0200
-+++ libopie2/opiecore/device/odevice_ipaq.cpp	2006-07-26 22:33:11.000000000 +0200
-@@ -127,6 +127,28 @@
++++ libopie2/opiecore/device/odevice_ipaq.cpp	2006-07-27 11:47:04.000000000 +0200
+@@ -85,12 +85,12 @@
+ #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
+ 
+ struct i_button ipaq_buttons [] = {
+-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
++    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx,
+     Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
+     "devicebuttons/ipaq_calendar",
+     "datebook", "nextView()",
+     "today", "raise()" },
+-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
++    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx,
+     Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
+     "devicebuttons/ipaq_contact",
+     "addressbook", "raise()",
+@@ -127,6 +127,18 @@
      "QPE/VMemo", "toggleRecord()",
      "sound", "raise()" },
  
 +    //h2200 has different button mapping
 +    { Model_iPAQ_H22xx,
-+    Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
-+    "devicebuttons/ipaq_calendar",
-+    "datebook", "nextView()",
-+    "today", "raise()" },
-+    { Model_iPAQ_H22xx,
-+    Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
-+    "devicebuttons/ipaq_contact",
-+    "addressbook", "raise()",
-+    "addressbook", "beamBusinessCard()" },
-+    { Model_iPAQ_H22xx,
 +    Qt::Key_NumLock, QT_TRANSLATE_NOOP("Button", "Mail Button"),
 +    "devicebuttons/ipaq_mail",
 +    "opiemail", "raise()",
diff --git a/org.handhelds.familiar/packages/libopie/libopie2_1.2.1.bb b/org.handhelds.familiar/packages/libopie/libopie2_1.2.1.bb
index 97b4684..c5533ed 100644
--- a/org.handhelds.familiar/packages/libopie/libopie2_1.2.1.bb
+++ b/org.handhelds.familiar/packages/libopie/libopie2_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
 	   file://openzaurus-branding.patch;patch=1 \
-- 
2.41.1