summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-11-15 21:43:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-15 21:43:55 +0000
commit025ab40b088cb9d250d7bdf9c98dfc4732e86967 (patch)
treefe7c926d0f65b2e3f08125122f5efb7ec886c305
parent4a43831db39a507216f33ddb46617bfe5d4f0d3e (diff)
opie-pcmciaapplet: backported fix from CVS - use 'activate' as default
- previous default was 'suspend' which was confusing
-rw-r--r--packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty0
-rw-r--r--packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch42
-rw-r--r--packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb5
3 files changed, 45 insertions, 2 deletions
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch
new file mode 100644
index 0000000000..4ec24ebaf8
--- /dev/null
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch
@@ -0,0 +1,42 @@
+Backported from CVS
+
+Index: noncore/applets/pcmcia/configdialogbase.ui
+===================================================================
+RCS file: /cvs/opie/noncore/applets/pcmcia/configdialogbase.ui,v
+retrieving revision 1.6
+diff -u -u -r1.6 configdialogbase.ui
+--- pcmcia/configdialogbase.ui 20 Jun 2005 12:46:33 -0000 1.6
++++ pcmcia/configdialogbase.ui 15 Nov 2005 21:37:22 -0000
+@@ -288,13 +288,13 @@
+ <item>
+ <property>
+ <name>text</name>
+- <string>suspend</string>
++ <string>activate</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+- <string>activate</string>
++ <string>suspend</string>
+ </property>
+ </item>
+ <item>
+@@ -319,13 +319,13 @@
+ <item>
+ <property>
+ <name>text</name>
+- <string>suspend</string>
++ <string>activate</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+- <string>activate</string>
++ <string>suspend</string>
+ </property>
+ </item>
+ <item>
+
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb
index 15a76efde0..570155a275 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb
@@ -1,6 +1,7 @@
include ${PN}.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ file://activate-as-default.patch;patch=1"