[oe-commits] org.oe.dev merge of '18204a96348299d7a00d123e82a164c84ee30200'

Thu Feb 21 17:07:09 UTC 2008

merge of '18204a96348299d7a00d123e82a164c84ee30200'
     and '5187a066168c016222547e826662112889eb50a2'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 9113c326555654955a12b3a2a98496b89a6a66f1
ViewMTN: http://monotone.openembedded.org/revision/info/9113c326555654955a12b3a2a98496b89a6a66f1
Files:
1
classes/nylon-mirrors.bbclass
classes/oplinux-mirrors.bbclass
conf/distro/openmoko.conf
packages/gpe-login/gpe-login-0.90
packages/gpe-login/files/chvt-keylaunch.patch
packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
packages/gpe-login/gpe-login-0.90/chvt-keylaunch.patch
packages/gpe-login/gpe-login-0.86
packages/gpe-login/gpe-login_0.91.bb
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/distro/include/angstrom.inc
conf/distro/include/preferred-gpe-versions-2.8.inc
packages/gpe-login/files/lock-on-supend.patch
Diffs:

#
# mt diff -r18204a96348299d7a00d123e82a164c84ee30200 -r9113c326555654955a12b3a2a98496b89a6a66f1
#
# 
# 
# patch "classes/nylon-mirrors.bbclass"
#  from [376b7465920814cf2d72d3ad84339ba9443a70ab]
#    to [102010d2a19c8b12b6de91f8b903db60701bfede]
# 
# patch "classes/oplinux-mirrors.bbclass"
#  from [1349196904a1b7eb854816b63b65eb58babc8f0a]
#    to [ed581826599bb12881bb248c12360c0f7cbae434]
# 
# patch "conf/distro/openmoko.conf"
#  from [4512da55b21499913ae1534988c81c3c26b99c64]
#    to [02896609234a09af5537fbcaf494e70d8a9addba]
# 
============================================================

--- classes/nylon-mirrors.bbclass	376b7465920814cf2d72d3ad84339ba9443a70ab
+++ classes/nylon-mirrors.bbclass	102010d2a19c8b12b6de91f8b903db60701bfede
@@ -1,6 +1,6 @@ MIRRORS_append () {
 MIRRORS_append () {
-ftp://.*/.*/	http://meshcube.org/nylon/stable/sources/
-https?://.*/.*/	http://meshcube.org/nylon/stable/sources/
-ftp://.*/.*/	http://meshcube.org/nylon/unstable/sources/
-https?://.*/.*/	http://meshcube.org/nylon/unstable/sources/
+ftp://.*/.*	http://meshcube.org/nylon/stable/sources/
+https?://.*/.*	http://meshcube.org/nylon/stable/sources/
+ftp://.*/.*	http://meshcube.org/nylon/unstable/sources/
+https?://.*/.*	http://meshcube.org/nylon/unstable/sources/
 }
============================================================
--- classes/oplinux-mirrors.bbclass	1349196904a1b7eb854816b63b65eb58babc8f0a
+++ classes/oplinux-mirrors.bbclass	ed581826599bb12881bb248c12360c0f7cbae434
@@ -1,14 +1,14 @@ MIRRORS_append () {
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
 MIRRORS_append () {
-ftp://.*/.*/	http://digital-opsis.com/oplinux/stable/sources/
-https?://.*/.*/	http://digital-opsis.com/oplinux/stable/sources/
-ftp://.*/.*/	http://digital-opsis.com/oplinux/unstable/sources/
-https?://.*/.*/	http://digital-opsis.com/oplinux/unstable/sources/
+ftp://.*/.*	http://digital-opsis.com/oplinux/stable/sources/
+https?://.*/.*	http://digital-opsis.com/oplinux/stable/sources/
+ftp://.*/.*	http://digital-opsis.com/oplinux/unstable/sources/
+https?://.*/.*	http://digital-opsis.com/oplinux/unstable/sources/
 
-ftp://.*/.*/	http://digital-opsis.com/oplinux-uclibc/stable/sources/
-https?://.*/.*/	http://digital-opsis.com/oplinux-uclibc/stable/sources/
-ftp://.*/.*/	http://digital-opsis.com/oplinux-uclibc/unstable/sources/
-https?://.*/.*/	http://digital-opsis.com/oplinux-uclibc/unstable/sources/
+ftp://.*/.*	http://digital-opsis.com/oplinux-uclibc/stable/sources/
+https?://.*/.*	http://digital-opsis.com/oplinux-uclibc/stable/sources/
+ftp://.*/.*	http://digital-opsis.com/oplinux-uclibc/unstable/sources/
+https?://.*/.*	http://digital-opsis.com/oplinux-uclibc/unstable/sources/
 }
============================================================
--- conf/distro/openmoko.conf	4512da55b21499913ae1534988c81c3c26b99c64
+++ conf/distro/openmoko.conf	02896609234a09af5537fbcaf494e70d8a9addba
@@ -19,7 +19,7 @@ CVS_TARBALL_STASH = "http://downloads.op
 
 CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
 
-PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
 
 FEED_URIS = "\
   snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \


#
# mt diff -r5187a066168c016222547e826662112889eb50a2 -r9113c326555654955a12b3a2a98496b89a6a66f1
#
# 
# 
# delete "packages/gpe-login/gpe-login-0.90"
# 
# rename "packages/gpe-login/files/chvt-keylaunch.patch"
#     to "packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch"
# 
# rename "packages/gpe-login/gpe-login-0.90/chvt-keylaunch.patch"
#     to "packages/gpe-login/files/chvt-keylaunch.patch"
# 
# add_dir "packages/gpe-login/gpe-login-0.86"
# 
# add_file "packages/gpe-login/gpe-login_0.91.bb"
#  content [dc8d686e1e1f9d92d60d3b705a3844630bad51ae]
# 
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
#  from [679a152fab923d34ccb9cd6b19ed77f4b7dac487]
#    to [c239272a2d456c0cc3f4c30fc4ba59c4be5acf1c]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [b86b952c90304d1fd39f1415f6af7f71d02e00df]
#    to [2519c1b72831f6c678dec86bda400fdbdd069054]
# 
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
#  from [4b14c35b3986ab4908cc77104d4e8bedda37428e]
#    to [ed638b29796f8e274a83bd2129260b86970f7f34]
# 
# patch "packages/gpe-login/files/lock-on-supend.patch"
#  from [5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8]
#    to [56350a3a838dc5e7407b0d6a28258a6b1a98eade]
# 
============================================================
--- packages/gpe-login/gpe-login_0.91.bb	dc8d686e1e1f9d92d60d3b705a3844630bad51ae
+++ packages/gpe-login/gpe-login_0.91.bb	dc8d686e1e1f9d92d60d3b705a3844630bad51ae
@@ -0,0 +1,26 @@
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd gpe-theme-clearlooks"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+
+SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
+SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
+SRC_URI += " file://size-autolock-properly.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko-versions.inc	679a152fab923d34ccb9cd6b19ed77f4b7dac487
+++ conf/distro/include/angstrom-2007-for-openmoko-versions.inc	c239272a2d456c0cc3f4c30fc4ba59c4be5acf1c
@@ -548,7 +548,7 @@ PREFERRED_VERSION_gpe-lights ?= "0.13"
 PREFERRED_VERSION_gpe-keylock ?= "0.12"
 PREFERRED_VERSION_gpe-life ?= "0.2"
 PREFERRED_VERSION_gpe-lights ?= "0.13"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
 PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
 PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17"
 PREFERRED_VERSION_gpe-mininet ?= "0.7"
============================================================
--- conf/distro/include/angstrom.inc	b86b952c90304d1fd39f1415f6af7f71d02e00df
+++ conf/distro/include/angstrom.inc	2519c1b72831f6c678dec86bda400fdbdd069054
@@ -12,6 +12,7 @@ ANGSTROM_MODE ?= "glibc"
 # Can be "glibc", "eglibc" or "uclibc"
 ANGSTROM_MODE ?= "glibc"
 
+CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}"
 DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
 require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 
============================================================
--- conf/distro/include/preferred-gpe-versions-2.8.inc	4b14c35b3986ab4908cc77104d4e8bedda37428e
+++ conf/distro/include/preferred-gpe-versions-2.8.inc	ed638b29796f8e274a83bd2129260b86970f7f34
@@ -32,7 +32,7 @@ PREFERRED_VERSION_gpe-icons ?= "0.25"
 
 PREFERRED_VERSION_gpe-icons ?= "0.25"
 
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
 PREFERRED_VERSION_gpe-su ?= "0.19"
 PREFERRED_VERSION_keylaunch ?= "2.0.10"
============================================================
--- packages/gpe-login/files/lock-on-supend.patch	5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8
+++ packages/gpe-login/files/lock-on-supend.patch	56350a3a838dc5e7407b0d6a28258a6b1a98eade
@@ -1,4 +1,5 @@ upstream: http://bugs.linuxtogo.org/show
 upstream: http://bugs.linuxtogo.org/show_bug.cgi?id=125
+status: accepted in 0.91
 
 Lock screen when device goes to suspend, not after some time has passed
 since resume and they stole your data from the unprotected screen.




