Patchwork [CONSOLIDATED,PULL,14/16] screenshot: rename to sato-screenshot

login
register
mail settings
Submitter Saul Wold
Date Nov. 15, 2011, 8:58 p.m.
Message ID <537b45f13e2f583068fce11a6474ffad90246389.1321389699.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/15013/
State New
Headers show

Comments

Saul Wold - Nov. 15, 2011, 8:58 p.m.
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

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.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../files/fix_ldadd_order.patch                    |    0
 .../sato-screenshot_git.bb}                        |    2 +-
 meta/recipes-sato/tasks/task-core-x11.bb           |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/{screenshot => sato-screenshot}/files/fix_ldadd_order.patch (100%)
 rename meta/recipes-sato/{screenshot/screenshot_git.bb => sato-screenshot/sato-screenshot_git.bb} (92%)

Patch

diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
similarity index 100%
rename from meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
rename to 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
similarity index 92%
rename from meta/recipes-sato/screenshot/screenshot_git.bb
rename to 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"
 PV = "0.1+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
            file://fix_ldadd_order.patch"
 
 S = "${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 = "\
     leafpad \
     ${FILEMANAGER} \
     matchbox-terminal \
-    screenshot"
+    sato-screenshot"
 
 
 RDEPENDS_task-core-apps-x11-games = "\