X Strike Force XFree86 SVN commit: rev 932 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2004-01-17 11:45:29 -0500 (Sat, 17 Jan 2004)
New Revision: 932
Removed:
branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
Modified:
branches/4.3.0/sid/debian/changelog
Log:
Remove patch that defines CppCmd to be cpp-3.2.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-17 05:53:10 UTC (rev 931)
+++ branches/4.3.0/sid/debian/changelog 2004-01-17 16:45:29 UTC (rev 932)
@@ -106,8 +106,9 @@
build-conflict on cpp-3.3 prior to 1:3.3.3ds1-0pre1; generalize
xbase-clients's, xdm's, and xutils's dependencies from cpp-3.2 to cpp; and
add conflict for each of these packages with versions of cpp-3.3 prior to
- 1:3.3.3ds1-0pre1.
+ 1:3.3.3ds1-0pre1. Remove patch that defines CppCmd to be cpp-3.2.
- debian/control
+ - debian/patches/003a_damn_cpp_3.3_to_hell.diff: deleted
-- Branden Robinson <branden@debian.org> Fri, 16 Jan 2004 17:46:47 -0500
Deleted: branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff 2004-01-17 05:53:10 UTC (rev 931)
+++ branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff 2004-01-17 16:45:29 UTC (rev 932)
@@ -1,32 +0,0 @@
-$Id$
-
-GNU CPP 3.3 doesn't handle the -traditional flag correctly. This causes
-bustication of xdm, xrdb, and probably manpage generation as well.
-
-This patch by Branden Robinson. Not submitted upstream. A temporary fix;
-stuff using cpp in the tree probably needs to be "ported" to work when
--traditional is not set, if possible.
-
---- xc/config/cf/gnu.cf~ 2003-05-26 23:27:33.000000000 -0500
-+++ xc/config/cf/gnu.cf 2003-05-26 23:29:16.000000000 -0500
-@@ -108,9 +108,7 @@
- #ifndef DoLoadableServer
- #define DoLoadableServer YES
- #endif
--#ifndef
--#define CppCmd /lib/cpp
--#endif
-+#define CppCmd cpp-3.2
- #define YaccCmd bison -y
- #define LexCmd flex -l
- #define HasFlex YES
---- xc/config/cf/linux.cf~ 2003-05-26 23:27:37.000000000 -0500
-+++ xc/config/cf/linux.cf 2003-05-26 23:28:51.000000000 -0500
-@@ -100,6 +100,7 @@
- # define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt
- # define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt
- # define SystemManDirectory /usr/share/man
-+# define CppCmd cpp-3.2
- # define HasPam YES
- # define HasTk YES
- # define TkLibDir /usr/lib
Reply to: