here is an updated patch 908 for 4.2.99.3
I didn't see any information about starting work on getting xfree 4.3 packaged
on the X Strike Force page. Therefore, I am taking a little initiative and
looking at patches in the 4.2 and bringing the >=900 patches up to speed with
4.3. The build system apparently tries to apply patches from the old-patches
directory. What is the proper way to shuffle patches around in the
debian/patches and debian/old-patches directories? I actually just copied the
patches dir from the 4.2.1 sources to the old-patches dir of the 4.2.99.3
package dir. Of course there are lots of conflicts. Should I dump the
conflicting patches that do not deal with debian or what?
--
Treasurer, GOLUM, Inc.
http://www.golum.org
Non-freely-licensed files aren't shipped in the source package, so do not
try to do anything with them.
--- xc/fonts/scaled/Imakefile.orig Mon Jun 10 00:14:55 2002
+++ xc/fonts/scaled/Imakefile Mon Jun 10 00:15:05 2002
@@ -18,7 +18,7 @@
CIDDIR = CID
#endif
#if BuildTrueTypeFonts
-TTFDIR = TTF
+TTFDIR = /* TTF */
#endif
SUBDIRS = $(SPEEDODIR) $(TYPE1DIR) $(CIDDIR) $(TTFDIR)
--- xc/fonts/scaled/Type1/Imakefile~ Sat Jun 23 05:59:33 2001
+++ xc/fonts/scaled/Type1/Imakefile Sat Jun 23 06:00:32 2001
@@ -8,25 +8,13 @@
#define PassCDebugFlags /* as nothing */
-FONTS = UTRG____.pfa UTB_____.pfa UTBI____.pfa UTI_____.pfa \
- cour.pfa courb.pfa courbi.pfa couri.pfa \
- c0648bt_.pfb c0649bt_.pfb c0632bt_.pfb c0633bt_.pfb \
+FONTS = c0648bt_.pfb c0649bt_.pfb c0632bt_.pfb c0633bt_.pfb \
c0419bt_.pfb c0582bt_.pfb c0583bt_.pfb c0611bt_.pfb cursor.pfa
-AFMS = UTRG____.afm UTB_____.afm UTBI____.afm UTI_____.afm \
- cour.afm courb.afm courbi.afm couri.afm \
- c0648bt_.afm c0649bt_.afm c0632bt_.afm c0633bt_.afm \
+AFMS = c0648bt_.afm c0649bt_.afm c0632bt_.afm c0633bt_.afm \
c0419bt_.afm c0582bt_.afm c0583bt_.afm c0611bt_.afm
-BHFONTS = l047013t.pfa l047036t.pfa l048033t.pfa l049016t.pfa \
- l047016t.pfa l048013t.pfa l048036t.pfa l049033t.pfa \
- l047033t.pfa l048016t.pfa l049013t.pfa l049036t.pfa
-
-BHAFMS = l047013t.afm l047036t.afm l048033t.afm l049016t.afm \
- l047016t.afm l048013t.afm l048036t.afm l049033t.afm \
- l047033t.afm l048016t.afm l049013t.afm l049036t.afm
-
-OBJS = $(FONTS) $(BHFONTS) $(AFMS) $(BHAFMS)
+OBJS = $(FONTS) $(AFMS)
FONTINSTDIR = $(FONTDIR)/Type1
--- xc/fonts/scaled/Type1/fonts.scale~ Sat Jun 23 05:59:36 2001
+++ xc/fonts/scaled/Type1/fonts.scale Sat Jun 23 06:00:54 2001
@@ -1,24 +1,4 @@
-89
-UTRG____.pfa -adobe-utopia-medium-r-normal--0-0-0-0-p-0-iso8859-1
-UTI_____.pfa -adobe-utopia-medium-i-normal--0-0-0-0-p-0-iso8859-1
-UTB_____.pfa -adobe-utopia-bold-r-normal--0-0-0-0-p-0-iso8859-1
-UTBI____.pfa -adobe-utopia-bold-i-normal--0-0-0-0-p-0-iso8859-1
-cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-1
-cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-2
-cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-3
-cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-9
-couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-1
-couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-2
-couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-3
-couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-9
-courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-1
-courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-2
-courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-3
-courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-9
-courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1
-courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-2
-courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-3
-courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-9
+9
c0648bt_.pfb -bitstream-charter-medium-r-normal--0-0-0-0-p-0-iso8859-1
c0649bt_.pfb -bitstream-charter-medium-i-normal--0-0-0-0-p-0-iso8859-1
c0632bt_.pfb -bitstream-charter-bold-r-normal--0-0-0-0-p-0-iso8859-1
@@ -28,63 +8,3 @@
c0583bt_.pfb -bitstream-courier-bold-r-normal--0-0-0-0-m-0-iso8859-1
c0611bt_.pfb -bitstream-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1
cursor.pfa -xfree86-cursor-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
-l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
-l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-2
-l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-9
-l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-15
-l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-adobe-standard
-l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-1
-l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-2
-l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-9
-l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-15
-l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-adobe-standard
-l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-1
-l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-2
-l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-9
-l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-15
-l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-adobe-standard
-l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-1
-l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-2
-l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-9
-l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-15
-l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-adobe-standard
-l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
-l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-2
-l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-9
-l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15
-l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-adobe-standard
-l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-1
-l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-2
-l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-9
-l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-15
-l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-adobe-standard
-l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-1
-l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-2
-l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-9
-l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-15
-l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-adobe-standard
-l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1
-l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-2
-l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-9
-l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-15
-l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-adobe-standard
-l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-1
-l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-2
-l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-9
-l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-15
-l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-adobe-standard
-l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
-l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-2
-l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9
-l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15
-l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-adobe-standard
-l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-1
-l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-2
-l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-9
-l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-15
-l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-adobe-standard
-l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-1
-l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-2
-l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-9
-l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-15
-l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-adobe-standard
--- xc/programs/Xserver/hw/xfree86/doc/Imakefile~ 2002-09-02 23:23:38.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/doc/Imakefile 2002-09-02 23:24:03.000000000 -0500
@@ -83,12 +83,7 @@
OTHERDOCS = /*VideoModes.doc*/ /*QuickStart.doc*/ /*xinput*/ \
ReadmeFile(fonts) \
ReadmeFile(mouse) \
- ReadmeFile(DGA) \
- ReadmeFile(DRI) \
- ReadmeFile(DRIcomp) \
- ReadmeFile(dps) \
- ReadmeFile(XKB-Config) \
- ReadmeFile(XKB-Enhancing)
+ ReadmeFile(dps)
#endif
MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) \
Reply to: