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

X Strike Force XFree86 SVN commit: r1703 - in trunk/debian: . patches



Author: branden
Date: 2004-07-29 04:52:03 -0500 (Thu, 29 Jul 2004)
New Revision: 1703

Added:
   trunk/debian/patches/099d_Imake.rules_fix_RawCppFileTarget.diff
Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
Log:
Apply patch from Thomas Dickey to fix Imake's CppRawFileTarget() so that
it no longer tempts cpp into corrupting manpages.  Thanks, Thomas!
(Closes: #259996)


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-07-29 08:11:00 UTC (rev 1702)
+++ trunk/debian/CHANGESETS	2004-07-29 09:52:03 UTC (rev 1703)
@@ -201,4 +201,9 @@
 Luis Lopes). (Closes: #261389)
     1701, 1702
 
+Apply patch from Thomas Dickey to fix Imake's CppRawFileTarget() so that
+it no longer tempts cpp into corrupting manpages.  Thanks, Thomas!
+(Closes: #259996)
+    1703
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-07-29 08:11:00 UTC (rev 1702)
+++ trunk/debian/changelog	2004-07-29 09:52:03 UTC (rev 1703)
@@ -142,6 +142,10 @@
   * Update Brazilian Portuguese debconf template translations (thanks, André
     Luís Lopes). (Closes: #261389)
 
+  * Apply patch from Thomas Dickey to fix Imake's CppRawFileTarget() so that
+    it no longer tempts cpp into corrupting manpages.  Thanks, Thomas!
+    (Closes: #259996)
+
   Changes by Fabio M. Di Nitto and Branden Robinson:
 
   * Support building only the parts of the source tree needed by
@@ -174,7 +178,7 @@
 
   * Get glxinfo to link properly with g++ (instead of adding -lstdc++).
 
- -- Branden Robinson <branden@debian.org>  Thu, 29 Jul 2004 03:01:32 -0500
+ -- Branden Robinson <branden@debian.org>  Thu, 29 Jul 2004 04:21:41 -0500
 
 xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
 

Added: trunk/debian/patches/099d_Imake.rules_fix_RawCppFileTarget.diff
===================================================================
--- trunk/debian/patches/099d_Imake.rules_fix_RawCppFileTarget.diff	2004-07-29 08:11:00 UTC (rev 1702)
+++ trunk/debian/patches/099d_Imake.rules_fix_RawCppFileTarget.diff	2004-07-29 09:52:03 UTC (rev 1703)
@@ -0,0 +1,21 @@
+$Id$
+
+Modify CppRawFileTarget() to transform trailing backslashes in the input
+manpages so the backslash is followed by a blank, defeating the C
+preprocessor's tendency to remove the following newline.
+
+This patch by Thomas Dickey.
+
+Present in XFree86 CVS.
+
+--- xc/config/cf/Imake.rules	2004/06/01 00:16:53	3.137
++++ xc/config/cf/Imake.rules	2004/07/18 15:10:26	3.138
+@@ -3226,7 +3226,7 @@
+ dst::  src deplist							@@\
+ 	RemoveFile($@)							@@\
+ 	ClearmakeOSName \
+-	$(RAWCPP) CppNoLineInfoOption defs <src | CppSedMagic >$@	@@\
++	sed -e 's/\\$$/\\ /' src | $(RAWCPP) CppNoLineInfoOption defs | CppSedMagic >$@	@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFiles(dst)


Property changes on: trunk/debian/patches/099d_Imake.rules_fix_RawCppFileTarget.diff
___________________________________________________________________
Name: svn:keywords
   + Id



Reply to: