From 2a879a41ae068dbd9c2d43b355ff65e492b7be77 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 2 Jul 2006 18:01:45 +0000
Subject: [PATCH] opie-button-settings 1.2.2 remove bugfix patch; has been
 applied upstream

---
 .../opie-button-settings-1.2.1/.mtn2git_empty |  0
 .../1624-bugfix.patch                         | 25 -------------------
 .../opie-button-settings.inc                  |  2 +-
 .../opie-button-settings_1.2.2.bb             |  3 +--
 4 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty
 delete mode 100644 packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch

diff --git a/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty b/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch b/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch
deleted file mode 100644
index 91a22bc976..0000000000
--- a/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: button/buttonsettings.cpp
-===================================================================
-RCS file: /cvs/opie/core/settings/button/buttonsettings.cpp,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -u -r1.13 -r1.14
---- button/buttonsettings.cpp	24 Apr 2005 20:24:00 -0000	1.13
-+++ button/buttonsettings.cpp	12 Oct 2005 21:08:35 -0000	1.14
-@@ -37,7 +37,7 @@
- #include <qlabel.h>
- #include <qtimer.h>
- #include <qscrollview.h>
--
-+#include <qcopchannel_qws.h>
- 
- using namespace Opie::Core;
- 
-@@ -157,6 +157,7 @@
- ButtonSettings::~ButtonSettings ( )
- {
-     QPEApplication::ungrabKeyboard ( );
-+    QCopChannel::send ("QPE/System", "deviceButtonMappingChanged()" );
- }
- 
- void ButtonSettings::updateLabels ( )
diff --git a/packages/opie-button-settings/opie-button-settings.inc b/packages/opie-button-settings/opie-button-settings.inc
index ec935e7112..733b7d9a5d 100644
--- a/packages/opie-button-settings/opie-button-settings.inc
+++ b/packages/opie-button-settings/opie-button-settings.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "Device-buttons settings dialog"
+DESCRIPTION = "Opie device buttons settings dialog"
 SECTION = "opie/settings"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
diff --git a/packages/opie-button-settings/opie-button-settings_1.2.2.bb b/packages/opie-button-settings/opie-button-settings_1.2.2.bb
index 63b924ee36..576eba1dba 100644
--- a/packages/opie-button-settings/opie-button-settings_1.2.2.bb
+++ b/packages/opie-button-settings/opie-button-settings_1.2.2.bb
@@ -3,5 +3,4 @@ include ${PN}.inc
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   file://1624-bugfix.patch;patch=1"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-- 
2.39.5