From: David-John Willis <John.Willis@Distant-earth.com>
Date: Tue, 1 Dec 2009 18:26:49 +0000 (+0000)
Subject: various: reset PR of tasks following mainline Angstrom DISTRO_PR bump. Cosmetic change.
X-Git-Tag: Release-2010-05/1~142
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79beff08f4770e7f4cabfe61707c245b4189a4f0;p=openpandora.oe.git

various: reset PR of tasks following mainline Angstrom DISTRO_PR bump. Cosmetic change.
---

diff --git a/recipes/branding/pandora-wallpaper.bb b/recipes/branding/pandora-wallpaper.bb
index f6e7da8..9e00553 100644
--- a/recipes/branding/pandora-wallpaper.bb
+++ b/recipes/branding/pandora-wallpaper.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Wallpapers created by the community for the OpenPandora, thanks go to the community for the graphics"
 
-PR = "r2"
+PR = "r1"
 
 SRC_URI = " \
   file://community/* \
diff --git a/recipes/branding/pandora-xfce-defaults.bb b/recipes/branding/pandora-xfce-defaults.bb
index 62dc17a..b838f7b 100644
--- a/recipes/branding/pandora-xfce-defaults.bb
+++ b/recipes/branding/pandora-xfce-defaults.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Default OpenPandora settings for Xfce4"
 HOMEPAGE = "http://www.openpandora.org"
 SECTION = "x11/xfce"
 
-PR = "r4"
+PR = "r1"
 
 SRC_URI = " \
   file://xfce4-conf.zip \
diff --git a/recipes/gtk/gtk-touchscreen-mode-enable.bb b/recipes/gtk/gtk-touchscreen-mode-enable.bb
index 08a0185..d865ad0 100644
--- a/recipes/gtk/gtk-touchscreen-mode-enable.bb
+++ b/recipes/gtk/gtk-touchscreen-mode-enable.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Enable gtk-touchscreen-mode in gtkrc"
 
 RDEPENDS = "gtk+"
 
-PR = "r2"
+PR = "r1"
 
 ALLOW_EMPTY_${PN} = "1"
 PACKAGE_ARCH = "all"
diff --git a/recipes/images/pandora-core-image.bb b/recipes/images/pandora-core-image.bb
index 00a921a..93a2472 100755
--- a/recipes/images/pandora-core-image.bb
+++ b/recipes/images/pandora-core-image.bb
@@ -1,6 +1,6 @@
 # Console image for the Pandora handheld console
 
-IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
+IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es tr-tr"
 
 IMAGE_LOGIN_MANAGER = "shadow"
 
diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index 22e0372..dca5ed7 100755
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -1,6 +1,6 @@
 # XFCE image for the Pandora handheld console
 
-IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
+IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es tr-tr"
 
 IMAGE_LOGIN_MANAGER = "shadow"
 
@@ -21,7 +21,7 @@ IMAGE_INSTALL += " \
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 #zap root password for release images
-#ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
 # Helper to say what image we built, include GIT tag and image name.
 PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb
index b244c7b..0072ac1 100755
--- a/recipes/pandora-system/pandora-first-run-wizard.bb
+++ b/recipes/pandora-system/pandora-first-run-wizard.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Scripts to support the first run wizard on the OpenPandora."
 LICENSE = "GPLV2"
 
 DEPENDS = "hsetroot zenity dbus"
-RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib"
+RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib tslib-calibrate "
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
-PR = "r7"
+PR = "r1"
 
 SRC_URI = " \
           file://first-run-wizard.sh \
diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index 14989f2..6d5cba0 100755
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
-PR = "r5"
+PR = "r1"
 
 PARALLEL_MAKE = ""
 
@@ -45,7 +45,6 @@ do_install() {
                    
           install -d ${D}${prefix}/pandora/
           install -d ${D}${prefix}/pandora/apps/
-          cp -pP ${S}/deployment/usr/pandora/apps/* ${D}${prefix}/pandora/apps
           install -d ${D}${prefix}/pandora/scripts/
           cp -pP ${S}/deployment/usr/pandora/scripts/* ${D}${prefix}/pandora/scripts
           
diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index a466b21..1103285 100644
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r5"
+PR = "r1"
 
 SRC_URI = " \
           file://op_bright.sh \
diff --git a/recipes/pandora-system/wl1251-modules.bb b/recipes/pandora-system/wl1251-modules.bb
index deaf47a..772fd77 100755
--- a/recipes/pandora-system/wl1251-modules.bb
+++ b/recipes/pandora-system/wl1251-modules.bb
@@ -41,7 +41,7 @@ do_install() {
           cp ${S}/drivers/net/wireless/wl12xx/wl1251.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx
           cp ${S}/drivers/net/wireless/wl12xx/wl1251_sdio.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx
           install -d ${D}${sysconfdir}/init.d/
-          cp -pP ${WORKDIR}/rc.wl1251 ${D}${sysconfdir}/init.d/wl1251-init
+          install -m 0755 ${WORKDIR}/rc.wl1251 ${D}${sysconfdir}/init.d/wl1251-init
 }
 
 FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/kernel/net/mac80211/*.ko.*"
diff --git a/recipes/slim/slim-op-themes.bb b/recipes/slim/slim-op-themes.bb
index 7c15c7b..74b236c 100644
--- a/recipes/slim/slim-op-themes.bb
+++ b/recipes/slim/slim-op-themes.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "slim"
 RDEPENDS = "slim"
 
-PR = "r2"
+PR = "r1"
 
 SRC_URI = " \        
 "
diff --git a/recipes/slim/slim_1.3.1.bb b/recipes/slim/slim_1.3.1.bb
index 31593c5..7b3b897 100644
--- a/recipes/slim/slim_1.3.1.bb
+++ b/recipes/slim/slim_1.3.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION="Simple Login Manager"
 HOMEPAGE="http://slim.berlios.de"
 LICENSE = "GPL"
 
-PR = "r2"
+PR = "r1"
 
 inherit update-rc.d
 
diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index c0f23f8..86ffb7f 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Task file for default core/console apps in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r7"
+PR = "r1"
 
 inherit task 
 
@@ -31,7 +31,8 @@ WIRELESS = " \
 
 OPENGLES = " \
   omap3-sgx-modules devmem2 \
-  libgles-omap3 libgles-omap3-demos \
+  libgles-omap3 \
+#  libgles-omap3-demos \
 "
 
 PAM = " \
diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 3a44466..5b49a6c 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -1,8 +1,8 @@
-DESCRI-PTION = "Task file for the XFCE Pandora image"
+DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r18"
+PR = "r2"
 
 inherit task
 
@@ -20,8 +20,8 @@ APPS = " \
   synergy \
   vnc \
   x11vnc angstrom-x11vnc-xinit \
-  xmms \
   xterm \
+  xchat \
 "
 
 BLUETOOTH_GUI = " \
@@ -92,10 +92,11 @@ ICON_THEME = " \
 "
 
 PANDORA = " \
-  pandora-first-run-wizard hsetroot xtscal \
+  pandora-first-run-wizard hsetroot \
   pandora-scripts \
   pandora-wallpaper-official pandora-wallpaper-community \
   pandora-xfce-defaults \
+  pandora-xmms-defaults xmms \
 "
 
 PERL = " \