[oe-commits] org.oe.dev merge of '096af4db5787781750ffca1b165b4c7e87bc2c94'

[rwhitby commit]

merge of '096af4db5787781750ffca1b165b4c7e87bc2c94'
     and 'd5497549302f40a104bf1e0bb07bed2326a311cc'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 5d7605d1cca32eb21bad01816037c46d68c0b79c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5d7605d1cca32eb21bad01816037c46d68c0b79c
Files:
1
packages/meta/slugos-packages.bb
packages/xorg-xserver/xorg-xserver-common.inc
Diffs:

#
# mt diff -r096af4db5787781750ffca1b165b4c7e87bc2c94 -r5d7605d1cca32eb21bad01816037c46d68c0b79c
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [a711c84e9e2e4d98253996205dc7d161ee6d80d0]
#    to [0cce69bb0cbc207a39fab77c3054e03e4eb02abc]
# 
============================================================
--- packages/meta/slugos-packages.bb	a711c84e9e2e4d98253996205dc7d161ee6d80d0
+++ packages/meta/slugos-packages.bb	0cce69bb0cbc207a39fab77c3054e03e4eb02abc
@@ -58,14 +58,12 @@ SLUGOS_PACKAGES = "\
 	diffutils \
 	dircproxy \
 	dnsmasq \
-	dsniff \
 	e2fsprogs \
 	e2fsprogs-libs \
 	eciadsl \
 	expat \
 	ez-ipupdate \
 	fconfig \
-	fetchmail \
 	file \
 	findutils \
 	fis \
@@ -133,14 +131,17 @@ SLUGOS_PACKAGES = "\
 	microcom \
 	minicom \
 	motion \
+	mpd \
 	mt-daapd \
 	mtd-utils \
 	mutt \
+	mysql \
 	nail \
 	nano \
 	ncftp \
 	ncurses \
 	netcat \
+	netpbm \
 	nfs-utils \
 	nmap \
 	ntfs-3g \
@@ -217,26 +218,23 @@ SLUGOS_BROKEN_PACKAGES = "\
 SLUGOS_BROKEN_PACKAGES = "\
 	bwmon \
 	ctrlproxy \
-	libgphoto2 gphoto2 \
+	dsniff \
+	fetchmail \
+	libgphoto2 gphoto2 sane-backends \\
+	lirc-modules lirc \
 	logrotate \
 	madfu \
 	openldap \
-	\
-	mpd \
-	netpbm \
 	pvrusb2-mci \
+	pwc \
 	qc-usb-messenger \
 	syslog-ng \
-	sane-backends \
+	task-native-sdk \
 	unionfs-modules \
 	unionfs-utils \
-	lirc \
-	pwc \
-	task-native-sdk \
-	zd1211 \
-	mysql \
         wview-sim-mysql wview-vpro-mysql \
         wview-wxt510-mysql \
+	zd1211 \
 	"
 
 SLUGOS_EXTRA_PACKAGES ?= ""


#
# mt diff -rd5497549302f40a104bf1e0bb07bed2326a311cc -r5d7605d1cca32eb21bad01816037c46d68c0b79c
#
# 
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [60aa521448a78ec17e7543808246323e44623474]
#    to [9a281ac539ce984563ccaec7aa10f8986035f896]
# 
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc	60aa521448a78ec17e7543808246323e44623474
+++ packages/xorg-xserver/xorg-xserver-common.inc	9a281ac539ce984563ccaec7aa10f8986035f896
@@ -16,7 +16,7 @@ XORG_PN = "xorg-server"
 REPENDS="rgb"
 
 XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
 	file://xorg.conf"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"