From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 2 Jul 2006 20:39:32 +0000 (+0000)
Subject: opie-pcmciaapplet 1.2.2 remove activate-as-default; patch has been applied upstream
X-Git-Tag: Release-2010-05/1~9453^2~1374
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4263f08d566c572c252e994f650bc2a554342127;p=openembedded.git

opie-pcmciaapplet 1.2.2 remove activate-as-default; patch has been applied upstream
---

diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
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
deleted file mode 100644
index 4ec24ebaf8..0000000000
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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.2.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb
index 565cec4272..ff6f2a337a 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb
@@ -2,5 +2,4 @@ include ${PN}.inc
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \
-	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-	   file://activate-as-default.patch;patch=1"
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"