X Strike Force XFree86 SVN commit: rev 934 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2004-01-19 16:06:40 -0500 (Mon, 19 Jan 2004)
New Revision: 934
Modified:
branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
branches/4.3.0/sid/debian/patches/900_debian_config.diff
Log:
Fix patch offsets, courtesy of Dagfinn Ilmari Manns?\195?\165ker.
Modified: branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-01-18 16:29:03 UTC (rev 933)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-01-19 21:06:40 UTC (rev 934)
@@ -4,8 +4,8 @@
Originally by Branden Robinson. Forward-ported from 4.2.1 by Daniel Stone.
---- xc/config/cf/Imake.tmpl.orig Mon Jan 13 16:43:40 2003
-+++ xc/config/cf/Imake.tmpl Mon Jan 13 17:22:07 2003
+--- xc-old/config/cf/Imake.tmpl 2004-01-18 04:41:45.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2004-01-18 04:45:23.000000000 +0100
@@ -856,34 +856,79 @@
#define ManSourcePath $(MANPATH)/man
#endif
@@ -269,9 +269,9 @@
#endif
INSTBINFLAGS = InstBinFlags /* install flags for programs */
INSTUIDFLAGS = InstUidFlags /* install flags for setuid programs */
---- xc/config/cf/gnu.cf.orig Mon Jan 13 17:22:45 2003
-+++ xc/config/cf/gnu.cf Mon Jan 13 17:22:51 2003
-@@ -144,26 +144,6 @@
+--- xc-old/config/cf/gnu.cf 2004-01-18 04:41:51.000000000 +0100
++++ xc/config/cf/gnu.cf 2004-01-18 04:46:04.000000000 +0100
+@@ -146,26 +146,6 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
@@ -298,9 +298,9 @@
#ifndef StaticLibrary
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
---- xc/config/cf/linux.cf~ 2003-09-18 12:34:14.000000000 -0500
-+++ xc/config/cf/linux.cf 2003-09-18 12:34:21.000000000 -0500
-@@ -161,6 +161,7 @@
+--- xc-old/config/cf/linux.cf 2004-01-18 04:41:52.000000000 +0100
++++ xc/config/cf/linux.cf 2004-01-18 04:45:51.000000000 +0100
+@@ -160,6 +160,7 @@
# define BuildHtmlManPages NO
# define StaticNeedsPicForShared NO /* we handle provide static libraries with PIC symbols using a different method */
# define KernelVersionInBanner YES
@@ -308,7 +308,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -970,26 +971,6 @@
+@@ -969,26 +970,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
@@ -335,8 +335,8 @@
#ifndef StaticLibrary
# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
---- xc/config/cf/xfree86.cf.orig Mon Jan 13 17:23:38 2003
-+++ xc/config/cf/xfree86.cf Mon Jan 13 17:23:47 2003
+--- xc-old/config/cf/xfree86.cf 2004-01-18 04:41:52.000000000 +0100
++++ xc/config/cf/xfree86.cf 2004-01-18 04:46:32.000000000 +0100
@@ -1887,10 +1887,6 @@
# define UseRgbTxt YES
#endif
Modified: branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff 2004-01-18 16:29:03 UTC (rev 933)
+++ branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff 2004-01-19 21:06:40 UTC (rev 934)
@@ -9,7 +9,7 @@
--- xc/config/cf/linux.cf~ 2003-09-18 01:28:10.000000000 -0500
+++ xc/config/cf/linux.cf 2003-09-18 01:28:26.000000000 -0500
-@@ -116,13 +116,16 @@
+@@ -115,13 +115,16 @@
/* # define JoystickSupport YES */
# define XAppLoadDir EtcX11Directory/app-defaults
# define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
Modified: branches/4.3.0/sid/debian/patches/900_debian_config.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/900_debian_config.diff 2004-01-18 16:29:03 UTC (rev 933)
+++ branches/4.3.0/sid/debian/patches/900_debian_config.diff 2004-01-19 21:06:40 UTC (rev 934)
@@ -2,7 +2,7 @@
--- xc/config/cf/linux.cf~ 2003-09-18 12:11:37.000000000 -0500
+++ xc/config/cf/linux.cf 2003-09-18 12:11:43.000000000 -0500
-@@ -136,13 +136,7 @@
+@@ -135,13 +135,7 @@
# define NormalLibGlu YES
# define FSUseSyslog YES
Reply to: