Patchwork [PATCHv2,85/90] qwt: fix unpackaged files

login
mail settings
Submitter Martin Jansa
Date Dec. 11, 2012, 12:59 a.m.
Message ID <609e4e98967955cff5004b4afc3eaa84b423394d.1355187290.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40723/
State Accepted
Commit 609e4e98967955cff5004b4afc3eaa84b423394d
Headers show

Comments

Martin Jansa - Dec. 11, 2012, 12:59 a.m.
* fixes:
qwt-6.0.1: qwt: Files/directories were installed but not shipped
  /usr/features
  /usr/doc
  /usr/plugins
  /usr/features/qwtconfig.pri
  /usr/features/qwtmathml.prf
  /usr/features/qwt.prf
  /usr/plugins/designer
  /usr/plugins/designer/libqwt_designer_plugin.so
  /usr/plugins/designer/.debug
  /usr/plugins/designer/.debug/libqwt_designer_plugin.so

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 2 ++
 meta-oe/recipes-qt/qwt/qwt.inc        | 6 +++++-
 meta-oe/recipes-qt/qwt/qwt_6.0.1.bb   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

Patch

diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
index 7f0e43b..af9d956 100644
--- a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
@@ -2,6 +2,8 @@  inherit qt4e
 
 require qwt.inc
 
+PR = "r1"
+
 SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
 
diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-qt/qwt/qwt.inc
index 50f4e2a..d9d47f0 100644
--- a/meta-oe/recipes-qt/qwt/qwt.inc
+++ b/meta-oe/recipes-qt/qwt/qwt.inc
@@ -22,6 +22,7 @@  do_install() {
     oe_runmake -e install
     install -d ${D}${datadir}/doc/${PN}
     mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/
+    rmdir ${D}${prefix}/doc
     cd ${S}/examples
     install -d ${D}/${bindir}
     cd bin${QT_LIBINFIX}/
@@ -30,5 +31,8 @@  do_install() {
     done
 }
 
-PACKAGES_prepend = "${PN}-examples "
+PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
 FILES_${PN}-examples = "${bindir}/*"
+FILES_${PN}-features = "${prefix}/features"
+FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so"
+FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug"
diff --git a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
index e7eb7b7..f38816a 100644
--- a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
@@ -2,6 +2,8 @@  inherit qt4x11
 
 require qwt.inc
 
+PR = "r1"
+
 SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"