Bug#731441: Templates in xutils-dev cause build-depends on libxp-dev

[Graham Inggs <graham@nerve.org.za>]

tags 731441 patch
thanks

The attached patch prevents LIBXP from being defined and allows xtel
to build without the build-depends on libxp-dev.  I haven't done any
other testing, so I'm not sure that it doesn't break anything else.

Description: Do not define XPLIB
 This patch prevents XPLIB from being defined and causing packages
 to build-depend on libxp-dev unnecessarily.
 .
 For example, see bug #707623 in the xtel package.
Author: Graham Inggs <graham@nerve.org.za>
Bug-Debian: http://bugs.debian.org/731441
Forwarded: no
Last-Update: 2013-12-15
--- a/xorg-cf-files/X11.tmpl
+++ b/xorg-cf-files/X11.tmpl
@@ -2983,6 +2983,11 @@
 ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir)
 #endif
 
+#ifndef UseLibXp
+#define UseLibXp				YES
+#endif
+#if UseLibXp
+
 #ifndef SharedLibXp
 #define SharedLibXp HasSharedLibraries
 #endif
@@ -3005,6 +3010,8 @@
 ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir)
 #endif
 
+#endif /* UseLibXp */
+
 #ifndef SharedLibXt
 #define SharedLibXt HasSharedLibraries
 #endif
--- a/xorg-cf-files/gnu.cf
+++ b/xorg-cf-files/gnu.cf
@@ -197,6 +197,7 @@
  */
 #  define XprtServer			NO
 #  define BuildXprintLib		!BuildServersOnly
+#  define UseLibXp			NO
 
 #  ifdef UseInstalled
 #   define RenderLibraryDir		/usr
--- a/xorg-cf-files/linux.cf
+++ b/xorg-cf-files/linux.cf
@@ -268,6 +268,7 @@
  */
 #  define XprtServer			NO
 #  define BuildXprintLib		!BuildServersOnly
+#  define UseLibXp			NO
 
 #  ifdef UseInstalled
 #   define RenderLibraryDir		/usr