X Strike Force X.Org X11 SVN commit: r3050 - in branches/7.1/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-08-27 16:52:18 -0400 (Sun, 27 Aug 2006)
New Revision: 3050
Modified:
branches/7.1/xserver/xorg-server/debian/changelog
branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff
Log:
* Fix error in 16_s390_fix.diff caused by my idiot copying. Thanks Yannick
Roehlly and Daniel Stone.
Modified: branches/7.1/xserver/xorg-server/debian/changelog
===================================================================
--- branches/7.1/xserver/xorg-server/debian/changelog 2006-08-27 07:50:42 UTC (rev 3049)
+++ branches/7.1/xserver/xorg-server/debian/changelog 2006-08-27 20:52:18 UTC (rev 3050)
@@ -1,3 +1,10 @@
+xorg-server (2:1.1.1-5) UNRELEASED; urgency=low
+
+ * Fix error in 16_s390_fix.diff caused by my idiot copying. Thanks Yannick
+ Roehlly and Daniel Stone.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 27 Aug 2006 16:51:49 +0000
+
xorg-server (2:1.1.1-4) experimental; urgency=low
[ Drew Parsons ]
Modified: branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff 2006-08-27 07:50:42 UTC (rev 3049)
+++ branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff 2006-08-27 20:52:18 UTC (rev 3050)
@@ -53,7 +53,7 @@
xf86EnableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
-+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) || !defined(__s390__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
if (!ExtendedEnabled)
if (iopl(3) || ioperm(0, 1024, 1))
return;
Reply to: