clutter: Fix packaging of examples packages for 0.6 and 0.8 versions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/clutter/clutter-0.6_git.bb b/meta/packages/clutter/clutter-0.6_git.bb
index 14a20180a8b2b9888c7bfa39502908bd6708a0df..5a8ccec16409a166b1388965d8a2649a187db8ff 100644 (file)
--- a/meta/packages/clutter/clutter-0.6_git.bb
+++ b/meta/packages/clutter/clutter-0.6_git.bb
@@ -1,7 +1,11 @@
 require clutter.inc
 
 PV = "0.6.0+gitr${SRCPV}"
-PR = "r4"
+PR = "r5"
+
+PACKAGES =+ "clutter-examples-0.6"
+FILES_clutter-examples-0.6 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-6 \
            file://symconflict.patch;patch=1 \

diff --git a/meta/packages/clutter/clutter-0.8_git.bb b/meta/packages/clutter/clutter-0.8_git.bb
index ddfa2b68f7146dc9f89e685c522546e8c0bb20bf..42efd3b109b498c57dbbf0013f71b05adaf3b954 100644 (file)
--- a/meta/packages/clutter/clutter-0.8_git.bb
+++ b/meta/packages/clutter/clutter-0.8_git.bb
@@ -1,7 +1,10 @@
 require clutter.inc
 
 PV = "0.8.0+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
+
+PACKAGES =+ "clutter-examples-0.8"
+FILES_clutter-examples-0.8 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \
           file://enable_tests-0.8.patch;patch=1 "

diff --git a/meta/packages/clutter/clutter-package.inc b/meta/packages/clutter/clutter-package.inc
new file mode 100644 (file)
index 0000000..22993ff
--- /dev/null
+++ b/meta/packages/clutter/clutter-package.inc
@@ -0,0 +1,2 @@
+PACKAGES =+ "clutter-examples"
+FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"

diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index c9df1b01bbf4b0d3fd353d14ae472c1b7220e328..82f8e71d83a895dfcdcbb0a5b4be18aa8e4ada59 100644 (file)
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -47,9 +47,6 @@ FILESPATH = "${FILE_DIRNAME}/clutter"
 
 inherit autotools_stage pkgconfig gtk-doc
 
-PACKAGES =+ "clutter-examples"
-FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require clutter-fpu.inc
 

diff --git a/meta/packages/clutter/clutter_git.bb b/meta/packages/clutter/clutter_git.bb
index adf4f5621b74a5c273007e2a20d6bf69bd105618..a33468b30a7cb5d565040b6bac6e17c94b354629 100644 (file)
--- a/meta/packages/clutter/clutter_git.bb
+++ b/meta/packages/clutter/clutter_git.bb
@@ -1,7 +1,8 @@
 require clutter.inc
+require clutter-package.inc
 
 PV = "0.9.0+git${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \
            file://enable_tests.patch;patch=1 "