[oe-commits] org.oe.dev merge of 'cdb2e28e89c82aad619cd71c60829800e4dd8d0b'

[florian commit]

merge of 'cdb2e28e89c82aad619cd71c60829800e4dd8d0b'
     and 'eca725be04182c9d2ebab13eddbe22f7e48c2b17'

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: f41e5cbe525b9dfb713db5cb18b7ee4a527b6819
ViewMTN: http://monotone.openembedded.org/revision/info/f41e5cbe525b9dfb713db5cb18b7ee4a527b6819
Files:
1
conf/checksums.ini
packages/tasks/task-gpephone.bb
packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
packages/gpephone/gpe-applauncher_0.11.bb
Diffs:

#
# mt diff -rcdb2e28e89c82aad619cd71c60829800e4dd8d0b -rf41e5cbe525b9dfb713db5cb18b7ee4a527b6819
#
# 
# 
# patch "conf/checksums.ini"
#  from [467577622d4d8dddf3f338a10cecb1a9a11bb2fe]
#    to [b08e00f28de85fc06e81e07ae2f9f2e0397ce2f8]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [c56f885095e703c6fe7dddc445c17a9632544977]
#    to [ddab25d4b41aeebd7cee7193c7ef2922532c17ea]
# 
============================================================
--- conf/checksums.ini	467577622d4d8dddf3f338a10cecb1a9a11bb2fe
+++ conf/checksums.ini	b08e00f28de85fc06e81e07ae2f9f2e0397ce2f8
@@ -5818,10 +5818,6 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd
 md5=15de3830b751818a54a42899bd3ae72c
 sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 
-[http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz]
-md5=f29e1e63fcc55e3ae4e81f5ee9dd7bdd
-sha256=448a3ab76109664bb6bd8bcc2c62d957c7d44b52e39c37d91b3b73b5cfe35a3f
-
 [http://gpe.linuxtogo.org/download/source/libcontactsdb-0.1.tar.bz2]
 md5=575442be0c61e4b1e05f2188e2ae3141
 sha256=33a61a28617e5513e58bde9c16ef21c82c582c1513a0a325735c090ebbd9aefe
@@ -6050,10 +6046,6 @@ sha256=2b384172b54074aef4ec23b3fcc8292c8
 md5=64304da2d9e21239246c66f1d449b2c6
 sha256=2b384172b54074aef4ec23b3fcc8292c86c7c4fb0efb943e7dea9d886a1d4846
 
-[http://gpephone.linuxtogo.org/download/gpephone/libgemwidget-0.1/libgemwidget-0.1.tar.bz2]
-md5=95d269ad7e7cb7d3032498ad2e47643b
-sha256=b8a1da871aa34362caf0c76dcbd3df42aef7313a4ed08f38eddcb159b80302c5
-
 [ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-2.0.1.tar.bz2]
 md5=4d93f6b01510013ae429e91af432cfe2
 sha256=6386901d84cb41fb8a584f7aa1b54c984e0590f36f45ee016ef30aa45554194d
@@ -6426,10 +6418,6 @@ sha256=18f0e2df191219c29b47dc12b4b06b5be
 md5=54935c6cff42df2f1daada267b701392
 sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
 
-[http://gpephone.linuxtogo.org/download/gpephone/libmsgenabler-1.0/libmsgenabler-1.0.tar.bz2]
-md5=53417c192cff3e32fb1d7b839201a04d
-sha256=8a58b9a9eb8cae0dc15453d7737050a3b241eb1030797f1559b4bbb5aff061e6
-
 [http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz]
 md5=88d35af903665fecbdee77eb6d5e6cdd
 sha256=f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
============================================================
--- packages/tasks/task-gpephone.bb	c56f885095e703c6fe7dddc445c17a9632544977
+++ packages/tasks/task-gpephone.bb	ddab25d4b41aeebd7cee7193c7ef2922532c17ea
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Pal
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r9"
+PR = "r10"
 LICENSE = "MIT"
 
 inherit task
@@ -88,5 +88,4 @@ RDEPENDS_gpephone-task-connectivity = "\
     gpe-windowlist"
 
 RDEPENDS_gpephone-task-connectivity = "\
-    email \
 "


#
# mt diff -reca725be04182c9d2ebab13eddbe22f7e48c2b17 -rf41e5cbe525b9dfb713db5cb18b7ee4a527b6819
#
# 
# 
# patch "packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf"
#  from [83eeed0fba4dc860c13b7fd602bbd80daa784259]
#    to [84522e43d3872a2bd2d6f0e6ab13692ac3dc5683]
# 
# patch "packages/gpephone/gpe-applauncher_0.11.bb"
#  from [6649e63640a298eabd781c80d846183c00d06436]
#    to [4cd8ca9197d759daf399a1817a800a2ca56b18de]
# 
============================================================
--- packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf	83eeed0fba4dc860c13b7fd602bbd80daa784259
+++ packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf	84522e43d3872a2bd2d6f0e6ab13692ac3dc5683
@@ -1,25 +1,25 @@
 # This an example configuration file for GPE Application launcher softkeys.
 # All sizes and positions have pixels as units.
 # The align setting is a positive value from 0 (left) to 10 (right).
 
-[Key 1]
+[Key 1]                                                        
 label = left
-width = 200
-height = 44
-xpos = 0
-ypos = 2
-xpos_menu = 1
-ypos_menu = 1
+width = 180
+height = 36
+xpos = 5
+ypos = 5
+xpos_menu = 5
+ypos_menu = 30
 align = 1
 key = F3
-
+              
 [Key 2]
 label = right
-width = 200
-height = 44
-xpos = 280
-ypos = 2
-xpos_menu = 1
-ypos_menu = 1
+width = 180
+height = 36
+xpos = 295
+ypos = 5
+xpos_menu = 5
+ypos_menu = 30
 align = 9
 key = F4
============================================================
--- packages/gpephone/gpe-applauncher_0.11.bb	6649e63640a298eabd781c80d846183c00d06436
+++ packages/gpephone/gpe-applauncher_0.11.bb	4cd8ca9197d759daf399a1817a800a2ca56b18de
@@ -1,8 +1,8 @@ PRIORITY    = "optional"
 LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r2"
+PR          = "r1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"