Disable Xprt building
Attached patch disables building Xprt server and generation of xprt
package. Changes:
* Remove xprt from debian/control
* Add debian/patches/009_disable_Xprt.diff, disabling Xprt and Xprt man
page build/install
* Remove -DXprtServer=NO from SERVER_DEBUG_IMAKE_DEFINES in
debian/rules as it is now redundant
* Update MANIFEST.*.in
* Remove xprt.install
* Upfuzzy 2 patches fuzzied by 009_disable_Xprt.diff
Mostly derived from xfree86 package.
diff -Nru debian.orig/control debian/control
--- debian.orig/control 2005-07-04 02:51:43.000000000 +0800
+++ debian/control 2005-07-07 22:14:05.000000000 +0800
@@ -2503,19 +2503,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
- Xprt provides an X server with the print extension and special DDX
- (Device-Dependent X) implementation.
- .
- Until recently, the Xprint server shipped with XFree86 and X.Org was out of
- date and buggy, and not recommended for general usage. Since then, the Xprint
- development team have merged their work (formerly hosted at xprint.org) into
- the X.Org tree, and now use it as their active development branch. This server
- is thus recommended for general Xprint usage.
-
Package: xserver-common
Architecture: any
Depends: debconf (>= 1.0.21), x11-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
diff -Nru debian.orig/MANIFEST.alpha.in debian/MANIFEST.alpha.in
--- debian.orig/MANIFEST.alpha.in 2005-06-21 05:31:11.000000000 +0800
+++ debian/MANIFEST.alpha.in 2005-07-07 22:14:05.000000000 +0800
@@ -438,7 +438,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
diff -Nru debian.orig/MANIFEST.amd64.in debian/MANIFEST.amd64.in
--- debian.orig/MANIFEST.amd64.in 2005-07-04 02:51:43.000000000 +0800
+++ debian/MANIFEST.amd64.in 2005-07-07 22:14:05.000000000 +0800
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1700,7 +1699,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
diff -Nru debian.orig/MANIFEST.arm.in debian/MANIFEST.arm.in
--- debian.orig/MANIFEST.arm.in 2005-06-20 14:44:02.000000000 +0800
+++ debian/MANIFEST.arm.in 2005-07-07 22:14:05.000000000 +0800
@@ -438,7 +438,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
diff -Nru debian.orig/MANIFEST.hppa.in debian/MANIFEST.hppa.in
--- debian.orig/MANIFEST.hppa.in 2005-07-04 02:51:43.000000000 +0800
+++ debian/MANIFEST.hppa.in 2005-07-07 22:14:05.000000000 +0800
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1592,7 +1591,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
diff -Nru debian.orig/MANIFEST.hurd-i386.in debian/MANIFEST.hurd-i386.in
--- debian.orig/MANIFEST.hurd-i386.in 2005-06-21 01:07:06.000000000 +0800
+++ debian/MANIFEST.hurd-i386.in 2005-07-07 22:14:05.000000000 +0800
@@ -438,7 +438,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
diff -Nru debian.orig/MANIFEST.i386.in debian/MANIFEST.i386.in
--- debian.orig/MANIFEST.i386.in 2005-07-04 02:51:43.000000000 +0800
+++ debian/MANIFEST.i386.in 2005-07-07 22:14:05.000000000 +0800
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1709,7 +1708,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
diff -Nru debian.orig/MANIFEST.ia64.in debian/MANIFEST.ia64.in
--- debian.orig/MANIFEST.ia64.in 2005-07-04 02:51:43.000000000 +0800
+++ debian/MANIFEST.ia64.in 2005-07-07 22:14:05.000000000 +0800
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1702,7 +1701,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
diff -Nru debian.orig/MANIFEST.m68k.in debian/MANIFEST.m68k.in
--- debian.orig/MANIFEST.m68k.in 2005-06-20 14:44:02.000000000 +0800
+++ debian/MANIFEST.m68k.in 2005-07-07 22:14:05.000000000 +0800
@@ -438,7 +438,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
diff -Nru debian.orig/MANIFEST.mipsel.in debian/MANIFEST.mipsel.in
--- debian.orig/MANIFEST.mipsel.in 2005-06-20 14:44:02.000000000 +0800
+++ debian/MANIFEST.mipsel.in 2005-07-07 22:14:05.000000000 +0800
@@ -438,7 +438,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
diff -Nru debian.orig/MANIFEST.mips.in debian/MANIFEST.mips.in
--- debian.orig/MANIFEST.mips.in 2005-06-20 14:44:02.000000000 +0800
+++ debian/MANIFEST.mips.in 2005-07-07 22:14:05.000000000 +0800
@@ -438,7 +438,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
diff -Nru debian.orig/MANIFEST.powerpc.in debian/MANIFEST.powerpc.in
--- debian.orig/MANIFEST.powerpc.in 2005-07-04 02:51:43.000000000 +0800
+++ debian/MANIFEST.powerpc.in 2005-07-07 22:14:05.000000000 +0800
@@ -454,7 +454,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1682,7 +1681,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
diff -Nru debian.orig/MANIFEST.s390.in debian/MANIFEST.s390.in
--- debian.orig/MANIFEST.s390.in 2005-06-20 14:44:02.000000000 +0800
+++ debian/MANIFEST.s390.in 2005-07-07 22:14:05.000000000 +0800
@@ -431,7 +431,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
diff -Nru debian.orig/MANIFEST.sparc.in debian/MANIFEST.sparc.in
--- debian.orig/MANIFEST.sparc.in 2005-07-04 02:51:43.000000000 +0800
+++ debian/MANIFEST.sparc.in 2005-07-07 22:14:05.000000000 +0800
@@ -457,7 +457,6 @@
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xorg
usr/X11R6/bin/Xorg-debug
-usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1703,7 +1702,6 @@
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xorg.1x
-usr/X11R6/man/man1/Xprt.1x
usr/X11R6/man/man1/Xserver.1x
usr/X11R6/man/man1/Xvfb.1x
usr/X11R6/man/man1/appres.1x
diff -Nru debian.orig/patches/009_disable_Xprt.diff debian/patches/009_disable_Xprt.diff
--- debian.orig/patches/009_disable_Xprt.diff 1970-01-01 07:00:00.000000000 +0700
+++ debian/patches/009_disable_Xprt.diff 2005-07-08 00:59:51.000000000 +0800
@@ -0,0 +1,33 @@
+diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc.orig/config/cf/linux.cf 2005-07-07 20:40:56.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-07 20:41:57.000000000 +0800
+@@ -233,6 +233,13 @@
+ # define FontLibSharedFreeType NO
+ # define HasLatex YES
+
++/*
++ * 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
++
+ # ifdef UseInstalled
+ # define RenderLibraryDir /usr
+ # define XftLibraryDir /usr
+diff -Nru xc.orig/programs/Xserver/Xprint/Imakefile xc/programs/Xserver/Xprint/Imakefile
+--- xc.orig/programs/Xserver/Xprint/Imakefile 2005-07-07 20:40:46.000000000 +0800
++++ xc/programs/Xserver/Xprint/Imakefile 2005-07-07 20:41:57.000000000 +0800
+@@ -125,12 +125,3 @@
+ #endif
+
+ DependTarget()
+-
+-InstallManPage(Xprt,$(MANDIR))
+-
+-#ifdef HasDocBookTools
+-all:: Xprt.man Xprt.html
+-
+-ConvertDocBookToManPage(Xprt.sgml, Xprt.man)
+-ConvertDocBookToHTML(Xprt.sgml, Xprt.html)
+-#endif /* HasDocBookTools */
diff -Nru debian.orig/patches/099s_selinux_support.diff debian/patches/099s_selinux_support.diff
--- debian.orig/patches/099s_selinux_support.diff 2005-07-03 04:35:40.000000000 +0800
+++ debian/patches/099s_selinux_support.diff 2005-07-08 01:00:55.000000000 +0800
@@ -61,7 +61,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2005-07-02 15:45:19.000000000 -0400
+++ xc/config/cf/linux.cf 2005-07-02 16:01:00.000000000 -0400
-@@ -1105,3 +1105,57 @@
+@@ -1112,3 +1112,57 @@
#ifndef XFree86ServerOSDefines
# define XFree86ServerOSDefines
#endif
diff -Nru debian.orig/patches/600_amd64_support.diff debian/patches/600_amd64_support.diff
--- debian.orig/patches/600_amd64_support.diff 2005-06-20 13:12:39.000000000 +0800
+++ debian/patches/600_amd64_support.diff 2005-07-08 01:01:32.000000000 +0800
@@ -11,7 +11,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
-@@ -631,7 +631,7 @@
+@@ -638,7 +638,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
diff -Nru debian.orig/rules debian/rules
--- debian.orig/rules 2005-07-04 02:51:43.000000000 +0800
+++ debian/rules 2005-07-07 23:36:47.000000000 +0800
@@ -81,7 +81,7 @@
IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"'
# XXX: replace -DDefaultGcc2OptimizeOpt=-O0 with $(DEBUGFLAGS) when the time
# comes (see above)
-SERVERDEBUG_IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXprtServer=NO -DXdmxServer=NO -DDefaultGcc2OptimizeOpt=-O0
+SERVERDEBUG_IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXdmxServer=NO -DDefaultGcc2OptimizeOpt=-O0
# If this is an official build, set the BuilderEMailAddr that gets displayed in
# some error messages.
diff -Nru debian.orig/xprt.install debian/xprt.install
--- debian.orig/xprt.install 2005-05-11 08:27:55.000000000 +0800
+++ debian/xprt.install 1970-01-01 07:00:00.000000000 +0700
@@ -1,2 +0,0 @@
-usr/X11R6/bin/Xprt
-usr/X11R6/man/man1/Xprt.1x
Reply to: