summaryrefslogtreecommitdiff
path: root/packages/opie-backup
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-07-04 17:42:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-04 17:42:49 +0000
commit3fbcf379bbd88204d7dd396415bbb65346feeaab (patch)
tree9a74ccf298a095cc74eb6bcc2cb878f98c5b548d /packages/opie-backup
parent7fd16b8fe80ee1707595b3a6026e9026a0717502 (diff)
parent86d9211f52171f3367ce974b997e16864e20118d (diff)
merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
and f69ed55f40216d16d8f1cb7559d13b46385991b2
Diffstat (limited to 'packages/opie-backup')
-rw-r--r--packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty0
-rw-r--r--packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch16
-rw-r--r--packages/opie-backup/opie-backup_1.2.2.bb (renamed from packages/opie-backup/opie-backup_1.2.1.bb)4
3 files changed, 1 insertions, 19 deletions
diff --git a/packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty b/packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch b/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch
deleted file mode 100644
index 3a8bd7280d..0000000000
--- a/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: backup/backuprestore.cpp
-===================================================================
-RCS file: /cvs/opie/noncore/settings/backup/backuprestore.cpp,v
-retrieving revision 1.42
-retrieving revision 1.43
-diff -u -u -r1.42 -r1.43
---- backup/backuprestore.cpp 9 Jun 2005 21:04:56 -0000 1.42
-+++ backup/backuprestore.cpp 16 Oct 2005 19:00:43 -0000 1.43
-@@ -102,6 +102,7 @@
- scanForApplicationSettings();
- refreshLocations();
- refreshBackupLocations();
-+ sourceDirChanged(restoreSource->currentItem());
-
- // Read the list of items to ignore.
- QList<QString> dontBackupList;
diff --git a/packages/opie-backup/opie-backup_1.2.1.bb b/packages/opie-backup/opie-backup_1.2.2.bb
index 8f276e0c3c..597fc577b8 100644
--- a/packages/opie-backup/opie-backup_1.2.1.bb
+++ b/packages/opie-backup/opie-backup_1.2.2.bb
@@ -1,8 +1,6 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- file://1492-bugfix.patch;patch=1"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"