From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 15 Nov 2005 21:43:55 +0000 (+0000)
Subject: opie-pcmciaapplet: backported fix from CVS - use 'activate' as default
X-Git-Tag: Release-2010-05/1~9453^2~3072
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=025ab40b088cb9d250d7bdf9c98dfc4732e86967;p=openembedded.git

opie-pcmciaapplet: backported fix from CVS - use 'activate' as default
- previous default was 'suspend' which was confusing
---

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
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"