# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1287568372 0
# Node ID 7549d397630fb751843b8c0ac89b0516675937f1
# Parent  d49d12b964abd7d570080ee631d89471cad77f37# Parent  eadcac7a1b325ed087fb2f8487ef165362365bff
merge

diff -r d49d12b964ab -r 7549d397630f audacious/receipt
--- a/audacious/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/audacious/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,7 @@
 CATEGORY="multimedia"
 SHORT_DESC="Music player like xmms"
 MAINTAINER="mimas@slitaz.org"
-DEPENDS="gtk+ libmowgli libmcs dbus-glib xorg-libXdamage libxml2 libsamplerate audacious-plugins"
+DEPENDS="gtk+ libmowgli libmcs dbus-glib xorg-libXdamage libxml2 libsamplerate"
 BUILD_DEPENDS="gtk+-dev libmowgli-dev libmowgli libmcs libmcs-dev dbus-dev dbus-glib-dev libxml2-dev libsamplerate-dev"
 TARBALL="$PACKAGE-$VERSION.tgz"
 WEB_SITE="http://audacious-media-player.org/"
diff -r d49d12b964ab -r 7549d397630f util-linux-ng/receipt
--- a/util-linux-ng/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/util-linux-ng/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="slitaz-toolchain ncurses-dev e2fsprogs-dev zlib-dev"
+BUILD_DEPENDS="slitaz-toolchain ncurses-dev zlib-dev"
 WEB_SITE="http://kernel.org/~kzak/util-linux-ng/"
 WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v${VERSION%*}/$TARBALL"
 LOCALE=""
diff -r d49d12b964ab -r 7549d397630f xorg-bigreqsproto/receipt
--- a/xorg-bigreqsproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-bigreqsproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg proto."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="bigreqsproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-compositeproto/receipt
--- a/xorg-compositeproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-compositeproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="compositeproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-damageproto/receipt
--- a/xorg-damageproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-damageproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="damageproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-dri2proto/receipt
--- a/xorg-dri2proto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-dri2proto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg DRI protocol files."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="dri2proto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-fixesproto/receipt
--- a/xorg-fixesproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-fixesproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server fixes protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="fixesproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-fontcacheproto/receipt
--- a/xorg-fontcacheproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-fontcacheproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="fontcacheproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-glproto/receipt
--- a/xorg-glproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-glproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server fixes protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="glproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-inputproto/receipt
--- a/xorg-inputproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-inputproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="inputproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-kbproto/receipt
--- a/xorg-kbproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-kbproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="kbproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-randrproto/receipt
--- a/xorg-randrproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-randrproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -6,7 +6,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="randrproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-recordproto/receipt
--- a/xorg-recordproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-recordproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg record protol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="recordproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-renderproto/receipt
--- a/xorg-renderproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-renderproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="renderproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-resourceproto/receipt
--- a/xorg-resourceproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-resourceproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="resourceproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-scrnsaverproto/receipt
--- a/xorg-scrnsaverproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-scrnsaverproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="scrnsaverproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-server/receipt
--- a/xorg-server/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-server/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,13 +5,13 @@
 CATEGORY="x-window"
 SHORT_DESC="Xorg core server."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg xorg-libxkbfile xorg-xf86-video-vesa xorg-xkeyboard-config \
-xorg-xkbcomp xorg-libpciaccess xorg-libXxf86vm libcrypto freetype pixman \
-gcc-lib-base xorg-xf86-input-evdev dbus udev hal"
+DEPENDS="xorg xorg-libxkbfile xorg-xkeyboard-config xorg-libpciaccess \
+xorg-libXxf86vm libcrypto freetype pixman gcc-lib-basedbus udev hal"
 BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile xorg-libxkbfile-dev \
 xorg-libfontenc-dev xorg-libpciaccess xorg-libpciaccess-dev xorg-libXxf86vm-dev libgcrypt-dev \
 libcrypto-dev openssl-dev dbus-dev mesa-dev udev-dev hal-dev glib-dev freetype-dev pixman pixman-dev \
 pkg-config perl flex bison"
+SUGGESTED="xorg-xf86-input-evdev xorg-xf86-video-vesa"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
diff -r d49d12b964ab -r 7549d397630f xorg-trapproto/receipt
--- a/xorg-trapproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-trapproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="trapproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-videoproto/receipt
--- a/xorg-videoproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-videoproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="videoproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xcmiscproto/receipt
--- a/xorg-xcmiscproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xcmiscproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xcmiscproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xextproto/receipt
--- a/xorg-xextproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xextproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xextproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xf86bigfontproto/receipt
--- a/xorg-xf86bigfontproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xf86bigfontproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xf86bigfontproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xf86dgaproto/receipt
--- a/xorg-xf86dgaproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xf86dgaproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xf86dgaproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xf86driproto/receipt
--- a/xorg-xf86driproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xf86driproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xf86driproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xf86miscproto/receipt
--- a/xorg-xf86miscproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xf86miscproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xf86miscproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xf86vidmodeproto/receipt
--- a/xorg-xf86vidmodeproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xf86vidmodeproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server protocol."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xf86vidmodeproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xineramaproto/receipt
--- a/xorg-xineramaproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xineramaproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xineramaproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xkbcomp/receipt
--- a/xorg-xkbcomp/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xkbcomp/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Xorg keyboard composite."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg xorg-libX11 xorg-xkeyboard-config xorg-libxkbfile"
+DEPENDS="xorg xorg-libX11 xorg-libxkbfile"
 SOURCE="xkbcomp"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"
diff -r d49d12b964ab -r 7549d397630f xorg-xkeyboard-config/receipt
--- a/xorg-xkeyboard-config/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xkeyboard-config/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Xorg server keyboard definition files."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
+DEPENDS="xorg xorg-xkbcomp"
 BUILD_DEPENDS="perl-xml-parser xorg-xkbcomp"
 SOURCE="xkeyboard-config"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
diff -r d49d12b964ab -r 7549d397630f xorg-xproto/receipt
--- a/xorg-xproto/receipt	Wed Oct 20 09:50:57 2010 +0000
+++ b/xorg-xproto/receipt	Wed Oct 20 09:52:52 2010 +0000
@@ -5,7 +5,6 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg"
 SOURCE="xproto"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.x.org/"