aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-01-10 19:27:20 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-01-10 19:27:20 +0000
commit4d347b6aa9d80531758a04533d4f891253260501 (patch)
treeb4f79bd94e3ac83fd7679bdf007000772e98d799
parent54558826574455d2b023af60b36236eaa5876f9e (diff)
downloadopenembedded-4d347b6aa9d80531758a04533d4f891253260501.tar.gz
opie-button-settings: dropped patch from 1.2.1+ cvs
-rw-r--r--packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty0
-rw-r--r--packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch25
-rw-r--r--packages/opie-button-settings/opie-button-settings_1.2.2.bb5
3 files changed, 1 insertions, 29 deletions
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
--- a/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty
+++ /dev/null
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_1.2.2.bb b/packages/opie-button-settings/opie-button-settings_1.2.2.bb
index 253ae28938..7b0c35f44b 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
@@ -1,8 +1,5 @@
include ${PN}.inc
-PR = "r2"
-
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 "