summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-11-15 20:58:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 17:32:46 (GMT)
commit0f9c30468a4793589961e59cc07206060cacd832 (patch)
tree5140961b72d6177c36dde3234d78d847e2c3ae44 /meta
parent36747532e7492e2cfddc93c58ee9b804020e97d1 (diff)
downloadpoky-0f9c30468a4793589961e59cc07206060cacd832.tar.gz
screenshot: rename to sato-screenshot
To remove a name conflict with e17's screenshot tool (and possibly other screenshot tools, as screenshot is a generic term), rename screenshot to sato-screenshot. (From OE-Core rev: 5423d2fabade45974f20948a6d90a663eead209a) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch (renamed from meta/recipes-sato/screenshot/files/fix_ldadd_order.patch)0
-rw-r--r--meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb (renamed from meta/recipes-sato/screenshot/screenshot_git.bb)2
-rw-r--r--meta/recipes-sato/tasks/task-core-x11.bb2
3 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
index 7d9689e..7d9689e 100644
--- a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
+++ b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
diff --git a/meta/recipes-sato/screenshot/screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index 917a27d..5e51d3d 100644
--- a/meta/recipes-sato/screenshot/screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -12,7 +12,7 @@ SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
12PV = "0.1+git${SRCPV}" 12PV = "0.1+git${SRCPV}"
13PR = "r0" 13PR = "r0"
14 14
15SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 15SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
16 file://fix_ldadd_order.patch" 16 file://fix_ldadd_order.patch"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb
index 106bc0f..f1b06f9 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -61,7 +61,7 @@ RDEPENDS_task-core-apps-x11-core = "\
61 leafpad \ 61 leafpad \
62 ${FILEMANAGER} \ 62 ${FILEMANAGER} \
63 matchbox-terminal \ 63 matchbox-terminal \
64 screenshot" 64 sato-screenshot"
65 65
66 66
67RDEPENDS_task-core-apps-x11-games = "\ 67RDEPENDS_task-core-apps-x11-games = "\