X Strike Force XOrg SVN commit: r55 - in xorg-config/trunk/debian: . patches
Author: fabbione
Date: 2004-10-19 07:38:54 -0500 (Tue, 19 Oct 2004)
New Revision: 55
Added:
xorg-config/trunk/debian/patches/060_fix_XOrgManDefs.diff
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
xorg-config/trunk/debian/patches/600_amd64_support.diff
xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff
Log:
* Fix creation of man pages:
+ Add 060_fix_XOrgManDefs.diff to actually define something to put into
release strings and Co.
+ Modify 003_linux.cf_and_xfree86.cf.diff to force man page preprocessing for
DebianMainter.
+ Rediff several patches.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-19 08:45:53 UTC (rev 54)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-19 12:38:54 UTC (rev 55)
@@ -98,4 +98,12 @@
that defines ProjectManSuffix.
53
+* Fix creation of man pages:
+ + Add 060_fix_XOrgManDefs.diff to actually define something to put into
+ release strings and Co.
+ + Modify 003_linux.cf_and_xfree86.cf.diff to force man page preprocessing for
+ DebianMainter.
+ + Rediff several patches.
+ 55
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2004-10-19 08:45:53 UTC (rev 54)
+++ xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2004-10-19 12:38:54 UTC (rev 55)
@@ -19,8 +19,8 @@
Not submitted to XFree86.
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
---- xc-old/config/cf/linux.cf 2004-10-19 10:29:15.764727000 +0200
-+++ xc/config/cf/linux.cf 2004-10-19 10:31:23.918245648 +0200
+--- xc-old/config/cf/linux.cf 2004-10-19 13:13:13.016238000 +0200
++++ xc/config/cf/linux.cf 2004-10-19 13:14:54.876753248 +0200
@@ -104,7 +104,23 @@
# if !NothingOutsideProjectRoot
# define SystemManDirectory /usr/share/man
@@ -45,7 +45,7 @@
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
# if !NothingOutsideProjectRoot
-@@ -149,43 +165,93 @@
+@@ -149,43 +165,95 @@
# define BuilderEMailAddr "debian-x@lists.debian.org"
# endif
# define XFree86Devel YES
@@ -71,6 +71,8 @@
-# ifndef Mc68020Architecture
-# define HasLinuxInput YES
-# endif
++/* Force Manpage preprocessing when using -DUseInstalled */
++# define DontPreprocessManPages NO
+/*
+ * The XFree86 Debian package uses a local patch that defines a
+ * PicLibraryTarget() Imake rule, instead of using upstream's method.
@@ -156,7 +158,7 @@
# endif /* i386Architecture */
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -673,10 +739,10 @@
+@@ -673,10 +741,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -168,7 +170,7 @@
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -688,10 +754,10 @@
+@@ -688,10 +756,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -180,7 +182,7 @@
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -702,29 +768,30 @@
+@@ -702,29 +770,30 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -219,7 +221,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -791,7 +858,7 @@
+@@ -791,7 +860,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -228,7 +230,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -804,7 +871,7 @@
+@@ -804,7 +873,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -237,7 +239,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -812,7 +879,9 @@
+@@ -812,7 +881,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -248,7 +250,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -820,7 +889,7 @@
+@@ -820,7 +891,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -257,7 +259,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -829,7 +898,7 @@
+@@ -829,7 +900,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -266,7 +268,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -838,7 +907,7 @@
+@@ -838,7 +909,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -275,7 +277,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -847,7 +916,7 @@
+@@ -847,7 +918,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -284,7 +286,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -857,7 +926,7 @@
+@@ -857,7 +928,7 @@
#ifdef Ppc64Architecture
# define DefaultCCOptions -fsigned-char -mminimal-toc
# ifndef OptimizedCDebugFlags
@@ -293,7 +295,7 @@
# endif
# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -867,7 +936,7 @@
+@@ -867,7 +938,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -302,7 +304,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -876,7 +945,7 @@
+@@ -876,7 +947,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -311,7 +313,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -884,16 +953,17 @@
+@@ -884,16 +955,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -335,7 +337,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -924,7 +994,7 @@
+@@ -924,7 +996,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
@@ -346,7 +348,7 @@
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
diff -ruN xc-old/config/cf/xfree86.cf xc/config/cf/xfree86.cf
--- xc-old/config/cf/xfree86.cf 2004-07-07 01:50:59.000000000 +0200
-+++ xc/config/cf/xfree86.cf 2004-10-19 10:29:15.827718368 +0200
++++ xc/config/cf/xfree86.cf 2004-10-19 13:13:13.096226240 +0200
@@ -233,6 +233,11 @@
#define GlideDriver /**/
#endif
Modified: xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-10-19 08:45:53 UTC (rev 54)
+++ xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-10-19 12:38:54 UTC (rev 55)
@@ -250,7 +250,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 17:49:32.103541000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 17:51:15.257860024 +0200
-@@ -183,6 +183,7 @@
+@@ -185,6 +185,7 @@
*/
# define StaticNeedsPicForShared NO
# define KernelVersionInBanner YES
@@ -258,7 +258,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -1043,26 +1044,6 @@
+@@ -1045,26 +1046,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Added: xorg-config/trunk/debian/patches/060_fix_XOrgManDefs.diff
===================================================================
--- xorg-config/trunk/debian/patches/060_fix_XOrgManDefs.diff 2004-10-19 08:45:53 UTC (rev 54)
+++ xorg-config/trunk/debian/patches/060_fix_XOrgManDefs.diff 2004-10-19 12:38:54 UTC (rev 55)
@@ -0,0 +1,22 @@
+$Id$
+
+Fix XOrgManDefs to include proper information when building man pages.
+
+This patch by Fabio M. Di Nitto.
+
+diff -ruN xc-old/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc-old/config/cf/X11.tmpl 2004-10-19 14:01:31.339626000 +0200
++++ xc/config/cf/X11.tmpl 2004-10-19 14:22:53.225749960 +0200
+@@ -65,8 +65,11 @@
+ # define XOrgWebSupportAddress http://wiki.X.Org
+ #endif
+
++XORGRELSTRING = XorgVersionString
++ XORGMANNAME = XOrgManNameString
++
+ #ifndef XOrgManDefs
+-#define XOrgManDefs -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
++#define XOrgManDefs -D__xorgversion__="$(XORGRELSTRING) Release"' "$(XORGMANNAME)"'
+ #endif
+
+ #ifndef XVendorManNameString
Property changes on: xorg-config/trunk/debian/patches/060_fix_XOrgManDefs.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-19 08:45:53 UTC (rev 54)
+++ xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-19 12:38:54 UTC (rev 55)
@@ -13,7 +13,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:14:34.492276000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:15:09.864899352 +0200
-@@ -207,6 +207,8 @@
+@@ -209,6 +209,8 @@
# define HasRenderLibrary YES
# define BuildXcursorLibrary NO
# define HasXcursorLibrary YES
Modified: xorg-config/trunk/debian/patches/600_amd64_support.diff
===================================================================
--- xorg-config/trunk/debian/patches/600_amd64_support.diff 2004-10-19 08:45:53 UTC (rev 54)
+++ xorg-config/trunk/debian/patches/600_amd64_support.diff 2004-10-19 12:38:54 UTC (rev 55)
@@ -19,7 +19,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:39:52.737468000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:41:57.429512384 +0200
-@@ -619,7 +619,7 @@
+@@ -621,7 +621,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Modified: xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff
===================================================================
--- xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff 2004-10-19 08:45:53 UTC (rev 54)
+++ xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff 2004-10-19 12:38:54 UTC (rev 55)
@@ -7,10 +7,10 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 15:43:01.980415000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 15:48:13.609041216 +0200
-@@ -174,6 +174,14 @@
- # define RmanCmd /usr/bin/rman
- # define RmanOptions /**/
+@@ -176,6 +176,14 @@
# define BuildHtmlManPages NO
+ /* Force Manpage preprocessing when using -DUseInstalled */
+ # define DontPreprocessManPages NO
+/* Kill X11 and X11R6 */
+# define ProjectRoot /usr
+# define XTop $(TOP)
Reply to: