Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting11.git;a=commitdiff;h=9e10aa7418cf0b345bdb01fa51ad87a8986e4750

commit 9e10aa7418cf0b345bdb01fa51ad87a8986e4750
Author: James Buren <[email protected]>
Date:   Sun Aug 25 15:52:53 2013 -0500

xorg-server-1.14.2-2-x86_64
* remove desktop file for old display manager system

diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index 82f4d6e..e2754cc 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -19,7 +19,7 @@ xorg_protos=('bigreqsproto' 'calibrateproto' 
'compositeproto>=0.4' 'damageproto>

pkgname=xorg-server
pkgver=1.14.2
-pkgrel=1
+pkgrel=2
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'arm')
@@ -37,7 +37,6 @@ provides=('libdri')
replaces=('libdri')
conflicts=('libdri')

-backup=('etc/sysconfig/desktop')
_F_archive_grepv="99"
Finclude xorg
sha1sums=('accece109925f46ac92618850f53c7459261113c')
@@ -50,11 +49,9 @@ if Fuse $USE_DEVEL; then
Finclude scm
fi

-source=("${source[@]}" \
-       desktop)
+#source=("${source[@]}")

-sha1sums=("${sha1sums[@]}" \
-          'e2e25648e1968cf942a0a0458656879042c16939')
+#sha1sums=("${sha1sums[@]}")

Fconfopts="${Fconfopts[@]}
--disable-static \
@@ -154,8 +151,6 @@ build() {
--with-builder-addr="[email protected]" \

Fmakeinstall
-       # TODO - Move away from here
-       Ffile /etc/sysconfig/desktop

Fsplit libglx usr/lib/xorg/modules/extensions/libglx.*

diff --git a/source/x11/xorg-server/desktop b/source/x11/xorg-server/desktop
deleted file mode 100644
index c00df59..0000000
--- a/source/x11/xorg-server/desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/sysconfig/desktop
-
-# Which session manager try to use.
-
-#desktop="/usr/bin/xdm -nodaemon"
-#desktop="/usr/sbin/lxdm"
-#desktop="/usr/sbin/lightdm"
-#desktop="/usr/sbin/gdm --nodaemon"
-#desktop="/usr/bin/kdm -nodaemon"
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to