Merge branch 'sunweaver-pr/move-nxcompext-into-Xserver' into 3.6.x

Attributes GH PR: https://github.com/ArcticaProject/nx-libs/pull/277

Reviewed by: Ulrich Sibiller <uli42@gmx.de>  -- Tue, 15 Nov 2016 00:54:44 -0800

7 files changed, 2 insertions, 163 deletions

diff --git a/debian/control b/debian/control
index 633ab784b..6898cdb81 100644
--- a/debian/control
+++ b/debian/control
@@ -326,7 +326,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libxcomp3 (= ${binary:Version}),
- libxcompext3 (= ${binary:Version}),
  libxcompshad3 (= ${binary:Version}),
  libnx-x11-6 (= ${binary:Version}),
 Recommends:
@@ -334,8 +333,10 @@ Recommends:
  xkb-data,
 Breaks:
  nxauth,
+ libxcompext3 (<< 2:3.5.99.3~),
 Replaces:
  nxauth,
+ libxcompext3,
 Description: NX agent
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -470,58 +471,6 @@ Description: nx-X11 compression library (debug package)
  .
  This package contains debug symbols for this library.
 
-Package: libxcompext3
-Architecture: any
-Multi-Arch: same
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libnx-x11-6 (= ${binary:Version}),
-Breaks: nxcompext (<=3.5.1)
-Replaces: nxcompext
-Description: nx-X11 protocol compression extensions library
- 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 extends the core NX library with additional features.
-
-Package: libxcompext-dev
-Provides: libxcompext3-dev
-Architecture: any
-Section: libdevel
-Depends:
- libxcompext3 (= ${binary:Version}),
- ${misc:Depends},
- libxcomp-dev,
-Breaks: nxcompext-dev (<=3.5.1),
-Replaces: nxcompext-dev,
-Description: nx-X11 protocol compression extensions library (development headers)
- 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 extends the core NX library with additional features.
- .
- This package contains the development headers for this library.
-
-Package: libxcompext3-dbg
-Architecture: any
-Multi-Arch: same
-Depends:
- libxcompext3 (= ${binary:Version}),
- ${misc:Depends},
-Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
-Description: nx-X11 protocol compression extensions library (debug 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 extends the core NX library with additional features.
- .
- This package contains debug symbols for this library.
-
 Package: libxcompshad3
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install
deleted file mode 100644
index 52f22918d..000000000
--- a/debian/libxcompext-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libXcompext.so
-usr/include/*/nx/NXlib.h
-usr/lib/*/pkgconfig/nxcompext.pc
diff --git a/debian/libxcompext-dev.links b/debian/libxcompext-dev.links
deleted file mode 100644
index 2346289d9..000000000
--- a/debian/libxcompext-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libxcompext3 usr/share/doc/libxcompext3-dev
diff --git a/debian/libxcompext3.install b/debian/libxcompext3.install
deleted file mode 100644
index b9ac8ebb9..000000000
--- a/debian/libxcompext3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libXcompext.so.*
diff --git a/debian/libxcompext3.symbols b/debian/libxcompext3.symbols
deleted file mode 100644
index 0ca6ec6b8..000000000
--- a/debian/libxcompext3.symbols
+++ /dev/null
@@ -1,103 +0,0 @@
-libXcompext.so.3 libxcompext3 #MINVER#
- AlphaCompressData@Base 3.5.0.29
- BitmapCompressData@Base 3.5.0.29
- CleanXYImage@Base 3.5.0.29
- CleanZImage@Base 3.5.0.29
- ColormapCompressData@Base 3.5.0.29
- CopyAndCleanImage@Base 3.5.0.29
- FindLSB@Base 3.5.0.29
- JpegCompressData@Base 3.5.0.29
- MaskImage@Base 3.5.0.29
- MaskInPlaceImage@Base 3.5.0.29
- NXAbortSplit@Base 3.5.0.29
- NXAllocColors@Base 3.5.0.29
- NXAllocSplit@Base 3.5.0.29
- NXAllocUnpack@Base 3.5.0.29
- NXCacheAddImage@Base 3.5.0.29
- NXCacheFindImage@Base 3.5.0.29
- NXCleanImage@Base 3.5.0.29
- NXCollectGrabPointer@Base 3.5.0.29
- NXCollectImage@Base 3.5.0.29
- NXCollectInputFocus@Base 3.5.0.29
- NXCollectProperty@Base 3.5.0.29
- NXCommitSplit@Base 3.5.0.29
- NXCreatePackedImage@Base 3.5.0.29
- NXCreatePalette16@Base 3.5.0.29
- NXCreatePalette32@Base 3.5.0.29
- NXDestroyPackedImage@Base 3.5.0.29
- NXDisplayCongestion@Base 3.5.0.29
- NXDisplayError@Base 3.5.0.29
- NXDisplayFlushable@Base 3.5.0.29
- NXDisplayReadable@Base 3.5.0.29
- NXEncodeAlpha@Base 3.5.0.29
- NXEncodeBitmap@Base 3.5.0.29
- NXEncodeColormap@Base 3.5.0.29
- NXEncodeColors@Base 3.5.0.29
- NXEncodeJpeg@Base 3.5.0.29
- NXEncodePng@Base 3.5.0.29
- NXEncodeRgb@Base 3.5.0.29
- NXEncodeRle@Base 3.5.0.29
- NXEndSplit@Base 3.5.0.29
- NXFinishSplit@Base 3.5.0.29
- NXFlushDisplay@Base 3.5.0.29
- NXForceDisplayError@Base 3.5.0.29
- NXFreeCache@Base 3.5.0.29
- NXFreeSplit@Base 3.5.0.29
- NXFreeUnpack@Base 3.5.0.29
- NXGetCollectGrabPointerResource@Base 3.5.0.29
- NXGetCollectImageResource@Base 3.5.0.29
- NXGetCollectInputFocusResource@Base 3.5.0.29
- NXGetCollectPropertyResource@Base 3.5.0.29
- NXGetCollectedGrabPointer@Base 3.5.0.29
- NXGetCollectedImage@Base 3.5.0.29
- NXGetCollectedInputFocus@Base 3.5.0.29
- NXGetCollectedProperty@Base 3.5.0.29
- NXGetControlParameters@Base 3.5.0.29
- NXGetFontParameters@Base 3.5.0.29
- NXGetShmemParameters@Base 3.5.0.29
- NXGetUnpackParameters@Base 3.5.0.29
- NXHandleDisplayError@Base 3.5.0.29
- NXImageCache@Base 3.5.0.29
- NXImageCacheHits@Base 3.5.0.29
- NXImageCacheOps@Base 3.5.0.29
- NXImageCacheSize@Base 3.5.0.29
- NXInPlacePackImage@Base 3.5.0.29
- NXInitCache@Base 3.5.0.29
- NXInitDisplay@Base 3.5.0.29
- NXMaskImage@Base 3.5.0.29
- NXPackImage@Base 3.5.0.29
- NXPutPackedImage@Base 3.5.0.29
- NXResetDisplay@Base 3.5.0.29
- NXSetCacheParameters@Base 3.5.0.29
- NXSetDisplayBlockHandler@Base 3.5.0.29
- NXSetDisplayBuffer@Base 3.5.0.29
- NXSetDisplayErrorPredicate@Base 3.5.0.29
- NXSetDisplayFlushHandler@Base 3.5.0.29
- NXSetDisplayPolicy@Base 3.5.0.29
- NXSetDisplayStatisticsHandler@Base 3.5.0.29
- NXSetDisplayWriteHandler@Base 3.5.0.29
- NXSetExposeParameters@Base 3.5.0.29
- NXSetLostSequenceHandler@Base 3.5.0.29
- NXSetUnpackAlpha@Base 3.5.0.29
- NXSetUnpackAlphaCompat@Base 3.5.0.29
- NXSetUnpackColormap@Base 3.5.0.29
- NXSetUnpackColormapCompat@Base 3.5.0.29
- NXSetUnpackGeometry@Base 3.5.0.29
- NXStartSplit@Base 3.5.0.29
- NXUnsetLibraryPath@Base 3.5.0.29
- PackImage@Base 3.5.0.29
- PngCompareColorTable@Base 3.5.0.29
- PngCompressData@Base 3.5.0.29
- RgbCompressData@Base 3.5.0.29
- RleCompressData@Base 3.5.0.29
- ZCompressData@Base 3.5.0.29
- ZInitEncoder@Base 3.5.0.29
- ZResetEncoder@Base 3.5.0.29
- _NXInternalInitEncoders@Base 3.5.0.29
- _NXInternalInitResources@Base 3.5.0.29
- _NXInternalResetEncoders@Base 3.5.0.29
- _NXInternalResetResources@Base 3.5.0.29
- color_type@Base 3.5.0.29
- info_ptr@Base 3.5.0.29
- palette@Base 3.5.0.29
- png_ptr@Base 3.5.0.29
diff --git a/debian/libxcompext3.triggers b/debian/libxcompext3.triggers
deleted file mode 100644
index dd8660367..000000000
--- a/debian/libxcompext3.triggers
+++ /dev/null
@@ -1 +0,0 @@
-activate-noawait ldconfig
diff --git a/debian/rules b/debian/rules
index 4b49ad27d..d30574c07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,6 @@ override_dh_strip:
 	dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
 	dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg
 	dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg
-	dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg
 	dh_strip -pnxagent --dbg-package=nxagent-dbg
 	dh_strip -pnxproxy --dbg-package=nxproxy-dbg