From 388e267bcfa7042684dde9a7f33d145a5b5a34b8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 27 Jul 2009 17:41:17 +0100
Subject: clutter: Fix packaging of examples packages for 0.6 and 0.8 versions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/clutter/clutter-0.6_git.bb  | 6 +++++-
 meta/packages/clutter/clutter-0.8_git.bb  | 5 ++++-
 meta/packages/clutter/clutter-package.inc | 2 ++
 meta/packages/clutter/clutter.inc         | 3 ---
 meta/packages/clutter/clutter_git.bb      | 3 ++-
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 meta/packages/clutter/clutter-package.inc

(limited to 'meta/packages/clutter')

diff --git a/meta/packages/clutter/clutter-0.6_git.bb b/meta/packages/clutter/clutter-0.6_git.bb
index 14a20180a8..5a8ccec164 100644
--- 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 ddfa2b68f7..42efd3b109 100644
--- 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
index 0000000000..22993ffd01
--- /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 c9df1b01bb..82f8e71d83 100644
--- 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 adf4f5621b..a33468b30a 100644
--- 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 "
-- 
cgit v1.2.3-54-g00ecf