diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-08-03 19:12:42 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-08-03 19:12:42 +0000 |
| commit | a667b8e4751d7b03aaa8e35128fcd29a0d24bf1b (patch) | |
| tree | 3eba90d488dfa5d8a6b28a4d49408907a5096916 /packages | |
| parent | 7ff90ab0833a22335700d1663d9aa5cdb16895dd (diff) | |
| parent | 3ffb50db8a79b78e4635570dca5c2ef8d815e653 (diff) | |
merge of '10bc51a56352cd32ff5b7b70a1690ba41c538716'
and 'a0e7e86db7c5ef00350a27bbe1959df6c1375b2a'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/git/git-native_1.5.2.3.bb (renamed from packages/git/git-native_1.4.4.2.bb) | 0 | ||||
| -rw-r--r-- | packages/git/git_1.5.2.3.bb (renamed from packages/git/git_1.4.4.2.bb) | 0 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-today2_svn.bb | 2 | ||||
| -rw-r--r-- | packages/psplash/files/openmoko/.mtn2git_empty (renamed from packages/psplash/files/fic-gta01/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/psplash/files/openmoko/psplash-bar-img.h (renamed from packages/psplash/files/fic-gta01/psplash-bar-img.h) | 0 | ||||
| -rw-r--r-- | packages/psplash/files/openmoko/psplash-hand-img.h (renamed from packages/psplash/files/fic-gta01/psplash-hand-img.h) | 0 | ||||
| -rw-r--r-- | packages/psplash/psplash_svn.bb | 2 |
7 files changed, 2 insertions, 2 deletions
diff --git a/packages/git/git-native_1.4.4.2.bb b/packages/git/git-native_1.5.2.3.bb index f91fd03ab1..f91fd03ab1 100644 --- a/packages/git/git-native_1.4.4.2.bb +++ b/packages/git/git-native_1.5.2.3.bb diff --git a/packages/git/git_1.4.4.2.bb b/packages/git/git_1.5.2.3.bb index e6a1117316..e6a1117316 100644 --- a/packages/git/git_1.4.4.2.bb +++ b/packages/git/git_1.5.2.3.bb diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index c998504af1..a129d15aee 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm" +DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" PV = "0.1.0+svn${SVNREV}" inherit openmoko2 gtk-icon-cache diff --git a/packages/psplash/files/fic-gta01/.mtn2git_empty b/packages/psplash/files/openmoko/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/psplash/files/fic-gta01/.mtn2git_empty +++ b/packages/psplash/files/openmoko/.mtn2git_empty diff --git a/packages/psplash/files/fic-gta01/psplash-bar-img.h b/packages/psplash/files/openmoko/psplash-bar-img.h index ab47c99ef2..ab47c99ef2 100644 --- a/packages/psplash/files/fic-gta01/psplash-bar-img.h +++ b/packages/psplash/files/openmoko/psplash-bar-img.h diff --git a/packages/psplash/files/fic-gta01/psplash-hand-img.h b/packages/psplash/files/openmoko/psplash-hand-img.h index 96dc16c723..96dc16c723 100644 --- a/packages/psplash/files/fic-gta01/psplash-hand-img.h +++ b/packages/psplash/files/openmoko/psplash-hand-img.h diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb index fe62f64e2c..fb7627f631 100644 --- a/packages/psplash/psplash_svn.bb +++ b/packages/psplash/psplash_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Userspace framebuffer boot logo based on usplash." SECTION = "base" LICENSE = "GPL" PV = "0.0+svn${SRCDATE}" -PR = "r5" +PR = "r6" # You can create your own pslash-hand-img.h by doing # ./make-image-header.sh <file>.png HAND |