X Strike Force SVN commit: rev 233 - branches/4.3.0/sid/debian/patches
Author: daniel
Date: 2003-06-22 07:44:01 -0500 (Sun, 22 Jun 2003)
New Revision: 233
Modified:
branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff
Log:
patch #061 (Savage): clean up the diff - I did this locally, must've forgotten
to commit.
Modified: branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff 2003-06-22 12:35:50 UTC (rev 232)
+++ branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff 2003-06-22 12:44:01 UTC (rev 233)
@@ -1,22 +1,3 @@
-diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/Imakefile xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile
---- xc/programs/Xserver/hw/xfree86/drivers/savage.old/Imakefile 2003-02-18 04:06:44.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile 2002-10-08 05:19:10.000000000 +1000
-@@ -1,4 +1,4 @@
--XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile,v 1.8 2003/02/17 17:06:44 dawes Exp $
-+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile,v 1.7 2002/05/14 20:19:51 alanh Exp $
- /*
- *
- * Copyright 1995-1998 The XFree86 Project, Inc.
-@@ -42,7 +42,7 @@
- -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \
- -I$(XF86SRC)/rac -I$(XF86SRC)/int10 -I$(SERVERSRC)/render \
- -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \
-- -I$(EXTINCSRC) -I$(XF86SRC)/vbe -I$(XF86SRC)/shadowfb
-+ -I$(EXTINCSRC) -I$(XF86OSSRC)/vbe -I$(XF86SRC)/shadowfb
- #endif
-
- #if MakeHasPosixVariableSubstitutions
-Binary files xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage-1.1.27t.zip and xc/programs/Xserver/hw/xfree86/drivers/savage/savage-1.1.27t.zip differ
diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_accel.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c
--- xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_accel.c 2002-11-09 05:03:32.000000000 +1100
+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c 2002-10-08 05:17:32.000000000 +1000
@@ -43,15 +24,6 @@
| BIT_ORDER_IN_BYTE_MSBFIRST
;
if( psav->Chipset == S3_SAVAGE4 )
-diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_bci.h xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h
---- xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_bci.h 2002-10-03 06:39:54.000000000 +1000
-+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h 2002-10-08 05:19:04.000000000 +1000
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h,v 1.4 2002/10/02 20:39:54 alanh Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h,v 1.2 2001/10/01 13:44:09 eich Exp $ */
-
- #ifndef _S3BCI_H_
- #define _S3BCI_H_
diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_cursor.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c
--- xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_cursor.c 2003-01-19 02:22:29.000000000 +1100
+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c 2002-10-08 05:17:32.000000000 +1000
@@ -308,15 +280,6 @@
/* Prototypes. */
extern void SavageCommonCalcClock(long freq, int min_m, int min_n1,
-diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_i2c.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c
---- xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_i2c.c 2002-10-03 06:39:55.000000000 +1000
-+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c 2002-10-08 05:17:32.000000000 +1000
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c,v 1.3 2002/10/02 20:39:55 alanh Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c,v 1.1 2001/02/13 21:15:19 dawes Exp $ */
-
- /*
- Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_regs.h xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h
--- xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_regs.h 2003-06-21 00:05:26.000000000 +1000
+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-17 10:45:06.000000000 +1100
Reply to: