library clean-up: Don't build libNX_Xfixes anymore. Use system's libXfixes shared library.

5 files changed, 15 insertions, 64 deletions

diff --git a/debian/control b/debian/control
index ecfd5d82a..102d1535b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
  libxdamage-dev,
  libxcomposite-dev,
  libxrandr-dev,
+ libxfixes-dev,
  autoconf,
  pkg-config,
  x11proto-core-dev,
@@ -477,19 +478,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 miscellaneous 'fixes' extension library
+Description: nx-X11 miscellaneous 'fixes' 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_Xfixes provides an X Window System client interface to the
- 'XFIXES' extension to the X protocol.
+ This package removes the obsoleted libNX_Xfixes.so.3 library. With
+ recent versions of NX, the system-wide installed libXfixes gets used.
  .
- It provides support for Region types, and some cursor functions.
+ This package can be safely removed.
  
 Package: libnx-xfixes-dev
 Provides: libnx-xfixes3-dev
@@ -497,22 +495,17 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libnx-xfixes3 (= ${binary:Version}),
- nx-x11proto-xfixes-dev (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 miscellaneous 'fixes' extension library (development headers)
+Description: nx-X11 miscellaneous 'fixes' 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_Xfixes provides an X Window System client interface to the
- 'XFIXES' extension to the X protocol.
- .
- It provides support for Region types, and some cursor functions.
+ This package removes the obsoleted headers for the libNX_Xfixes.so.3
+ library. With recent versions of NX, the system-wide installed
+ libXfixes gets used.
  .
- This package contains the development headers for this library.
+ This package can be safely removed.
 
 Package: nx-x11proto-xfixes-dev
 Section: libdevel
@@ -536,21 +529,18 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libnx-xfixes3 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 miscellaneous 'fixes' extension library (debug package)
+Description: nx-X11 miscellaneous 'fixes' 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_Xfixes provides an X Window System client interface to the
- 'XFIXES' extension to the X protocol.
- .
- It provides support for Region types, and some cursor functions.
+ This package removes the obsoleted debug symbols for the libNX_Xfixes.so.3
+ library. With recent versions of NX, the system-wide installed libXfixes
+ gets used.
  .
- This package contains debug symbols for this library.
+ This package can be safely removed.
 
 Package: libnx-xinerama1
 Architecture: any
diff --git a/debian/libnx-xfixes-dev.install.in b/debian/libnx-xfixes-dev.install.in
deleted file mode 100644
index 475c78d0a..000000000
--- a/debian/libnx-xfixes-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libNX_Xfixes.so
-usr/include/*/nx-X11/extensions/Xfixes.h
diff --git a/debian/libnx-xfixes3.install.in b/debian/libnx-xfixes3.install.in
deleted file mode 100644
index b86ea4ae1..000000000
--- a/debian/libnx-xfixes3.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xfixes.so.*
diff --git a/debian/libnx-xfixes3.symbols b/debian/libnx-xfixes3.symbols
deleted file mode 100644
index 2322e490e..000000000
--- a/debian/libnx-xfixes3.symbols
+++ /dev/null
@@ -1,35 +0,0 @@
-libNX_Xfixes.so.3 libnx-xfixes3 #MINVER#
- XFixesChangeCursor@Base 3.5.0.29
- XFixesChangeCursorByName@Base 3.5.0.29
- XFixesChangeSaveSet@Base 3.5.0.29
- XFixesCopyRegion@Base 3.5.0.29
- XFixesCreateRegion@Base 3.5.0.29
- XFixesCreateRegionFromBitmap@Base 3.5.0.29
- XFixesCreateRegionFromGC@Base 3.5.0.29
- XFixesCreateRegionFromPicture@Base 3.5.0.29
- XFixesCreateRegionFromWindow@Base 3.5.0.29
- XFixesDestroyRegion@Base 3.5.0.29
- XFixesExpandRegion@Base 3.5.0.29
- XFixesExtensionInfo@Base 3.5.0.29
- XFixesExtensionName@Base 3.5.0.29
- XFixesFetchRegion@Base 3.5.0.29
- XFixesFetchRegionAndBounds@Base 3.5.0.29
- XFixesFindDisplay@Base 3.5.0.29
- XFixesGetCursorImage@Base 3.5.0.29
- XFixesGetCursorName@Base 3.5.0.29
- XFixesIntersectRegion@Base 3.5.0.29
- XFixesInvertRegion@Base 3.5.0.29
- XFixesQueryExtension@Base 3.5.0.29
- XFixesQueryVersion@Base 3.5.0.29
- XFixesRegionExtents@Base 3.5.0.29
- XFixesSelectCursorInput@Base 3.5.0.29
- XFixesSelectSelectionInput@Base 3.5.0.29
- XFixesSetCursorName@Base 3.5.0.29
- XFixesSetGCClipRegion@Base 3.5.0.29
- XFixesSetPictureClipRegion@Base 3.5.0.29
- XFixesSetRegion@Base 3.5.0.29
- XFixesSetWindowShapeRegion@Base 3.5.0.29
- XFixesSubtractRegion@Base 3.5.0.29
- XFixesTranslateRegion@Base 3.5.0.29
- XFixesUnionRegion@Base 3.5.0.29
- XFixesVersion@Base 3.5.0.29
diff --git a/debian/rules b/debian/rules
index 791b99cf3..4fb1cf1bc 100755
--- a/debian/rules
+++ b/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-xext6 --dbg-package=libnx-xext6-dbg
-	dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg
 	dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg
 	dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg
 	dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg