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

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



Author: branden
Date: 2005-02-09 02:00:07 -0500 (Wed, 09 Feb 2005)
New Revision: 2174

Removed:
   trunk/debian/xprt.install
Modified:
   trunk/debian/CHANGESETS
   trunk/debian/MANIFEST.alpha.in
   trunk/debian/MANIFEST.amd64.in
   trunk/debian/MANIFEST.arm.in
   trunk/debian/MANIFEST.hppa.in
   trunk/debian/MANIFEST.hurd-i386.in
   trunk/debian/MANIFEST.i386.in
   trunk/debian/MANIFEST.ia64.in
   trunk/debian/MANIFEST.m68k.in
   trunk/debian/MANIFEST.mips.in
   trunk/debian/MANIFEST.mipsel.in
   trunk/debian/MANIFEST.powerpc.in
   trunk/debian/MANIFEST.s390.in
   trunk/debian/MANIFEST.sparc.in
   trunk/debian/TODO
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/copyright
   trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
   trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
   trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
   trunk/debian/patches/099s_selinux_support.diff
   trunk/debian/patches/600_amd64_support.diff
   trunk/debian/rules
   trunk/debian/scripts/prune-non-free
Log:
Apply patch from Steve Langasek to drop the xprt package, and stop
building the Xprt X server, since this functionality did not work in any
version of XFree86 up to 4.3.0, and has moved to the xprt-xprintorg
package.  (The client-side Xp library is still built.)  Thanks, Steve!
+ Update patch #003 to #define XprtServer NO and BuildXprintLib YES on
  Debian systems.  Resync patches #004, #099c, #099s, and #600.
+ Update rules file to stop turning off the build of Xprt in the server
  debug target, since that's now redundant.
+ Update MANIFEST files to reflect the fact that Xprt is no longer built.
+ Remove xprt package's stanza from debian/control.
+ Remove debian/xprt.install debhelper file.

Remove delcaration of non-DFSG-freeness of the Compugraphic and Adobe
fonts (shipped as part of the Xprt server) from debian/copyright.  Update
the prune-non-free script to stop removing these files from the upstream
archive.  Roland Mainz has argued fairly persuasively on the debian-x
mailing list that the fonts were in fact freely licensed.  In the event
Mr. Mainz is wrong, the point is pretty close to void, since 1) Xprt is
not being built or shipped anymore; 2) this change does not restore the
files in question to the .orig.tar.gz; 3) the X Strike Force doesn't
anticipate shipping these files in the future X.Org packages, either.


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/CHANGESETS	2005-02-09 07:00:07 UTC (rev 2174)
@@ -268,4 +268,26 @@
   (Closes: #277832, #291787)
     2173
 
+Apply patch from Steve Langasek to drop the xprt package, and stop
+building the Xprt X server, since this functionality did not work in any
+version of XFree86 up to 4.3.0, and has moved to the xprt-xprintorg
+package.  (The client-side Xp library is still built.)  Thanks, Steve!
++ Update patch #003 to #define XprtServer NO and BuildXprintLib YES on
+  Debian systems.  Resync patches #004, #099c, #099s, and #600.
++ Update rules file to stop turning off the build of Xprt in the server
+  debug target, since that's now redundant.
++ Update MANIFEST files to reflect the fact that Xprt is no longer built.
++ Remove xprt package's stanza from debian/control.
++ Remove debian/xprt.install debhelper file.
+Remove delcaration of non-DFSG-freeness of the Compugraphic and Adobe
+fonts (shipped as part of the Xprt server) from debian/copyright.  Update
+the prune-non-free script to stop removing these files from the upstream
+archive.  Roland Mainz has argued fairly persuasively on the debian-x
+mailing list that the fonts were in fact freely licensed.  In the event
+Mr. Mainz is wrong, the point is pretty close to void, since 1) Xprt is
+not being built or shipped anymore; 2) this change does not restore the
+files in question to the .orig.tar.gz; 3) the X Strike Force doesn't
+anticipate shipping these files in the future X.Org packages, either.
+    2174
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.alpha.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.amd64.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.arm.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.hppa.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.hurd-i386.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.i386.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.ia64.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.m68k.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.mips.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.mipsel.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.powerpc.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.s390.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -433,7 +433,6 @@
 usr/X11R6/bin/X
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/MANIFEST.sparc.in	2005-02-09 07:00:07 UTC (rev 2174)
@@ -440,7 +440,6 @@
 usr/X11R6/bin/XFree86-debug
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
-usr/X11R6/bin/Xprt
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm

Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/TODO	2005-02-09 07:00:07 UTC (rev 2174)
@@ -22,9 +22,6 @@
     /usr/share/bug/$PACKAGE/script (renaming in SVN from $PACKAGE.bug to
     $PACKAGE.bug.script).
   + Add $PACKAGE.bug.presubj files wherever necessary.
-* Stop building Xprt, stop shipping the xprt package, and update discussion of
-  removed files from that part of the tree in debian/copyright.  (Also, reassign
-  all its bugs to xprt-xprintorg.)
 
 4.3.0.dfsg.1-12
 ---------------

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/changelog	2005-02-09 07:00:07 UTC (rev 2174)
@@ -204,8 +204,30 @@
   * Fix validate-posix-sh script to stop pretending that ash and dash are
     different shells -- in Debian, they're not.
 
- -- Branden Robinson <branden@debian.org>  Tue,  8 Feb 2005 12:03:29 -0500
+  * Apply patch from Steve Langasek to drop the xprt package, and stop
+    building the Xprt X server, since this functionality did not work in any
+    version of XFree86 up to 4.3.0, and has moved to the xprt-xprintorg
+    package.  (The client-side Xp library is still built.)  Thanks, Steve!
+    + Update patch #003 to #define XprtServer NO and BuildXprintLib YES on
+      Debian systems.  Resync patches #004, #099c, #099s, and #600.
+    + Update rules file to stop turning off the build of Xprt in the server
+      debug target, since that's now redundant.
+    + Update MANIFEST files to reflect the fact that Xprt is no longer built.
+    + Remove xprt package's stanza from debian/control.
+    + Remove debian/xprt.install debhelper file.
 
+  * Remove delcaration of non-DFSG-freeness of the Compugraphic and Adobe
+    fonts (shipped as part of the Xprt server) from debian/copyright.  Update
+    the prune-non-free script to stop removing these files from the upstream
+    archive.  Roland Mainz has argued fairly persuasively on the debian-x
+    mailing list that the fonts were in fact freely licensed.  In the event
+    Mr. Mainz is wrong, the point is pretty close to void, since 1) Xprt is
+    not being built or shipped anymore; 2) this change does not restore the
+    files in question to the .orig.tar.gz; 3) the X Strike Force doesn't
+    anticipate shipping these files in the future X.Org packages, either.
+
+ -- Branden Robinson <branden@debian.org>  Wed,  9 Feb 2005 01:54:04 -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/control
===================================================================
--- trunk/debian/control	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/control	2005-02-09 07:00:07 UTC (rev 2174)
@@ -1562,19 +1562,6 @@
  .
  Xnest relies upon its parent X server for font services.
 
-Package: xprt
-Architecture: any
-Depends: xprt-common, ${shlibs:Depends}, ${misc:Depends}
-Description: X print server (XFree86 version)
- Xprt provides an X server with the print extension and special DDX
- (Device-Dependent X) implementation.
- .
- This package provides Xprt, the Xprint server from XFree86.  Note that this
- version is buggy and does not work with Mozilla.  You should install
- xprt-xprintorg instead, which provides full support for printing from
- mozilla, including non-latin characters and MathML.  Improvement of XFree86's
- version of the Xprint server is expected in a future release.
-
 Package: xserver-common
 Architecture: any
 Depends: debconf (>= 1.0.21), xfree86-common (>= 4.2.1-5), ${shlibs:Depends}, ${misc:Depends}

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/copyright	2005-02-09 07:00:07 UTC (rev 2174)
@@ -145,134 +145,7 @@
     xc/fonts/scaled/Type1/UTRG____.afm
     xc/fonts/scaled/Type1/UTRG____.pfa
 
-  6) The Compugraphic and Adobe fonts distributed as part of the XPrint
-     server are not licensed at all, and some of the fonts bear no
-     copyright information whatsoever.
-
-         All Rights Reserved.
-
-    These font files therefore do not satisfy DFSG 1 ("Free
-    Redistribution"), DFSG 2 ("Source Code"), or DFSG 3 ("Derived Works").
-
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-Book.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-BookOblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-Demi.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-DemiOblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-Bold.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-BoldOblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-Oblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-Book.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-BookOblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-Demi.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-DemiOblique.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Bold.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-BoldItalic.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Italic.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Roman.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-Demi.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-DemiItalic.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-Light.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-LightItalic.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Symbol.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Bold.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Italic.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Roman.pmf
-    xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/ZapfDingbats.pmf
-
-  7) VA Linux Systems, Inc.'s DRI documentation has a license which prohibits
+  6) VA Linux Systems, Inc.'s DRI documentation has a license which prohibits
      free modification:
 
         Permission is granted to make and distribute verbatim copies of
@@ -287,7 +160,7 @@
     xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
     xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
 
-  8) The following files contain object code without any corresponding
+  7) The following files contain object code without any corresponding
      source.
 
     xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h

Modified: trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff	2005-02-09 07:00:07 UTC (rev 2174)
@@ -16,8 +16,10 @@
 
 Enhanced Glide3 support in part by Guillem Jover.
 
-Not submitted to XFree86.
+Xprt (semi-)disabled courtesy of Steve Langasek.
 
+Not submitted to XFree86 or X.Org yet.
+
 --- xc/config/cf/linux.cf~	2004-07-21 00:52:07.000000000 -0500
 +++ xc/config/cf/linux.cf	2004-07-21 00:54:17.000000000 -0500
 @@ -93,17 +93,23 @@
@@ -46,7 +48,7 @@
  # define XF86SetupUsesStaticTcl	NO
  /* un-comment this when it is un-broken */
  /* # define JoystickSupport YES */
-@@ -142,43 +148,102 @@
+@@ -142,43 +148,108 @@
  #   define BuilderEMailAddr		"debian-x@lists.debian.org"
  #  endif
  #  define XFree86Devel			YES
@@ -83,6 +85,12 @@
 +#  define BuildTrueTypeFonts		NO
 +#  define BuildBethMarduthoFonts	NO
 +/*
++ * The XFree86 Debian package no longer builds the Xprt server, in favor
++ * of a separate xprt-xprintorg package.  We do still build the library.
++ */
++#  define XprtServer			NO
++#  define BuildXprintLib		YES
++/*
 + * The XFree86 Debian package build-depends on external Expat, Fontconfig,
 + * Freetype, Render, Xcursor, and Xft libraries.
 + */
@@ -167,7 +175,7 @@
  #   endif /* i386Architecture */
  # endif /* DebianMaintainer */
  #endif /* LinuxDebian */
-@@ -649,10 +714,10 @@
+@@ -649,10 +720,10 @@
  # if UseElfFormat
  #  ifdef AlphaArchitecture
  #   define CcCmd		gcc -b alpha-linux
@@ -179,7 +187,7 @@
  #  endif /* AlphaArchitecture */
  #  ifdef HPArchitecture
  #   define CcCmd		gcc
-@@ -664,10 +729,10 @@
+@@ -664,10 +735,10 @@
  #  endif /* HPArchitecture */
  #  ifdef i386Architecture
  #   define CcCmd		gcc -b i486-linux
@@ -191,7 +199,7 @@
  #  endif /* i386Architecture */
  #  ifdef ia64Architecture
  #   define CcCmd		gcc
-@@ -678,29 +743,30 @@
+@@ -678,29 +749,30 @@
  #  endif /* ia64Architecture */
  #  ifdef Mc68020Architecture
  #   define CcCmd		gcc -b m68k-linux
@@ -230,7 +238,7 @@
  #   define DoLoadableServer	NO
  #  else
  #   define DoLoadableServer	YES
-@@ -745,7 +811,7 @@
+@@ -745,7 +817,7 @@
  
  #ifdef AlphaArchitecture
  # ifndef OptimizedCDebugFlags
@@ -239,7 +247,7 @@
  # endif
  # define LinuxMachineDefines	-D__alpha__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -758,7 +824,7 @@
+@@ -758,7 +830,7 @@
  #ifdef Arm32Architecture
  # define DefaultCCOptions	-fsigned-char
  # ifndef OptimizedCDebugFlags
@@ -248,7 +256,7 @@
  # endif
  # define LinuxMachineDefines	-D__arm__ -D__arm32__ -U__arm -Uarm
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -766,7 +832,9 @@
+@@ -766,7 +838,9 @@
  #endif /* Arm32Achitecture */
  
  #ifdef HPArchitecture
@@ -259,7 +267,7 @@
  # define LinuxMachineDefines	-D__hppa__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
  # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-@@ -774,7 +842,7 @@
+@@ -774,7 +848,7 @@
  
  #ifdef i386Architecture
  # ifndef OptimizedCDebugFlags
@@ -268,7 +276,7 @@
  # endif
  # define LinuxMachineDefines	-D__i386__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -783,7 +851,7 @@
+@@ -783,7 +857,7 @@
  
  #ifdef ia64Architecture
  # ifndef OptimizedCDebugFlags
@@ -277,7 +285,7 @@
  # endif
  # define LinuxMachineDefines	-D__ia64__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -792,7 +860,7 @@
+@@ -792,7 +866,7 @@
  
  #ifdef Mc68020Architecture
  # ifndef OptimizedCDebugFlags
@@ -286,7 +294,7 @@
  # endif
  # define LinuxMachineDefines	-D__mc68000__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -801,7 +869,7 @@
+@@ -801,7 +875,7 @@
  
  #ifdef MipsArchitecture
  # ifndef OptimizedCDebugFlags
@@ -295,7 +303,7 @@
  # endif
  # define LinuxMachineDefines	-D__mips__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -811,7 +879,7 @@
+@@ -811,7 +885,7 @@
  #ifdef PpcArchitecture
  # define DefaultCCOptions	-fsigned-char
  # ifndef OptimizedCDebugFlags
@@ -304,7 +312,7 @@
  # endif
  # define LinuxMachineDefines	-D__powerpc__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -820,7 +888,7 @@
+@@ -820,7 +894,7 @@
  
  #ifdef s390Architecture
  # ifndef OptimizedCDebugFlags
@@ -313,7 +321,7 @@
  # endif
  # define LinuxMachineDefines	-D__s390__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -828,16 +896,17 @@
+@@ -828,16 +902,17 @@
  #endif /* s390Architecture */
  
  #ifdef s390xArchitecture
@@ -337,7 +345,7 @@
  # endif
  # define LinuxMachineDefines	-D__sparc__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -859,7 +928,7 @@
+@@ -859,7 +934,7 @@
  #  else
  #   define SuperHArchOptFlags	-m3
  #  endif
@@ -346,7 +354,7 @@
  # ifndef SuperHebArchitecture
  #  ifdef SuperHebArchitecture
  #   define SuperHEndianFlags	-mb
-@@ -868,7 +937,7 @@
+@@ -868,7 +943,7 @@
  #  endif
  # endif
  # ifndef OptimizedCDebugFlags

Modified: trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- trunk/debian/patches/004_imake_manpage_handling_overhaul.diff	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/patches/004_imake_manpage_handling_overhaul.diff	2005-02-09 07:00:07 UTC (rev 2174)
@@ -308,7 +308,7 @@
  /* The TT/Meltho fonts are all under non-free licenses. */
  #  define BuildTrueTypeFonts		NO
  #  define BuildBethMarduthoFonts	NO
-@@ -986,26 +987,6 @@
+@@ -992,26 +993,6 @@
  # define ConnectionFlags	-DUNIXCONN -DTCPCONN
  #endif
  

Modified: trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff	2005-02-09 07:00:07 UTC (rev 2174)
@@ -12,7 +12,7 @@
 
 --- xc/config/cf/linux.cf~	2004-07-21 01:11:34.000000000 -0500
 +++ xc/config/cf/linux.cf	2004-07-21 01:11:37.000000000 -0500
-@@ -198,6 +198,8 @@
+@@ -204,6 +204,8 @@
  #  define HasRenderLibrary		YES
  #  define BuildXcursorLibrary		NO
  #  define HasXcursorLibrary		YES

Modified: trunk/debian/patches/099s_selinux_support.diff
===================================================================
--- trunk/debian/patches/099s_selinux_support.diff	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/patches/099s_selinux_support.diff	2005-02-09 07:00:07 UTC (rev 2174)
@@ -59,7 +59,7 @@
  #else
 --- xc/config/cf/linux.cf~	2005-01-12 11:55:59.000000000 -0500
 +++ xc/config/cf/linux.cf	2005-01-12 11:56:26.000000000 -0500
-@@ -1036,3 +1036,57 @@
+@@ -1042,3 +1042,57 @@
  #ifndef XFree86ServerOSDefines
  # define XFree86ServerOSDefines
  #endif

Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/patches/600_amd64_support.diff	2005-02-09 07:00:07 UTC (rev 2174)
@@ -25,7 +25,7 @@
 
 --- xc/config/cf/linux.cf~	2004-07-21 01:16:52.000000000 -0500
 +++ xc/config/cf/linux.cf	2004-07-21 01:17:03.000000000 -0500
-@@ -589,7 +589,7 @@
+@@ -595,7 +595,7 @@
  #define MkdirHierCmd		mkdir -p
  
  #ifndef HaveLib64

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/rules	2005-02-09 07:00:07 UTC (rev 2174)
@@ -69,7 +69,7 @@
 IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"'
 # XXX: replace -DDefaultGcc2OptimizeOpt=-O0 with $(DEBUGFLAGS) when the time
 # comes (see above)
-SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXprtServer=NO -DDefaultGcc2OptimizeOpt=-O0
+SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DDefaultGcc2OptimizeOpt=-O0
 
 # If this is an official build, set the BuilderEMailAddr that gets displayed in
 # some error messages.

Modified: trunk/debian/scripts/prune-non-free
===================================================================
--- trunk/debian/scripts/prune-non-free	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/scripts/prune-non-free	2005-02-09 07:00:07 UTC (rev 2174)
@@ -99,124 +99,6 @@
 rm -f xc/fonts/scaled/Type1/UTRG____.afm
 rm -f xc/fonts/scaled/Type1/UTRG____.pfa
 
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-Book.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-BookOblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-Demi.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-DemiOblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-Bold.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-BoldOblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-Oblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-Book.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-BookOblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-Demi.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-DemiOblique.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Bold.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-BoldItalic.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Italic.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Roman.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-Demi.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-DemiItalic.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-Light.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-LightItalic.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Symbol.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Bold.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Italic.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Roman.pmf
-rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/ZapfDingbats.pmf
-
 rm -f xc/programs/Xserver/hw/xfree86/doc/README.DRI
 rm -f xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp
 rm -f xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml

Deleted: trunk/debian/xprt.install
===================================================================
--- trunk/debian/xprt.install	2005-02-08 17:06:43 UTC (rev 2173)
+++ trunk/debian/xprt.install	2005-02-09 07:00:07 UTC (rev 2174)
@@ -1 +0,0 @@
-usr/X11R6/bin/Xprt



Reply to: