[oe-commits] Martin Jansa : Intone: Add missing jpg, remove glade, docs in /usr/share/ doc/

[git version control]

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

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Thu Sep 10 19:08:29 2009 +0000

Intone: Add missing jpg, remove glade, docs in /usr/share/doc/

---

 recipes/intone/intone_svn.bb |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb
index ba24ed0..c58a316 100644
--- a/recipes/intone/intone_svn.bb
+++ b/recipes/intone/intone_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "elementary eina sqlite3 edbus libvorbis id3lib"
 RDEPENDS = "mplayer lame libxv libsdl-x11"
 
 PV = "0.66+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://intone.googlecode.com/svn/trunk;module=.;proto=http \
 file://vorbis-include-id3tag.patch;pnum=1;patch=1;maxrev=18"
@@ -18,15 +18,19 @@ inherit autotools
 do_configure_prepend() {
 	rm -f "${S}/INSTALL"
 	touch "${S}/INSTALL"
+	sed -i 's/\/doc\/intone$/\/share\/doc\/intone/g' ${S}/Makefile.am
+	sed -i '/^EXTRA_DIST = $(glade_DATA)/d' ${S}/src/Makefile.am
+	sed -i '/^gladedir = $(datadir)\/intone\/glade/d' ${S}/src/Makefile.am
+	sed -i '/^glade_DATA = intone.glade/d' ${S}/src/Makefile.am
 }
 
 do_install_append() {
-	mkdir -p "${D}/${datadir}/icons"
-	install -m 0644 "${S}/resources/intone.png" "${D}/${datadir}/icons"
+	mkdir -p "${D}/${datadir}/pixmaps"
+	install -m 0644 "${S}/resources/intone.png" "${D}/${datadir}/pixmaps"
 	mkdir -p "${D}/${datadir}/applications"
 	install -m 0644 "${S}/resources/intone.desktop" "${D}/${datadir}/applications"
 	mkdir -p "${D}/${datadir}/intone"
-	for ico in "${S}/resources/"*.png ; do
+	for ico in "${S}/resources/"*.png "${S}/resources/"*.jpg; do
 		if [ "$(basename $ico)" != "intone.png" ]; then
 			install -m 0644 $ico "${D}/${datadir}/intone"
 		fi
@@ -34,5 +38,5 @@ do_install_append() {
 }
 
 
-FILES_${PN} += "/usr/share/intone/* /usr/share/applications/* /usr/share/icons/*"
+FILES_${PN} += "/usr/share/intone/* /usr/share/applications/* /usr/share/pixmaps/*"