Author: branden
Date: 2005-01-17 17:23:20 -0500 (Mon, 17 Jan 2005)
New Revision: 2134

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/patches/007_fix_xfree86_man_version_string.diff
Log:
Update patch #007 to fix the problem with XFree86-authored manpages
reporting "Version Version ..." in the footer.


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS     2005-01-12 19:56:03 UTC (rev 2133)
+++ trunk/debian/CHANGESETS     2005-01-17 22:23:20 UTC (rev 2134)
@@ -137,4 +137,8 @@
 does not actually enable it.)  Thanks, Manoj!  (Closes: #233551)
     2133
 
+Update patch #007 to fix the problem with XFree86-authored manpages
+reporting "Version Version ..." in the footer.
+    2134
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2005-01-12 19:56:03 UTC (rev 2133)
+++ trunk/debian/changelog      2005-01-17 22:23:20 UTC (rev 2134)
@@ -109,8 +109,11 @@
     imake and xdm.  (Note that this patch only adds source-level support, and
     does not actually enable it.)  Thanks, Manoj!  (Closes: #233551)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Wed, 12 Jan 2005 14:54:44 -0500
+  * Update patch #007 to fix the problem with XFree86-authored manpages
+    reporting "Version Version ..." in the footer.
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Mon, 17 Jan 2005 17:22:38 -0500
+
 xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
 
   * Upload urgency set to medium due to fix for stable-release-critical bugs

Modified: trunk/debian/patches/007_fix_xfree86_man_version_string.diff
===================================================================
--- trunk/debian/patches/007_fix_xfree86_man_version_string.diff        
2005-01-12 19:56:03 UTC (rev 2133)
+++ trunk/debian/patches/007_fix_xfree86_man_version_string.diff        
2005-01-17 22:23:20 UTC (rev 2134)
@@ -1,19 +1,13 @@
 $Id$
 
-Fix the XFree86 version number in man pages; this patch originally by
-Branden Robinson.
+Fix the XFree86 version number in manual pages.
 
---- xc/config/cf/xfree86.cf.orig       Mon Jan 13 17:31:31 2003
-+++ xc/config/cf/xfree86.cf    Mon Jan 13 17:33:13 2003
-@@ -73,7 +73,7 @@
- #endif
- 
- #ifndef XVendorString
--# define XVendorString        "The XFree86 Project, Inc"
-+# define XVendorString "The XFree86 Project, Inc"
- #endif
- 
- #ifndef XVendorRelease
+This patch by Branden Robinson.
+
+Not submitted (in its present form) to XFree86 upstream.
+
+--- xc/config/cf/xfree86.cf~   2005-01-14 13:30:40.000000000 -0500
++++ xc/config/cf/xfree86.cf    2005-01-14 13:32:35.000000000 -0500
 @@ -88,6 +88,13 @@
  #define XVendorManNameString XFree86
  #endif
@@ -22,9 +16,9 @@
 +VENDORMANVERSION = XVendorManVersionString
 +
 +#ifndef VendorManDefs
-+#define VendorManDefs -D__vendorversion__="\"Version $(VENDORMANVERSION)\" 
$(VENDORMANNAME)"
++#define VendorManDefs -D__vendorversion__="\"$(VENDORMANVERSION)\" 
$(VENDORMANNAME)"
 +#endif
-+      
++
  /*
   * This enables some settings for developers.
   */


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to