[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r213 - trunk/debian/patches



Author: branden
Date: 2005-06-14 16:53:14 -0500 (Tue, 14 Jun 2005)
New Revision: 213

Modified:
   trunk/debian/patches/0000_backport_from_upstream.diff
Log:
Fix fuzz and offsets.

[As of this commit, the entire batch of patches in debian/patches is now
completely fuzz and offset-clean.]


Modified: trunk/debian/patches/0000_backport_from_upstream.diff
===================================================================
--- trunk/debian/patches/0000_backport_from_upstream.diff	2005-06-14 21:43:34 UTC (rev 212)
+++ trunk/debian/patches/0000_backport_from_upstream.diff	2005-06-14 21:53:14 UTC (rev 213)
@@ -1304,7 +1304,7 @@
 diff -u -r1.44 -r1.45
 --- xc/config/cf/xorg.cf	27 Jan 2005 03:50:46 -0000	1.44
 +++ xc/config/cf/xorg.cf	1 Feb 2005 02:02:31 -0000	1.45
-@@ -413,15 +413,12 @@
+@@ -415,15 +415,12 @@
  
  # ifndef DriDrivers
  #  ifndef ia64Architecture
@@ -1323,8 +1323,8 @@
  # endif
  #endif /* i386Architecture || ia64Architecture */
  
-@@ -456,12 +453,9 @@
- 				XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers
+@@ -448,12 +445,9 @@
+ 				XF86OSCardDrivers XF86ExtraCardDrivers
  # endif
  
 -/* 



Reply to: