[oe-commits] Ross Burton : vala: upgrade to 0.26.1

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 3562603044e908aacece86985bc8e4d7338622ac
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3562603044e908aacece86985bc8e4d7338622ac

Author: Ross Burton <ross.burton at intel.com>
Date:   Mon Oct 27 23:21:53 2014 +0000

vala: upgrade to 0.26.1

vapigen can't be disabled anymore, so remove --disable-vapigen.

Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-devtools/vala/vala.inc       | 5 ++---
 meta/recipes-devtools/vala/vala_0.24.0.bb | 6 ------
 meta/recipes-devtools/vala/vala_0.26.1.bb | 6 ++++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index cac8728..63056fd 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -13,7 +13,6 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-vapigen"
-
+FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/"
 FILES_${PN}-doc += "${datadir}/devhelp"
-FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi"
+FILES_${PN}-dbg += "${libdir}/${BPN}-${SHRT_VER}/.debug"
diff --git a/meta/recipes-devtools/vala/vala_0.24.0.bb b/meta/recipes-devtools/vala/vala_0.24.0.bb
deleted file mode 100644
index 342a875..0000000
--- a/meta/recipes-devtools/vala/vala_0.24.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch"
-
-SRC_URI[md5sum] = "beddeff9c06d3c278988b237da0e7401"
-SRC_URI[sha256sum] = "22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c"
diff --git a/meta/recipes-devtools/vala/vala_0.26.1.bb b/meta/recipes-devtools/vala/vala_0.26.1.bb
new file mode 100644
index 0000000..3df9cd4
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.26.1.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch"
+
+SRC_URI[md5sum] = "723a03b822d4cc47abc4019685970a3e"
+SRC_URI[sha256sum] = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b"