From c09bcfd9e2540cad34c26d3407585e65ea53ec11 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 22 Jul 2008 22:07:58 +0000
Subject: illume: rename default theme to illume-theme-asu, depend on any theme

---
 conf/distro/include/sane-srcrevs.inc               |  3 ++-
 packages/openmoko-projects/illume-theme-asu_svn.bb | 27 ++++++++++++++++++++++
 packages/openmoko-projects/illume-theme_svn.bb     | 25 --------------------
 packages/openmoko-projects/illume_svn.bb           |  3 ++-
 4 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 packages/openmoko-projects/illume-theme-asu_svn.bb
 delete mode 100644 packages/openmoko-projects/illume-theme_svn.bb

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cdd4c6f993..0a7251ec50 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -49,7 +49,8 @@ SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume ?= "134"
-SRCREV_pn-illume-theme ?= "134"
+SRCREV_pn-illume-theme-asu ?= "134"
+SRCREV_pn-illume-theme-freesmartphone ?= "8128497ad1260202c6ebfb08c11a2253bf81665b"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
diff --git a/packages/openmoko-projects/illume-theme-asu_svn.bb b/packages/openmoko-projects/illume-theme-asu_svn.bb
new file mode 100644
index 0000000000..5ddb61d0eb
--- /dev/null
+++ b/packages/openmoko-projects/illume-theme-asu_svn.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
+HOMEPAGE = "http://illume.projects.openmoko.org/"
+LICENSE = "MIT/BSD"
+PV = "0.0+svnr${SRCREV}"
+PR = "r6"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=http"
+S = "${WORKDIR}/illume"
+
+do_install() {
+    install -d ${D}${sysconfdir}/enlightenment
+    install -d ${D}${datadir}/enlightenment/data/themes/
+    install -d ${D}${datadir}/enlightenment/data/init/
+
+    # Make illume the default profile
+    echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
+
+    install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
+    install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/
+}
+
+RPROVIDES_${PN} = "illume-theme"
+CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
+FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/openmoko-projects/illume-theme_svn.bb b/packages/openmoko-projects/illume-theme_svn.bb
deleted file mode 100644
index 3ea672117f..0000000000
--- a/packages/openmoko-projects/illume-theme_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
-HOMEPAGE = "http://illume.projects.openmoko.org/"
-LICENSE = "MIT/BSD"
-
-PACKAGE_ARCH="all"
-PV = "0.0+svnr${SRCREV}"
-PR = "r5"
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
-S = "${WORKDIR}/illume"
-
-CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
-FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
-
-do_install() {
-    install -d ${D}${sysconfdir}/enlightenment
-    install -d ${D}${datadir}/enlightenment/data/themes/
-    install -d ${D}${datadir}/enlightenment/data/init/
-
-    # Make illume the default profile
-    echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
-
-    install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/
-}
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index b58bc2c1d6..af101f1a01 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -4,7 +4,7 @@ AUTHOR = "Rasterman"
 LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 PV = "0.0+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
@@ -21,6 +21,7 @@ EXTRA_OECONF = "\
 RRECOMMENDS_${PN} = "\
   wamerican \
   ${PN}-config \
+  ${PN}-theme \
   ${PN}-dicts-default \
   ${PN}-keyboards-default \
   ${PN}-keyboards-numbers \
-- 
cgit v1.2.3