library clean-up: Don't build libNX_Xdamage anymore. Use system's lib…

…Xdamage shared library. (Fixes ArcticaProject#6, X2GoBTS#826).

debian/control

@@ -17,6 +17,7 @@ Build-Depends:
  libxpm-dev,
  libxfont-dev,
  libxdmcp-dev,
+ libxdamage-dev,
  autoconf,
  pkg-config,
  x11proto-core-dev,
@@ -283,84 +284,70 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- ${shlibs:Depends},
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11 (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 damaged region extension library
+Description: nx-X11 damaged region extension library (dummy package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
- libNX_Xdamage provides an X Window System client interface to the DAMAGE
- extension to the X protocol.
+ This package removes the obsoleted libNX_Xdamage.so.1 library. With
+ recent versions of NX, the system-wide installed libXdamage gets used.
  .
- The Damage extension provides for notification of when on-screen regions have
- been 'damaged' (altered)
+ This package can be safely removed.
 
 Package: libnx-xdamage-dev
 Provides: libnx-xdamage1-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libnx-xdamage1 (= ${binary:Version}),
- nx-x11proto-damage-dev (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 damaged region extension library (development headers)
+Description: nx-X11 damaged region extension library (dummy package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
- libNX_Xdamage provides an X Window System client interface to the DAMAGE
- extension to the X protocol.
- .
- The Damage extension provides for notification of when on-screen regions have
- been 'damaged' (altered)
+ This package removes the obsoleted headers for the libNX_Xdamage.so.1
+ library. With recent versions of NX, the system-wide installed libXdamage
+ gets used.
  .
- This package contains the development headers for this library.
+ This package can be safely removed.
 
 Package: nx-x11proto-damage-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Damage extension wire protocol
+Description: nx-X11 Damage extension wire protocol (dummy package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
- This package provides development headers describing the wire protocol
- for the Damage extension in nx-X11, used to notify clients of changes
- made to particular areas.
+ This package removes the obsoleted wire protocol headers for the
+ libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide
+ installed libXdamage gets used.
+ .
+ This package can be safely removed.
 
 Package: libnx-xdamage1-dbg
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libnx-xdamage1 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 damaged region extension library (debug package)
+Description: nx-X11 damaged region extension library (dummy package)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
- libNX_Xdamage provides an X Window System client interface to the DAMAGE
- extension to the X protocol.
- .
- The Damage extension provides for notification of when on-screen regions have
- been 'damaged' (altered)
+ This package removes the obsoleted debug symbols for the
+ libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide
+ installed libXdamage gets used.
  .
- This package contains debug symbols for this library.
+ This package can be safely removed.
 
 Package: libnx-xdmcp6
 Architecture: any

debian/rules

@@ -81,7 +81,6 @@ override_dh_strip:
 	dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
 	dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg
 	dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg
-	dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg
 	dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg
 	dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg
 	dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg

nx-X11/config/cf/X11.tmpl

@@ -339,16 +339,12 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildDamage
 #define BuildDamage		BuildXfixes
 #endif
-#ifndef BuildDamageLibrary
-#define BuildDamageLibrary	!BuildServersOnly
-#endif
 
 #ifndef BuildComposite
 #define BuildComposite		(BuildXfixes && BuildDamage)
 #endif
 #ifndef BuildCompositeLibrary
-#define BuildCompositeLibrary	!BuildServersOnly && (BuildXfixesLibrary && \
-				BuildDamageLibrary)
+#define BuildCompositeLibrary	!BuildServersOnly && BuildXfixesLibrary
 #endif
 
 #ifndef BuildXevie
@@ -1581,30 +1577,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
 #define ProfileLibXfixes	NO
 #endif
 
-#if BuildDamageLibrary
-#ifndef SharedLibXdamage
-#define SharedLibXdamage	HasSharedLibraries
-#endif
-#ifndef NormalLibXdamage
-#define NormalLibXdamage	(!SharedLibXdamage || ForceNormalLib)
-#endif
-#ifndef DebugLibXdamage
-#define DebugLibXdamage		NO
-#endif
-#ifndef ProfileLibXdamage
-#define ProfileLibXdamage	NO
-#endif
-#else
-#undef  SharedLibXdamage
-#define SharedLibXdamage	NO
-#undef  NormalLibXdamage
-#define NormalLibXdamage	NO
-#undef  DebugLibXdamage
-#define DebugLibXdamage		NO
-#undef  ProfileLibXdamage
-#define ProfileLibXdamage	NO
-#endif
-
 #if BuildCompositeLibrary
 #ifndef SharedLibXcomposite
 #define SharedLibXcomposite	HasSharedLibraries
@@ -1799,16 +1771,6 @@ ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
 SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev)
 #else
 ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
-#endif
-
-   XDAMAGELIBSRC = $(LIBSRC)/Xdamage
-#if SharedLibXdamage
-#ifndef SharedXdamageRev
-#define SharedXdamageRev 1.0
-#endif
-SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev)
-#else
-ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir)
 #endif
 
 XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite

nx-X11/config/cf/host.def

@@ -123,8 +123,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define BuildLibraries			YES
 #endif
 
-#define BuildDamageLibrary              YES
-
 #define BuildXfixesLibrary              YES
 
 #define BuildCompositeLibrary           YES

nx-X11/include/extensions/Imakefile

@@ -47,9 +47,6 @@ RENDERHEADERS = render.h renderproto.h
 #if BuildXfixes || BuildXfixesLibrary
 XFIXESHEADERS = xfixeswire.h xfixesproto.h
 #endif
-#if BuildDamage || BuildDamageLibrary
-DAMAGEHEADERS = damagewire.h damageproto.h
-#endif
 #if BuildComposite || BuildCompositeLibrary
 COMPOSITEHEADERS = composite.h compositeproto.h
 #endif
@@ -82,7 +79,6 @@ EXTRAHEADERS = \
 	$(RENDERHEADERS) \
 	$(RANDRHEADERS) \
 	$(XFIXESHEADERS) \
-	$(DAMAGEHEADERS) \
 	$(COMPOSITEHEADERS) \
 	$(XEVIEHEADERS) \
 	$(XTRAPHEADERS) \