library clean-up: Don't build libNX_Xcomposite anymore. Use system's libXcomposite shared library.

5 files changed, 16 insertions, 45 deletions

diff --git a/debian/control b/debian/control
index 8cbb4bc54..ecfd5d82a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
  libxfont-dev,
  libxdmcp-dev,
  libxdamage-dev,
+ libxcomposite-dev,
  libxrandr-dev,
  autoconf,
  pkg-config,
@@ -199,20 +200,17 @@ 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 Composite extension library
+Description: nx-X11 Composite 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_Xcomposite provides an X Window System client interface to the Composite
- extension to the X protocol
+ This package removes the obsoleted libNX_Xcomposite.so.1 library. With
+ recent versions of NX, the system-wide installed libXcomposite gets
+ used.
  .
- The Composite extension allows clients called compositing managers to control
- the final drawing of the screen. Rendering is done into an off-screen buffer.
+ This package can be safely removed.
 
 Package: libnx-xcomposite-dev
 Provides: libnx-xcomposite1-dev
@@ -220,23 +218,17 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libnx-xcomposite1 (= ${binary:Version}),
- nx-x11proto-composite-dev (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Composite extension library (development headers)
+Description: nx-X11 Composite 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_Xcomposite provides an X Window System client interface to the Composite
- extension to the X protocol
- .
- The Composite extension allows clients called compositing managers to control
- the final drawing of the screen. Rendering is done into an off-screen buffer.
+ This package removes the obsoleted headers for the libNX_Xcomposite.so.1
+ library. With recent versions of NX, the system-wide installed
+ libXcomposite gets used.
  .
- This package contains the development headers for this library.
+ This package can be safely removed.
 
 Package: nx-x11proto-composite-dev
 Section: libdevel
@@ -261,22 +253,18 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libnx-xcomposite1 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Composite extension library (debug package)
+Description: nx-X11 Composite 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_Xcomposite provides an X Window System client interface to the Composite
- extension to the X protocol
+ This package removes the debug symbols for the obsoleted
+ libNX_Xcomposite.so.1 library. With recent versions of NX, the
+ system-wide installed libXcomposite gets used.
  .
- The Composite extension allows clients called compositing managers to control
- the final drawing of the screen. Rendering is done into an off-screen buffer.
- .
- This package contains debug symbols for this library.
+ This package can be safely removed.
 
 Package: libnx-xdamage1
 Architecture: any
diff --git a/debian/libnx-xcomposite-dev.install.in b/debian/libnx-xcomposite-dev.install.in
deleted file mode 100644
index 71451dbcc..000000000
--- a/debian/libnx-xcomposite-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libNX_Xcomposite.so
-usr/include/*/nx-X11/extensions/Xcomposite.h
diff --git a/debian/libnx-xcomposite1.install.in b/debian/libnx-xcomposite1.install.in
deleted file mode 100644
index ecc2f4237..000000000
--- a/debian/libnx-xcomposite1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xcomposite.so.*
diff --git a/debian/libnx-xcomposite1.symbols b/debian/libnx-xcomposite1.symbols
deleted file mode 100644
index 22ddc889f..000000000
--- a/debian/libnx-xcomposite1.symbols
+++ /dev/null
@@ -1,13 +0,0 @@
-libNX_Xcomposite.so.1 libnx-xcomposite1 #MINVER#
- XCompositeCreateRegionFromBorderClip@Base 3.5.0.29
- XCompositeExtensionInfo@Base 3.5.0.29
- XCompositeExtensionName@Base 3.5.0.29
- XCompositeFindDisplay@Base 3.5.0.29
- XCompositeNameWindowPixmap@Base 3.5.0.29
- XCompositeQueryExtension@Base 3.5.0.29
- XCompositeQueryVersion@Base 3.5.0.29
- XCompositeRedirectSubwindows@Base 3.5.0.29
- XCompositeRedirectWindow@Base 3.5.0.29
- XCompositeUnredirectSubwindows@Base 3.5.0.29
- XCompositeUnredirectWindow@Base 3.5.0.29
- XCompositeVersion@Base 3.5.0.29
diff --git a/debian/rules b/debian/rules
index b78855033..791b99cf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,6 @@ override_dh_auto_build:
 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-xext6 --dbg-package=libnx-xext6-dbg
 	dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg
 	dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg