meta-moblin: Update to Moblin 2.1 released versions

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

21 files changed, 138 insertions, 113 deletions

diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
new file mode 100644
index 0000000000..c5bff816bd
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "mutter-moblin nbtk gtk+ glib-2.0 clutter-1.0 gnome-menus"
+
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-applications/0.1/moblin-panel-applications-0.1.2.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb
new file mode 100644
index 0000000000..b80506ee89
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb
@@ -0,0 +1 @@
+require moblin-panel-applications.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
index 27f82361e9..21a42fb228 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
@@ -1,15 +1,5 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mutter-moblin nbtk gtk+ glib-2.0 clutter-1.0 gnome-menus"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-applications.inc
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
+PV = "0.1.2+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
new file mode 100644
index 0000000000..13b2854a2a
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "mutter-moblin bickley bognor-regis gtk+"
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-media/0.0/moblin-panel-media-0.0.7.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb
new file mode 100644
index 0000000000..2d76297d8c
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb
@@ -0,0 +1 @@
+require moblin-panel-media.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
index 3ebdde28c0..de1351bfdb 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
@@ -1,15 +1,6 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mutter-moblin bickley bognor-regis gtk+"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-media.inc
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
+PV = "0.0.7+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
new file mode 100644
index 0000000000..0c17e844ce
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin gtk+ mojito gconf libjana"
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-myzone/0.0/moblin-panel-myzone-0.0.12.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb
new file mode 100644
index 0000000000..a335f1984f
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb
@@ -0,0 +1 @@
+require moblin-panel-myzone.inc
\ No newline at end of file
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
index 4ade4967c8..31904c8753 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
@@ -1,15 +1,7 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin gtk+ mojito gconf libjana"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-myzone.inc
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
+PV = "0.0.12+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
 
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
new file mode 100644
index 0000000000..4eb8d99e6a
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin gtk+ clutter-1.0"
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-pasteboard/0.0/moblin-panel-pasteboard-0.0.2.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb
new file mode 100644
index 0000000000..a992971092
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb
@@ -0,0 +1 @@
+require moblin-panel-pasteboard.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
index a550c7039f..27394b4ea3 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
@@ -1,15 +1,5 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin gtk+ clutter-1.0"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-pasteboard.inc
 
+PV = "0.0.2+git${SRCPV}"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
new file mode 100644
index 0000000000..2deb94ea54
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin anerley gtk+ glib-2.0"
+
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-people/0.0/moblin-panel-people-0.0.9.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb
new file mode 100644
index 0000000000..df52a0de4e
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb
@@ -0,0 +1 @@
+require moblin-panel-people.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
index 8a8f54ff17..1361068d34 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
@@ -1,15 +1,5 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin anerley gtk+ glib-2.0"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-people.inc
 
+PV = "0.0.9+git${SRCPV}"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
new file mode 100644
index 0000000000..0959f5ce51
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin dbus-glib clutter-1.0 telepathy-mission-control mojito"
+
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-status/0.0/moblin-panel-status-0.0.9.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb
new file mode 100644
index 0000000000..99d0b4114c
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb
@@ -0,0 +1 @@
+require moblin-panel-status.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
index 1391858468..19fec102b8 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
@@ -1,15 +1,6 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin dbus-glib clutter-1.0 telepathy-mission-control mojito"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-status.inc
 
+PV = "0.0.9+git${SRCPV}"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
new file mode 100644
index 0000000000..a956e4bfc7
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
@@ -0,0 +1,50 @@
+DESCRIPTION = "A Moblin specific plugin for the Mutter composite window manager"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "clutter-1.0 nbtk mutter gnome-menus mojito libjana anerley clutter-mozembed bickley bognor-regis"
+
+SRC_URI = "http://download.moblin.org/sources/mutter-moblin/0.43/mutter-moblin-0.43.8.tar.bz2 \
+           file://startup-notify.patch;patch=1 \
+           file://88mutter-panelapps.sh \
+           file://background-tile.png"
+
+FILES_${PN} += "\
+	${sysconfdir}/X11 \
+	${libdir}/metacity/plugins/clutter/*.so* \
+	${libdir}/mutter/plugins/*.so* \
+	${datadir}/mutter-moblin-netbook-plugin \
+	${datadir}/dbus-1/services \
+	${datadir}/moblin-panel-applications/theme \
+	${datadir}/moblin-panel-pasteboard/theme"
+FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*"
+FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
+
+ASNEEDED = ""
+
+EXTRA_OECONF = "--enable-ahoghill --enable-netpanel --enable-people"
+
+inherit autotools_stage
+
+do_configure_prepend () {
+	rm -f ${S}/build/autotools/gtk-doc.m4
+	cp ${WORKDIR}/background-tile.png ${S}/data/theme/panel/
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/X11/Xsession.d/
+	install ${WORKDIR}/88mutter-panelapps.sh ${D}${sysconfdir}/X11/Xsession.d/
+}
+
+
+pkg_postinst_${PN} () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+. ${sysconfdir}/init.d/functions
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[moblin-netbook]'
+
+nbtk-create-image-cache ${datadir}/mutter-moblin/theme
+}
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb b/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb
new file mode 100644
index 0000000000..1136163a95
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb
@@ -0,0 +1,6 @@
+require mutter-moblin.inc
+
+SRC_URI = "http://download.moblin.org/sources/mutter-moblin/0.43/mutter-moblin-0.43.8.tar.bz2 \
+           file://startup-notify.patch;patch=1 \
+           file://88mutter-panelapps.sh \
+           file://background-tile.png"
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb b/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
index 6d6016eed0..c68f68e0f3 100644
--- a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
+++ b/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "A Moblin specific plugin for the Mutter composite window manager"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "clutter-1.0 nbtk mutter gnome-menus mojito libjana anerley clutter-mozembed bickley bognor-regis"
-PV = "2.25.2+git${SRCPV}"
+PV = "0.43.8+git${SRCPV}"
 PR = "r11"
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
@@ -10,45 +6,5 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
            file://88mutter-panelapps.sh \
            file://background-tile.png"
 
-FILES_${PN} += "\
-	${sysconfdir}/X11 \
-	${libdir}/metacity/plugins/clutter/*.so* \
-	${libdir}/mutter/plugins/*.so* \
-	${datadir}/mutter-moblin-netbook-plugin \
-	${datadir}/dbus-1/services \
-	${datadir}/moblin-panel-applications/theme \
-	${datadir}/moblin-panel-pasteboard/theme"
-FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*"
-FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
-
 S = "${WORKDIR}/git"
 
-ASNEEDED = ""
-
-EXTRA_OECONF = "--enable-ahoghill --enable-netpanel --enable-people"
-
-inherit autotools_stage
-
-do_configure_prepend () {
-	rm -f ${S}/build/autotools/gtk-doc.m4
-	cp ${WORKDIR}/background-tile.png ${S}/data/theme/panel/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/X11/Xsession.d/
-	install ${WORKDIR}/88mutter-panelapps.sh ${D}${sysconfdir}/X11/Xsession.d/
-}
-
-
-pkg_postinst_${PN} () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-
-. ${sysconfdir}/init.d/functions
-
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[moblin-netbook]'
-
-nbtk-create-image-cache ${datadir}/mutter-moblin/theme
-}