[oe-commits] Denis 'GNUtoo' Carikli : fbreader 0.12.1: fix QA issues and bump PR

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: d895ad91df52dcc0f7525152025f5378a2c05f60
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d895ad91df52dcc0f7525152025f5378a2c05f60

Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Fri Mar 12 21:51:25 2010 +0100

fbreader 0.12.1: fix QA issues and bump PR

There were 2 QA issues:
  * GNU_HASH (fixed with LDFLAGS='${LDFLAGS}' in EXTRA_OEMAKE )
  * .debug included in the main package (fixed by
    FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/")
Both were fixed and PR was bumped.

Note that buildsys(fbreader-0.8.2a_buildsys_oe.patch is an example of them)
  patches were not ported because it built correctly without.
OE_CFLAGS='${CXXFLAGS}' was removed because without the buildsys patches,
  it doesn't have any effect.

---

 recipes/fbreader/fbreader_0.12.1.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes/fbreader/fbreader_0.12.1.bb b/recipes/fbreader/fbreader_0.12.1.bb
index 0fd1c7c..1be99e0 100644
--- a/recipes/fbreader/fbreader_0.12.1.bb
+++ b/recipes/fbreader/fbreader_0.12.1.bb
@@ -4,7 +4,7 @@ SECTION = "x11/utils"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
 file://Makefile.patch;patch=1"
@@ -16,9 +16,10 @@ READER_UI         ?= "gtk"
 READER_STATUS	  ?= "release"
 
 FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
+FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
 
 CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
-EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' LDFLAGS='${LDFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
 
 inherit pkgconfig