[oe-commits] Thomas Zimmermann : epdfview: prepare for OE.dev merge

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 978948636bb4f87f80ecc9ab73df42266cef5ea4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=978948636bb4f87f80ecc9ab73df42266cef5ea4

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Fri Sep 18 10:12:37 2009 +0000

epdfview: prepare for OE.dev merge

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/checksums.ini                           |    4 ++++
 conf/distro/include/shr-autorev-unstable.inc |    1 +
 recipes/epdfview/epdfview_0.1.7.bb           |   16 ++++++++++------
 recipes/epdfview/epdfview_svn.bb             |   16 ++++++++++------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 071f6af..61ef539 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4850,6 +4850,10 @@ sha256=d437b49f40f61e3ba5a3ed8edad783895dcbdfc3cd4cbe6ef37a56f7eea59573
 md5=cce9edb41b4a8308e0ef0eea24b5a1ab
 sha256=61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
 
+[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.7.tar.bz2]
+md5=1919bb19c16ef0a97d48b0a8303d3c7b
+sha256=0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
+
 [http://enlightenment.freedesktop.org/files/epeg-0.9.0.007.tar.gz]
 md5=383db51e46d13d986966459e4918d236
 sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b
diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
index 69d408b..d6568fd 100644
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -137,3 +137,4 @@ SRCREV_pn-elmdentica = "${AUTOREV}"
 SRCREV_pn-vala-terminal = "${AUTOREV}"
 SRCREV_pn-pisi = "${AUTOREV}"
 SRCREV_pn-webkit-efl = "${AUTOREV}"
+SRCREV_pn-epdfview = "${AUTOREV}"
diff --git a/recipes/epdfview/epdfview_0.1.7.bb b/recipes/epdfview/epdfview_0.1.7.bb
index 37d3cdd..fd1b61f 100644
--- a/recipes/epdfview/epdfview_0.1.7.bb
+++ b/recipes/epdfview/epdfview_0.1.7.bb
@@ -3,22 +3,26 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+ cups"
-PR = "r8"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
-	   file://acroread.png\
-	  "
+          "
 
-inherit autotools
+SRC_URI_append_shr = "file://acroread.png \
+                     "
 
+inherit autotools
 
 do_compile_append () {
+	sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop
+}
+
+do_compile_append_shr () {
 	sed -i 's/Icon=.*/Icon=acroread/' data/epdfview.desktop
 }
 
-do_install_append () {
+do_install_append_shr () {
 	install -d ${D}${datadir}/pixmaps/
 	install -m 0644 ${WORKDIR}/acroread.png ${D}${datadir}/pixmaps/
 }
 
-FILES_${PN} += "${datadir}/pixmaps/acroread.png"
\ No newline at end of file
+FILES_${PN}_append_shr = "${datadir}/pixmaps/acroread.png"
\ No newline at end of file
diff --git a/recipes/epdfview/epdfview_svn.bb b/recipes/epdfview/epdfview_svn.bb
index 7811289..806fcb5 100644
--- a/recipes/epdfview/epdfview_svn.bb
+++ b/recipes/epdfview/epdfview_svn.bb
@@ -4,14 +4,13 @@ LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+ cups"
 
-SRCREV = "${AUTOREV}"
-
 PV = "0.1.7+svnr${SRCREV}"
 PR = "r0"
 
-SRC_URI = "svn://svn.emma-soft.com/epdfview;module=trunk;proto=svn\
-	   file://acroread.png\
+SRC_URI = "svn://svn.emma-soft.com/epdfview;module=trunk;proto=svn \
 	  "
+SRC_URI_append_shr = "file://acroread.png \
+                     "
 
 S = "${WORKDIR}/trunk"
 
@@ -22,12 +21,17 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
+	sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop
+}
+
+do_compile_append_shr () {
 	sed -i 's/Icon=.*/Icon=acroread/' data/epdfview.desktop
 }
 
-do_install_append () {
+do_install_append_shr () {
 	install -d ${D}${datadir}/pixmaps/
 	install -m 0644 ${WORKDIR}/acroread.png ${D}${datadir}/pixmaps/
 }
 
-FILES_${PN} += "${datadir}/pixmaps/acroread.png"
+FILES_${PN}_append_shr = "${datadir}/pixmaps/acroread.png \
+                         "