Add matchbox-theme-sato and sato-icon-theme 0.1, update distro config to match

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2243 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 36 insertions, 7 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index b389726053..b051213655 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -105,9 +105,9 @@ SRCDATE_psplash ?= "20070529"
 SRCDATE_maemo-mapper-nohildon ?= "20061114"
 SRCDATE_exmap-console = "20070529"
 SRCDATE_gtk-sato-engine = "20070731"
-SRCDATE_matchbox-theme-sato = "20070723"
+SRCDATE_matchbox-theme-sato = "20070731"
 SRCDATE_tasks = "20070711"
-SRCDATE_sato-icon-theme = "20070630"
+SRCDATE_sato-icon-theme = "20070731"
 SRCDATE_matchbox-desktop-sato = "20070704"
 SRCDATE_evince = "20070505"
 SRCDATE_oh-puzzles = "20070714"
@@ -140,6 +140,8 @@ PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-wm ?= "1.2+svn${SRCDATE}"
 PREFERRED_VERSION_libmatchbox ?= "1.9"
 PREFERRED_VERSION_gtk-sato-engine = "0.1"
+PREFERRED_VERSION_matchbox-theme-sato = "0.1"
+PREFERRED_VERSION_sato-icon-theme = "0.1"
 
 PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
 PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
new file mode 100644
index 0000000000..eb903a19c5
--- /dev/null
+++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Matchbox window manager Sato themes"
+LICENSE = "CC-BY-SA3"
+DEPENDS = "matchbox-wm"
+SECTION = "x11/wm"
+
+SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/themes"
+
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb
index 567ab03709..5ed1325b50 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb
+++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Matchbox window manager Sato themes"
-LICENSE = "GPL"
+LICENSE = "CC-BY-SA3"
 DEPENDS = "matchbox-wm"
 SECTION = "x11/wm"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.1+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
 S = "${WORKDIR}/matchbox-sato"
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme_0.1.bb b/meta/packages/sato-icon-theme/sato-icon-theme_0.1.bb
new file mode 100644
index 0000000000..08db3aa427
--- /dev/null
+++ b/meta/packages/sato-icon-theme/sato-icon-theme_0.1.bb
@@ -0,0 +1,17 @@
+SECTION = "x11"
+DESCRIPTION = "Sato Icon Theme"
+LICENSE = "CC-BY-SA3"
+DEPENDS = ""
+
+SRC_URI = "http://pokylinux.org/releases/sato/sato-icon-theme-0.1.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}"
+
+pkg_postinst_${PN} () {
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+        gtk-update-icon-cache -q /usr/share/icons/Sato
+}
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme_svn.bb b/meta/packages/sato-icon-theme/sato-icon-theme_svn.bb
index 5658b7ba3d..4fdcfaefe8 100644
--- a/meta/packages/sato-icon-theme/sato-icon-theme_svn.bb
+++ b/meta/packages/sato-icon-theme/sato-icon-theme_svn.bb
@@ -1,9 +1,8 @@
 SECTION = "x11"
 DESCRIPTION = "Sato Icon Theme"
-LICENSE = "LGPL"
+LICENSE = "CC-BY-SA3"
 DEPENDS = ""
-PV = "0.0+svn${SRCDATE}"
-PR = "r3"
+PV = "0.1+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=sato-icon-theme;proto=http"
 S = "${WORKDIR}/sato-icon-theme"