Author: branden
Date: 2003-06-10 23:43:13 -0500 (Tue, 10 Jun 2003)
New Revision: 176
Added:
trunk/debian/patches/001b_m68k_haslinuxinput_too.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/077_man_dir_and_suffix_cleanup.diff
trunk/debian/patches/085_bigass_imake_manpage_handling_overhaul.diff
trunk/debian/patches/100_sparc_pci_domains.diff
Log:
* debian/patches/100_sparc_pci_domains.diff: remove special-case logic in
linux.cf that defined "HasLinuxInput" to "NO" for Mc68020Architecture;
m68k is now supported by the Linux 2.4.20 kernel (at least in Debian), so
we let this symbol be defined to "YES" just like all the other
architectures. This only really affects the Wacom input driver and
should not cause any regressions. (thanks to James Troup for pointing
out this no-longer-needed conditional)
* debian/patches/085_bigass_imake_manpage_handling_overhaul.diff,
debian/patches/077_man_dir_and_suffix_cleanup.diff,
debian/patches/100_sparc_pci_domains.diff: resync
Modified: trunk/debian/patches/100_sparc_pci_domains.diff
==============================================================================
--- trunk/debian/patches/100_sparc_pci_domains.diff 2003-06-10 20:45:46 UTC
(rev 175)
+++ trunk/debian/patches/100_sparc_pci_domains.diff 2003-06-11 04:43:13 UTC
(rev 176)
@@ -2,7 +2,7 @@
--- xc/config/cf/linux.cf.orig 2002-09-07 03:43:34.000000000 -0500
+++ xc/config/cf/linux.cf 2002-09-07 03:43:35.000000000 -0500
-@@ -774,7 +774,7 @@
+@@ -771,7 +771,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
Added: trunk/debian/patches/001b_m68k_haslinuxinput_too.diff
==============================================================================
--- trunk/debian/patches/001b_m68k_haslinuxinput_too.diff 2003-06-10
20:45:46 UTC (rev 175)
+++ trunk/debian/patches/001b_m68k_haslinuxinput_too.diff 2003-06-11
04:43:13 UTC (rev 176)
@@ -0,0 +1,14 @@
+--- xc/config/cf/linux.cf~ 2003-06-10 23:10:58.000000000 -0500
++++ xc/config/cf/linux.cf 2003-06-10 23:11:45.000000000 -0500
+@@ -157,10 +157,7 @@
+ /* we build-depend on libfreetype6-dev (FreeType 2.x) */
+ # define BuildFreetype2Library NO
+ # define HasFreetype2 YES
+-/* m68k has no 2.4 kernel yet */
+-# ifndef Mc68020Architecture
+-# define HasLinuxInput YES
+-# endif
++# define HasLinuxInput YES
+ # define HasXdmAuth YES
+ # define HasLatex YES
+ /* at present, glide2 only works on i386 */
Modified: trunk/debian/patches/085_bigass_imake_manpage_handling_overhaul.diff
==============================================================================
--- trunk/debian/patches/085_bigass_imake_manpage_handling_overhaul.diff
2003-06-10 20:45:46 UTC (rev 175)
+++ trunk/debian/patches/085_bigass_imake_manpage_handling_overhaul.diff
2003-06-11 04:43:13 UTC (rev 176)
@@ -377,7 +377,7 @@
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
-@@ -834,38 +835,6 @@
+@@ -831,38 +832,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: trunk/debian/patches/077_man_dir_and_suffix_cleanup.diff
==============================================================================
--- trunk/debian/patches/077_man_dir_and_suffix_cleanup.diff 2003-06-10
20:45:46 UTC (rev 175)
+++ trunk/debian/patches/077_man_dir_and_suffix_cleanup.diff 2003-06-11
04:43:13 UTC (rev 176)
@@ -122,7 +122,7 @@
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
--- xc/config/cf/linux.cf.orig 2002-09-07 03:40:05.000000000 -0500
+++ xc/config/cf/linux.cf 2002-09-07 03:40:07.000000000 -0500
-@@ -844,8 +844,14 @@
+@@ -841,8 +841,14 @@
#ifndef LibManSuffix
# define LibManSuffix 3x
#endif
@@ -139,7 +139,7 @@
#endif
#ifndef FileManSuffix
# define FileManSuffix 5x
-@@ -853,6 +859,12 @@
+@@ -850,6 +856,12 @@
#ifndef FileManDir
# define FileManDir $(MANSOURCEPATH)5
#endif
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-06-10 20:45:46 UTC (rev 175)
+++ trunk/debian/changelog 2003-06-11 04:43:13 UTC (rev 176)
@@ -1,5 +1,12 @@
xfree86 (4.2.1-9) unstable; urgency=low
+ * patch #001b: remove special-case logic in linux.cf that defined
+ "HasLinuxInput" to "NO" for Mc68020Architecture; m68k is now supported by
+ the Linux 2.4.20 kernel (at least in Debian), so we let this symbol be
+ defined to "YES" just like all the other architectures. This only really
+ affects the Wacom input driver and should not cause any regressions.
+ (thanks to James Troup for pointing out this no-longer-needed conditional)
+
* debian/control: move xlibs-pic from section devel to section libdevel
(syncrhonize with Debian archive override file)
* debian/rules: replace presently-useless $(DEBUGFLAGS) variable in
@@ -13,7 +20,7 @@
manpage, penmount manpage
- tdfx driver name corrected to tdfx_drv
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 10 Jun 2003 11:19:48 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 10 Jun 2003 23:38:36 -0500
xfree86 (4.2.1-8) unstable; urgency=high
