library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32).

5 files changed, 16 insertions, 61 deletions

diff --git a/debian/control b/debian/control
index 102d1535b..946dd4b2a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,12 +21,12 @@ Build-Depends:
  libxcomposite-dev,
  libxrandr-dev,
  libxfixes-dev,
+ libxtst-dev,
  autoconf,
  pkg-config,
  x11proto-core-dev,
  expat,
 Build-Conflicts:
- x11proto-record-dev,
  x11proto-xinerama-dev,
 Standards-Version: 3.9.6
 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
@@ -851,20 +851,16 @@ 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 Testing -- Record extension library
+Description: nx-X11 Testing -- Record 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_Xtst provides an X Window System client interface to the Record
- extension to the X protocol.
+ This package removes the obsoleted libNX_Xtst.so.6 library. With
+ recent versions of NX, the system-wide installed libXtst gets used.
  .
- The Record extension allows X clients to synthesise input events, which
- is useful for automated testing.
+ This package can be safely removed.
 
 Package: libnx-xtst-dev
 Provides: libnx-xtst6-dev
@@ -872,22 +868,17 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libnx-xtst6 (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Testing -- Record extension library (development headers)
+Description: nx-X11 Testing -- Record 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_Xtst provides an X Window System client interface to the Record
- extension to the X protocol.
- .
- The Record extension allows X clients to synthesise input events, which
- is useful for automated testing.
+ This package removes the obsoleted headers for the libNX_Xtst.so.6
+ library. With recent versions of NX, the system-wide installed libXtst
+ gets used.
  .
- This package contains the development headers for this library.
+ This package can be safely removed.
 
 Package: libnx-xtst6-dbg
 Architecture: any
@@ -895,22 +886,18 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libnx-xtst6 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Testing -- Record extension library (debug package)
+Description: nx-X11 Testing -- Record 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_Xtst provides an X Window System client interface to the Record
- extension to the X protocol.
- .
- The Record extension allows X clients to synthesise input events, which
- is useful for automated testing.
+ This package removes the obsoleted wire protocol headers for the
+ libNX_Xtst.so.6 library. With recent versions of NX, the system-wide
+ installed libXtst gets used.
  .
- This package contains debug symbols for this library.
+ This package can be safely removed.
 
 Package: libnx-mesa-extras-dev
 Section: libdevel
diff --git a/debian/libnx-xtst-dev.install.in b/debian/libnx-xtst-dev.install.in
deleted file mode 100644
index 5acca96cf..000000000
--- a/debian/libnx-xtst-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libNX_Xtst.so
-usr/include/*/nx-X11/extensions/XTest.h
diff --git a/debian/libnx-xtst6.install.in b/debian/libnx-xtst6.install.in
deleted file mode 100644
index 85350d830..000000000
--- a/debian/libnx-xtst6.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xtst.so.*
diff --git a/debian/libnx-xtst6.symbols b/debian/libnx-xtst6.symbols
deleted file mode 100644
index a3f9bcc2d..000000000
--- a/debian/libnx-xtst6.symbols
+++ /dev/null
@@ -1,30 +0,0 @@
-libNX_Xtst.so.6 libnx-xtst6 #MINVER#
- XRecordAllocRange@Base 3.5.0.29
- XRecordCreateContext@Base 3.5.0.29
- XRecordDisableContext@Base 3.5.0.29
- XRecordEnableContext@Base 3.5.0.29
- XRecordEnableContextAsync@Base 3.5.0.29
- XRecordFreeContext@Base 3.5.0.29
- XRecordFreeData@Base 3.5.0.29
- XRecordFreeState@Base 3.5.0.29
- XRecordGetContext@Base 3.5.0.29
- XRecordIdBaseMask@Base 3.5.0.29
- XRecordProcessReplies@Base 3.5.0.29
- XRecordQueryVersion@Base 3.5.0.29
- XRecordRegisterClients@Base 3.5.0.29
- XRecordUnregisterClients@Base 3.5.0.29
- XTestCompareCurrentCursorWithWindow@Base 3.5.0.29
- XTestCompareCursorWithWindow@Base 3.5.0.29
- XTestDiscard@Base 3.5.0.29
- XTestFakeButtonEvent@Base 3.5.0.29
- XTestFakeDeviceButtonEvent@Base 3.5.0.29
- XTestFakeDeviceKeyEvent@Base 3.5.0.29
- XTestFakeDeviceMotionEvent@Base 3.5.0.29
- XTestFakeKeyEvent@Base 3.5.0.29
- XTestFakeMotionEvent@Base 3.5.0.29
- XTestFakeProximityEvent@Base 3.5.0.29
- XTestFakeRelativeMotionEvent@Base 3.5.0.29
- XTestGrabControl@Base 3.5.0.29
- XTestQueryExtension@Base 3.5.0.29
- XTestSetGContextOfGC@Base 3.5.0.29
- XTestSetVisualIDOfVisual@Base 3.5.0.29
diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in
index 0d1f8699b..61829cf29 100644
--- a/debian/nx-x11proto-xext-dev.install.in
+++ b/debian/nx-x11proto-xext-dev.install.in
@@ -1,4 +1,5 @@
 usr/include/*/nx-X11/extensions/xteststr.h
+usr/include/*/nx-X11/extensions/xtestconst.h
 usr/include/*/nx-X11/extensions/shapestr.h
 usr/include/*/nx-X11/extensions/shmstr.h
 usr/include/*/nx-X11/extensions/syncstr.h