summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-07-02 20:39:32 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-02 20:39:32 +0000
commit4263f08d566c572c252e994f650bc2a554342127 (patch)
tree561a561acdde987009f2a87a44b797ec7952a7f0 /packages
parent44243e69a77338097b295c1eccb58adcb8a91038 (diff)
opie-pcmciaapplet 1.2.2 remove activate-as-default; patch has been applied upstream
Diffstat (limited to 'packages')
-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.2.bb3
3 files changed, 1 insertions, 44 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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty
+++ /dev/null
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"