xorg-x11-server: Remove unneeded xorg.conf.

diff --git a/pkgs/core/xorg-x11-server/xorg-x11-server.nm b/pkgs/core/xorg-x11-server/xorg-x11-server.nm
index d12a577afdc48c7b1c75a8eb15d4790ad936bc67..98b69270b3c6e2cf2f8701611361c7c36f4d1bb4 100644 (file)
--- a/pkgs/core/xorg-x11-server/xorg-x11-server.nm
+++ b/pkgs/core/xorg-x11-server/xorg-x11-server.nm
@@ -103,6 +103,4 @@ define STAGE_INSTALL
                $(BUILDROOT)/usr/share/xorg/
        cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/10-quirks.conf \
                $(BUILDROOT)/usr/share/X11/xorg.conf.d
-       cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/xorg.conf \
-                $(BUILDROOT)/etc/X11/
 endef

diff --git a/pkgs/core/xorg-x11-server/xorg.conf b/pkgs/core/xorg-x11-server/xorg.conf
deleted file mode 100644 (file)
index 684cf4a..0000000
--- a/pkgs/core/xorg-x11-server/xorg.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-Section "Module"
-       Load "int10"
-       Load "vbe"
-       Load "fb"
-       Load "shadow"
-EndSection