Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (d672622e52ae94b2a2021ca6ce96dd33beaae03b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (d672622e52ae94b2a2021ca6ce96dd33beaae03b)
  • Date: Thu, 4 Feb 2010 06:14:12 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

xorg-xserver/xorg-server/CONFLICTS | 6 ------
xorg-xserver/xorg-server/HISTORY | 3 +++
xorg-xserver/xorg-server/UP_TRIGGERS | 15 ---------------
3 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit d672622e52ae94b2a2021ca6ce96dd33beaae03b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

xorg-server: none provider of monolithic X now

diff --git a/xorg-xserver/xorg-server/CONFLICTS
b/xorg-xserver/xorg-server/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-xserver/xorg-server/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 02aeb47..dfec356 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2010-02-04 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS, UP_TRIGGERS: none provider of monolithic X now
+
2010-01-07 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.4
SOURCE matches upstream posted SHA1
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS
b/xorg-xserver/xorg-server/UP_TRIGGERS
index e12fd16..734d31c 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -1,21 +1,6 @@
-#
-# Go through each provider monolithic X spells provided
-#
-local provider
local each
local epicfail

-for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb; do
- for each in $(gaze -q depends $provider 1); do
- #
- # Recast each spell still using monolithic X, if it's installed
- # See http://bugs.sourcemage.org/show_bug.cgi?id=14373 for the "issue"
- # with Sorcery not switching out a no longer available provider
- #
- up_trigger $each cast_self
- done # Finished spell loop
-done # Finished provider loop
-
case "$(installed_version $SPELL)" in
1.4.2|1.3.0.0|1.2.99.903|1.2.99.902|1.2.0|1.1.1|1.0.1|1.0.0|0.99.4)
epicfail=y;;
*) epicfail=n;;



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (d672622e52ae94b2a2021ca6ce96dd33beaae03b), Ladislav Hagara, 02/04/2010

Archive powered by MHonArc 2.6.24.

Top of Page