vairous: Reset PR's to 1 on the overlay recipies as TMP needs rebuilding anyway.

diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index eabb1eb..4f637ff 100755 (executable)
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -1,11 +1,14 @@
 # XFCE image for the Pandora handheld console
 
 XSERVER ?= " \
-    xserver-xorg \
-    xf86-input-evdev \
-    xf86-input-mouse \
-    xf86-video-fbdev \
-    xf86-input-keyboard \
+  xserver-xorg \
+  xserver-xorg-extension-glx \
+  xserver-xorg-extension-dri \
+  xf86-input-evtouch \ 
+  xf86-input-evdev \
+  xf86-input-mouse \
+  xf86-input-keyboard \
+  xf86-video-omapfb \
 "
 
 IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"

diff --git a/recipes/omap3-deviceid/omap3-deviceid_1.0.bb b/recipes/omap3-deviceid/omap3-deviceid_1.0.bb
index 68aa8c8..3109d0e 100755 (executable)
--- a/recipes/omap3-deviceid/omap3-deviceid_1.0.bb
+++ b/recipes/omap3-deviceid/omap3-deviceid_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Report the OMAP3 SoC unique ID"
 LICENSE = "GPL"
-PR ="r2"
+PR ="r1"
 
 inherit autotools
 

diff --git a/recipes/pandora-system/pandora-auto-startx.bb b/recipes/pandora-system/pandora-auto-startx.bb
index f87baee..6180d10 100755 (executable)
--- a/recipes/pandora-system/pandora-auto-startx.bb
+++ b/recipes/pandora-system/pandora-auto-startx.bb
@@ -7,7 +7,7 @@ RDEPENDS_${PN} = "xinit"
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
-PR = "r0.1"
+PR = "r1"
 
 SRC_URI = " \
           file://rc.auto-startx \

diff --git a/recipes/pandora-system/pandora-firmware.bb b/recipes/pandora-system/pandora-firmware.bb
index 0e78a1d..8986715 100755 (executable)
--- a/recipes/pandora-system/pandora-firmware.bb
+++ b/recipes/pandora-system/pandora-firmware.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Install binary firmware for Bluetooth and WiFi into the image."
 LICENSE = "proprietary-binary"
 RRECOMMENDS_${PN} = "kernel-module-firmware-class"
-PR = "r5"
+PR = "r1"
 
 SRC_URI = " \
         file://brf6300.bin \

diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb
index 2accf6e..0a05310 100755 (executable)
--- a/recipes/pandora-system/pandora-first-run-wizard.bb
+++ b/recipes/pandora-system/pandora-first-run-wizard.bb
@@ -6,7 +6,7 @@ RDEPENDS = "pandora-auto-startx zenity dbus"
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
-PR = "r0.3"
+PR = "r1"
 
 SRC_URI = " \
           file://first-boot-wizard.sh \

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index 08fa615..edeb253 100755 (executable)
--- 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 = "r2"
+PR = "r1"
 
 PARALLEL_MAKE = ""
 
@@ -10,7 +10,7 @@ SRC_URI = " \
           file://rc.libpnd \
 "
 
-SRCREV = "b945d7a6b257ab73f11f7c97448dae3600a9484c"
+SRCREV = "0258a5f326ad753a47bfc8189249c71748bed7fc"
 
 S = "${WORKDIR}/git"
 
@@ -37,28 +37,25 @@ do_install() {
           install ${S}/deployment/etc/pandora/conf/desktop ${D}${sysconfdir}/pandora/conf/desktop
 
           install -d ${D}${libdir}/
-          cp -pP ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1.0.1
-          cp -pP ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
-          cp -pP ${S}/deployment/usr/lib/libpnd.a ${D}${libdir}/libpnd.a
+          cp -pP ${S}/deployment/usr/lib/libpnd* ${D}${libdir}/
+#          cp -pP ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
+#          cp -pP ${S}/deployment/usr/lib/libpnd.a ${D}${libdir}/libpnd.a
           
           install -d ${D}${bindir}/
           cp -pP ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
                    
           install -d ${D}${prefix}/pandora/
           install -d ${D}${prefix}/pandora/apps/
-#          cp -pP ${S}/deployment/usr/pandora/apps/*.* ${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
+          cp -pP ${S}/deployment/usr/pandora/scripts/* ${D}${prefix}/pandora/scripts
           
           install -d ${D}${sysconfdir}/init.d/
           cp -pP ${WORKDIR}/rc.libpnd ${D}${sysconfdir}/init.d/libpnd-init
           
-          install -d ${D}/home/
+          install -d ${D}/home/root/
           install -d ${D}${prefix}/local/share/applications/
 }
 
-pkg_postinst() {
-  ln -sf /usr/lib/libpnd.so.1.0.1 /usr/lib/libpnd.so.1 
-}
-
 FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
+FILES_${PN}-dev += "${libdir}/libpnd.a"

diff --git a/recipes/slim/slim/rc.slim b/recipes/slim/slim/rc.slim
index 87bc714..147a94b 100644 (file)
--- a/recipes/slim/slim/rc.slim
+++ b/recipes/slim/slim/rc.slim
@@ -10,10 +10,10 @@
 case $1 in
 start)
        rm /var/run/slim.lock
-       /usr/bin/slim-dynwm -d
+       /usr/bin/slim -d
        ;;
 stop)
-       killall /usr/bin/slim-dynwm
+       killall /usr/bin/slim
        ;;
 restart)
        $0 stop

diff --git a/recipes/slim/slim_1.3.1.bb b/recipes/slim/slim_1.3.1.bb
index a038ea6..e14d64b 100644 (file)
--- 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 = "r0.4"
+PR = "r1"
 
 inherit update-rc.d
 

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index 96164bf..1959e54 100755 (executable)
--- 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 = "r3.1"
+PR = "r1"
 
 inherit task 
 

diff --git a/recipes/tasks/task-pandora-desktop.bb b/recipes/tasks/task-pandora-desktop.bb
index 762328a..b940f58 100755 (executable)
--- a/recipes/tasks/task-pandora-desktop.bb
+++ b/recipes/tasks/task-pandora-desktop.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the 'desktop' Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r1.1"
+PR = "r1"
 
 inherit task
 

diff --git a/recipes/tasks/task-pandora-gnome.bb b/recipes/tasks/task-pandora-gnome.bb
index dd7e2f5..a3ecf1c 100755 (executable)
--- a/recipes/tasks/task-pandora-gnome.bb
+++ b/recipes/tasks/task-pandora-gnome.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the 'gnome' Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r3.1"
+PR = "r1"
 
 inherit task
 
@@ -63,15 +63,15 @@ GNOME = " \
   gnome-panel libpanel-applet libgweather-locationdata\
   gnome-power-manager gnome-power-manager-applets \
   gnome-python \
-# gnome-python-extras \
+  gnome-python-extras \
   gnome-python-desktop \
   gnome-screensaver \
   gnome-session \
   gnome-settings-daemon \
   gnome-system-monitor \
-#  gnome-system-tools system-tools-backends\
+  gnome-system-tools system-tools-backends \
   gnome-terminal \
-#  gnome-utils \
+  gnome-utils \
   gnome-vfs \
   gnome-vfs-plugin-bzip2 \
   gnome-vfs-plugin-computer \
@@ -87,8 +87,7 @@ GNOME = " \
   gvfs \
   metacity \
   nautilus nautilus-cd-burner desktop-file-utils\
-  networkmanager network-manager-applet \
-#networkmanager-openvpn \
+  networkmanager network-manager-applet networkmanager-openvpn \
   policykit-gnome policykit \
   zenity \
 "
@@ -117,7 +116,7 @@ UIM = " \
 PERL = " \
   perl \
 #  task-perl-module-all \
-#  libnet-dbus-perl \
+  libnet-dbus-perl \
   libxml-parser-perl \
   libxml-twig-perl \
 "
@@ -155,16 +154,16 @@ THEMES = " \
 "
 
 TOTEM = " \
-#  totem \
-#  totem-browser-plugin \
-#  totem-plugin-bemused \
-#  totem-plugin-gromit \
-#  totem-plugin-media-player-keys \
-#  totem-plugin-ontop \
-#  totem-plugin-properties \
-#  totem-plugin-screensaver \
-#  totem-plugin-skipto \
-#  totem-plugin-thumbnail \
+  totem \
+  totem-browser-plugin \
+  totem-plugin-bemused \
+  totem-plugin-gromit \
+  totem-plugin-media-player-keys \
+  totem-plugin-ontop \
+  totem-plugin-properties \
+  totem-plugin-screensaver \
+  totem-plugin-skipto \
+  totem-plugin-thumbnail \
 "
 
 XSERVER_BASE = " \
@@ -175,7 +174,7 @@ XSERVER_BASE = " \
   mime-support \
   notification-daemon inotify-tools \
   xauth \
-#  xdg-utils \
+  xdg-utils \
   xhost \
   xinetd \
   xinit \

diff --git a/recipes/tasks/task-pandora-gui.bb b/recipes/tasks/task-pandora-gui.bb
index e0eccfe..10a03c2 100755 (executable)
--- a/recipes/tasks/task-pandora-gui.bb
+++ b/recipes/tasks/task-pandora-gui.bb
@@ -2,7 +2,7 @@ rDESCRIPTION = "Task file for default GUI apps in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r3.1"
+PR = "r1"
 
 inherit task
 

diff --git a/recipes/tasks/task-pandora-validation.bb b/recipes/tasks/task-pandora-validation.bb
index 8d901b1..a32b5c8 100755 (executable)
--- a/recipes/tasks/task-pandora-validation.bb
+++ b/recipes/tasks/task-pandora-validation.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for validation apps and scripts in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r3.1"
+PR = "r1"
 
 inherit task 
 

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index fd337e7..4042b9f 100755 (executable)
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r3.1"
+PR = "r4"
 
 inherit task
 
@@ -10,20 +10,12 @@ ANGSTROM_EXTRA_INSTALL ?= ""
 
 APPS = " \
   abiword \
-  cheese \
   claws-mail \
-  epiphany epiphany-extensions \
   swfdec swfdec-gnome swfdec-mozilla \
-  evince \
-  gcalctool \
-  gedit \
+  firefox \
+  gnumeric \   
   gimp \
-  gnome-games \
-  gnome-mplayer \
-  gnumeric \
-  gphoto2 \
-  gthumb \
-  pidgin \
+  networkmanager network-manager-applet \ 
   synergy \
   vnc \
   x11vnc angstrom-x11vnc-xinit \
@@ -31,6 +23,18 @@ APPS = " \
   xterm \
 "
 
+IM_CLIENT = " \
+  pidgin \
+  libpurple-protocol-msn \
+  libpurple-protocol-yahoo \
+  libpurple-protocol-icq \
+  libpurple-protocol-aim \
+"
+
+DISPMAN = " \
+  slim \
+"
+
 FONTS = " \
   font-adobe-75dpi \
   fontconfig fontconfig-utils font-util \
@@ -45,20 +49,40 @@ FONTS = " \
   xorg-minimal-fonts \
 "  
 
+GNOME_APPS = " \
+  epiphany epiphany-extensions \
+  evince \  
+  gnome-games \
+  gnome-mplayer \
+  gcalctool \ 
+  gnome-bluetooth \    
+"
+
+GNOME_GTK = " \
+#  hicolor-icon-theme \
+#  gnome-icon-theme \
+#  angstrom-gnome-icon-theme-enable \
+"
+
 GSTREAMER = " \
   gst-ffmpeg \
   gst-omapfb \
   gst-plugin-pulse \
   gst-plugins-base-meta \
-  gst-plugins-good-meta \
+#  gst-plugins-good-meta \
   gst-plugins-bad-meta \
 #  gst-plugins-ugly-meta \
 "
 
+ICON_THEME = " \
+  tango-icon-theme \
+  tango-icon-theme-enable \
+"
+
 PERL = " \
   perl \
-#  task-perl-module-all \
-#  libnet-dbus-perl \
+  task-perl-module-all \
+  libnet-dbus-perl \
   libxml-parser-perl \
   libxml-twig-perl \
 "
@@ -71,15 +95,84 @@ PULSEAUDIO = " \
   libasound-module-pcm-pulse \
 "
 
+TOTEM = " \
+  totem \
+  totem-browser-plugin \
+  totem-plugin-bemused \
+  totem-plugin-gromit \
+  totem-plugin-media-player-keys \
+  totem-plugin-ontop \
+  totem-plugin-properties \
+  totem-plugin-screensaver \
+  totem-plugin-skipto \
+  totem-plugin-thumbnail \
+"
+
+XFCE46_BASE = " \
+  xfce4-dev-tools \
+  xfwm4 \
+  xfwm4-theme-default \
+  xfce-utils \  
+  xfce4-session \     
+  xfconf \
+  xfdesktop \
+  xfce4-panel \
+  \
+  gtk-xfce-engine \
+  \
+  xfce4-panel-plugin-actions \
+  xfce4-panel-plugin-clock \
+  xfce4-panel-plugin-iconbox \
+  xfce4-panel-plugin-launcher \
+  xfce4-panel-plugin-pager \
+  xfce4-panel-plugin-separator \
+  xfce4-panel-plugin-showdesktop \
+  xfce4-panel-plugin-systray \
+  xfce4-panel-plugin-tasklist \
+  xfce4-panel-plugin-windowlist \   
+  xfce4-settings \
+  xfce-terminal \
+  thunar \
+"
+
+XFCE46_EXTRAS = " \
+  xfce4-notifyd \
+  xfce4-mixer \
+  xfce4-appfinder \
+  xfprint \    
+  midori \
+  orage \
+  squeeze \
+  ristretto \
+  mousepad \ 
+  gigolo \
+"
+
+XFCE_THEMES = " \
+  xfwm4-theme-daloa \
+  xfwm4-theme-moheli \
+  xfwm4-theme-default-4.0 \
+  xfwm4-theme-default-4.2 \
+  xfwm4-theme-default-4.4 \
+  xfwm4-theme-kokodi \
+  xfwm4-theme-moheli \
+  xfwm4-theme-sassandra \
+  xfwm4-theme-stoneage \
+  xfwm4-theme-therapy \
+  xfwm4-theme-tyrex \
+  xfwm4-theme-wallis \  
+"
+
 XSERVER_BASE = " \
   ${XSERVER} \
+  xf86-input-evtouch \
   dbus-x11 \
   desktop-file-utils \
   iso-codes \
   mime-support \
   notification-daemon inotify-tools \
   xauth \
-#  xdg-utils \
+  xdg-utils \
   xhost \
   xinetd \
   xinit \
@@ -92,56 +185,41 @@ XSERVER_BASE = " \
 
 RDEPENDS_${PN} = " \
   task-pandora-core \
+  angstrom-x11-base-depends \
   ${ANGSTROM_EXTRA_INSTALL} \
   ${APPS} \
+  ${IM_CLIENT} \
+  ${DISPMAN} \
   ${FONTS} \
+  ${GNOME_GTK} \
+  ${GNOME_APPS} \
   ${GSTREAMER} \
+  ${ICON_THEME} \
   ${PERL} \
   ${PULSEAUDIO} \
+  ${TOTEM} \
   ${XSERVER_BASE} \
-       \
-       angstrom-x11-base-depends \
-       \
+  ${XFCE46_BASE} \
+  ${XFCE46_EXTRAS} \
+  ${XFCE_THEMES} \
+  \
 #      pandora-auto-startx \
-#      pandora-first-run-wizard \
-       \
-       task-xfce46-base \
-       task-xfce46-extras \    
-       \
-#      gnome-packagekit \
-       \
-       rxvt-unicode \
-       xkbd \
-       xst \
-       xhost \
-       xrdb \
-       libgtkstylus \
-       suspend-desktop \
-       teleport \
-       xauth \
-       gdk-pixbuf-loader-png \
-       gdk-pixbuf-loader-xpm \
-       gdk-pixbuf-loader-jpeg \
-       pango-module-basic-x \
-       pango-module-basic-fc \
-       gpe-theme-clearlooks \
-       xcursor-transparent-theme \     
-       angstrom-zeroconf-audio \
-       angstrom-led-config \   
-       mime-support \
-       xterm xmms \
-       firefox \
-       hicolor-icon-theme gnome-icon-theme \
-       jaaa nmap iperf gnuplot \
-       abiword \
-       gnumeric \
-       gimp \
-       pidgin \
-       gnome-games \
-       stalonetray \
-       synergy \
-       x11vnc angstrom-x11vnc-xinit \
-       angstrom-gnome-icon-theme-enable \
-       networkmanager network-manager-applet \
-       gnome-bluetooth \
+  pandora-first-run-wizard \
+  \
+  rxvt-unicode \
+  xst \
+  suspend-desktop \
+  teleport \
+  gdk-pixbuf-loader-png \
+  gdk-pixbuf-loader-xpm \
+  gdk-pixbuf-loader-jpeg \
+  pango-module-basic-x \
+  pango-module-basic-fc \
+  xcursor-transparent-theme \  
+  angstrom-zeroconf-audio \
+  angstrom-led-config \        
+  mime-support \
+  xterm xmms \
+  jaaa nmap iperf gnuplot \
+  x11vnc angstrom-x11vnc-xinit \
 "