[oe-commits] org.oe.dev merge of '150235a307186164d7fe1d23c58f3317a30fd79e'

[oe commit]

merge of '150235a307186164d7fe1d23c58f3317a30fd79e'
     and '1c0cdd755fb1e51293d868d61a13da01b63ddfe9'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6d161d4303314c43fd7d0d04ac9394cb58e8d2bc
ViewMTN: http://monotone.openembedded.org/revision/info/6d161d4303314c43fd7d0d04ac9394cb58e8d2bc
Files:
1
packages/xorg-driver/xf86-video-ati_6.7.196.bb
packages/xorg-driver/xf86-video-vmware_10.15.2.bb
packages/xorg-driver/xf86-video-xgi_1.5.0.bb
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
packages/gpe-themes/gpe-theme-industrial_0.1.bb
packages/gpe-themes/gpe-theme-industrial_0.2.bb
Diffs:

#
# mt diff -r150235a307186164d7fe1d23c58f3317a30fd79e -r6d161d4303314c43fd7d0d04ac9394cb58e8d2bc
#
# 
# 
# add_file "packages/xorg-driver/xf86-video-ati_6.7.196.bb"
#  content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
# 
# add_file "packages/xorg-driver/xf86-video-vmware_10.15.2.bb"
#  content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
# 
# add_file "packages/xorg-driver/xf86-video-xgi_1.5.0.bb"
#  content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
# 
============================================================
--- packages/xorg-driver/xf86-video-ati_6.7.196.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-ati_6.7.196.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- packages/xorg-driver/xf86-video-vmware_10.15.2.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-vmware_10.15.2.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- packages/xorg-driver/xf86-video-xgi_1.5.0.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-xgi_1.5.0.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"


#
# mt diff -r1c0cdd755fb1e51293d868d61a13da01b63ddfe9 -r6d161d4303314c43fd7d0d04ac9394cb58e8d2bc
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [781a9a9775be71ff7f91c9abe1fb7a8c7af4b061]
#    to [51d134740207cc8be525f395282e27da28429f03]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126]
#    to [48eeeef2da4e7f0a0dd6bb78271647732c326f66]
# 
# patch "packages/gpe-themes/gpe-theme-clearlooks_0.2.bb"
#  from [42cae13beeef92ffecdfab057d80dd65f347acc9]
#    to [7235422886edcdd89c372f0e20d22f73fb64dab1]
# 
# patch "packages/gpe-themes/gpe-theme-clearlooks_0.3.bb"
#  from [05bf0deeddefc643695b7d17ca5ab395742a65a5]
#    to [1152dddecf9651fc2424a83833df8092bcd28436]
# 
# patch "packages/gpe-themes/gpe-theme-industrial_0.1.bb"
#  from [8100ed6a19b3bdaf27f1e9e37a3fc67a7a6a583a]
#    to [fd01be450b7531e5e13017081570b06cec4adb31]
# 
# patch "packages/gpe-themes/gpe-theme-industrial_0.2.bb"
#  from [b59529b4e889047353b69b6e96169f1074cacfb2]
#    to [1957b58631f76b6d311775a94d010e68ab9e4194]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	781a9a9775be71ff7f91c9abe1fb7a8c7af4b061
+++ conf/distro/angstrom-2007.1.conf	51d134740207cc8be525f395282e27da28429f03
@@ -1,8 +1,8 @@
 #@--------------------------------------------------------------------
 #@TYPE: Distribution
 #@NAME: Angstrom <http://www.angstrom-distribution.org>
 #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen at dominion.kabel.utwente.nl>
+#@MAINTAINER: Koen Kooi <koen at openembedded.org>
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
 #@--------------------------------------------------------------------
 
============================================================
--- conf/distro/angstrom-2008.1.conf	2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126
+++ conf/distro/angstrom-2008.1.conf	48eeeef2da4e7f0a0dd6bb78271647732c326f66
@@ -1,8 +1,8 @@
 #@--------------------------------------------------------------------
 #@TYPE: Distribution
 #@NAME: Angstrom <http://www.angstrom-distribution.org>
 #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen at dominion.kabel.utwente.nl>
+#@MAINTAINER: Koen Kooi <koen at openembedded.org>
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille-media.de>
 #@--------------------------------------------------------------------
 
============================================================
--- packages/gpe-themes/gpe-theme-clearlooks_0.2.bb	42cae13beeef92ffecdfab057d80dd65f347acc9
+++ packages/gpe-themes/gpe-theme-clearlooks_0.2.bb	7235422886edcdd89c372f0e20d22f73fb64dab1
@@ -7,7 +7,7 @@ FILES_${PN} = "${datadir}/themes/"
 RDEPENDS = "gtk-engine-clearlooks"
 
 FILES_${PN} = "${datadir}/themes/"
-SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
============================================================
--- packages/gpe-themes/gpe-theme-clearlooks_0.3.bb	05bf0deeddefc643695b7d17ca5ab395742a65a5
+++ packages/gpe-themes/gpe-theme-clearlooks_0.3.bb	1152dddecf9651fc2424a83833df8092bcd28436
@@ -6,7 +6,7 @@ FILES_${PN} = "${datadir}/themes/"
 RDEPENDS = "gtk-engine-clearlooks"
 
 FILES_${PN} = "${datadir}/themes/"
-SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
============================================================
--- packages/gpe-themes/gpe-theme-industrial_0.1.bb	8100ed6a19b3bdaf27f1e9e37a3fc67a7a6a583a
+++ packages/gpe-themes/gpe-theme-industrial_0.1.bb	fd01be450b7531e5e13017081570b06cec4adb31
@@ -7,7 +7,7 @@ FILES_${PN} =	"${datadir}/themes/"
 RDEPENDS =		"gtk-engine-industrial"
 
 FILES_${PN} =	"${datadir}/themes/"
-SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI =		"http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
============================================================
--- packages/gpe-themes/gpe-theme-industrial_0.2.bb	b59529b4e889047353b69b6e96169f1074cacfb2
+++ packages/gpe-themes/gpe-theme-industrial_0.2.bb	1957b58631f76b6d311775a94d010e68ab9e4194
@@ -6,7 +6,7 @@ FILES_${PN} = "${datadir}/themes/"
 RDEPENDS = "gtk-engine-industrial"
 
 FILES_${PN} = "${datadir}/themes/"
-SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/