From 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 1 Jul 2016 13:54:11 +0200 Subject: finally drop libNX_Xext --- debian/control | 98 +++++++-------------------- debian/libnx-xext-dev.install | 4 -- debian/libnx-xext6.install | 1 - debian/libnx-xext6.symbols | 128 ------------------------------------ debian/nx-x11proto-xext-dev.install | 1 - debian/rules | 1 - 6 files changed, 23 insertions(+), 210 deletions(-) delete mode 100644 debian/libnx-xext-dev.install delete mode 100644 debian/libnx-xext6.install delete mode 100644 debian/libnx-xext6.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index c7e36f50c..4d9fcbddf 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: libxfont-dev, libxdmcp-dev, libxdamage-dev, + libxext-dev, libxcomposite-dev, libxrandr-dev, libxfixes-dev, @@ -75,6 +76,7 @@ Depends: nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), Breaks: nxlibs (<= 3.5.1), libnx-x11 (<< 2:3.5.0.29-1~), + libnx-xext6 (<< 2:3.6.0.0), libnx-xau6 (<< 2:3.6.0.0), libnx-xcomposite1 (<< 2:3.6.0.0), libnx-xdamage1 (<< 2:3.6.0.0), @@ -86,6 +88,7 @@ Breaks: nxlibs (<= 3.5.1), libnx-xrender1 (<< 2:3.6.0.0), libnx-xtst6 (<< 2:3.6.0.0), Replaces: nxlibs, + libnx-xext6, libnx-xau6, libnx-xcomposite1, libnx-xdamage1, @@ -109,6 +112,7 @@ Provides: libnx-x11-6-dev Section: libdevel Architecture: any Breaks: nxlibs-dev (<=3.5.1), + libnx-xext-dev (<< 2:3.6.0.0), libnx-xau-dev (<< 2:3.6.0.0), libnx-xcomposite-dev (<< 2:3.6.0.0), libnx-xdamage-dev (<< 2:3.6.0.0), @@ -120,6 +124,7 @@ Breaks: nxlibs-dev (<=3.5.1), libnx-xrender-dev (<< 2:3.6.0.0), libnx-xtst-dev (<< 2:3.6.0.0), Replaces: nxlibs-dev, + libnx-xext-dev, libnx-xau-dev, libnx-xcomposite-dev, libnx-xdamage-dev, @@ -149,6 +154,7 @@ Depends: ${misc:Depends}, Section: debug Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), + libnx-xext6-dbg (<< 2:3.6.0.0), libnx-xau6-dbg (<< 2:3.6.0.0), libnx-xcomposite1-dbg (<< 2:3.6.0.0), libnx-xdamage1-dbg (<< 2:3.6.0.0), @@ -160,6 +166,7 @@ Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), libnx-xrender1-dbg (<< 2:3.6.0.0), libnx-xtst6-dbg (<< 2:3.6.0.0), Replaces: nx-x11-dbg, + libnx-xext6-dbg, libnx-xau6-dbg, libnx-xcomposite1-dbg, libnx-xdamage1-dbg, @@ -178,7 +185,7 @@ Description: nx-X11 client-side library (debug package) This package contains debug symbols for the core nx-X11 libraries customized for nxagent. -Package: nx-x11proto-composite-dev +Package: nx-x11proto-xext-dev Section: libdevel Architecture: any Multi-Arch: same @@ -186,108 +193,49 @@ Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), libnx-x11-dev (<< 2:3.5.0.29-1~), -Description: nx-X11 Composite extension wire protocol + libnx-xext-dev (<< 2:3.5.99.0~), +Description: nx-X11 miscellaneous extension wire protocol 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 Composite extension in nx-X11, used to let arbitrary client - programs control drawing of the final image. - -Package: nx-x11proto-damage-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -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 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-xext6 -Architecture: any -Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-1~), -Description: nx-X11 miscellaneous extension 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. - . - libNX_Xext provides an X Window System client interface to several - extensions to the X protocol. - . - libnx_Xext also provides a small set of utility functions to aid authors - of client APIs for X protocol extensions. - -Package: libnx-xext-dev -Provides: libnx-xext6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - libnx-xext6 (= ${binary:Version}), - nx-x11proto-xext-dev (= ${binary:Version}), - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), -Description: nx-X11 miscellaneous extension 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. - . - libNX_Xext provides an X Window System client interface to several - extensions to the X protocol. - . - This package contains the development headers for this library. + for various extensions, the client-side libraries of which are provided + in the Xext library. -Package: nx-x11proto-xext-dev +Package: nx-x11proto-composite-dev Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xext6 (= ${binary:Version}), ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), libnx-x11-dev (<< 2:3.5.0.29-1~), - libnx-xext-dev (<< 2:3.5.99.0~), -Description: nx-X11 miscellaneous extension wire protocol +Description: nx-X11 Composite extension wire protocol 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 various extensions, the client-side libraries of which are provided - in the Xext library. + for the Composite extension in nx-X11, used to let arbitrary client + programs control drawing of the final image. -Package: libnx-xext6-dbg +Package: nx-x11proto-damage-dev +Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xext6 (= ${binary:Version}), ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 miscellaneous extension library (debug package) +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. . - libNX_Xext provides an X Window System client interface to several - extensions to the X protocol. + 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 contains debug symbols for this library. + This package can be safely removed. Package: nx-x11proto-xfixes-dev Section: libdevel diff --git a/debian/libnx-xext-dev.install b/debian/libnx-xext-dev.install deleted file mode 100644 index 5b88215e0..000000000 --- a/debian/libnx-xext-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/*/libNX_Xext.so -usr/include/*/nx-X11/extensions/XShm.h -usr/include/*/nx-X11/extensions/Xext.h -usr/include/*/nx-X11/extensions/extutil.h diff --git a/debian/libnx-xext6.install b/debian/libnx-xext6.install deleted file mode 100644 index 361d951f5..000000000 --- a/debian/libnx-xext6.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xext.so.* diff --git a/debian/libnx-xext6.symbols b/debian/libnx-xext6.symbols deleted file mode 100644 index a548baf57..000000000 --- a/debian/libnx-xext6.symbols +++ /dev/null @@ -1,128 +0,0 @@ -libNX_Xext.so.6 libnx-xext6 #MINVER# -#MISSING: 2:3.5.99.0-0# DPMSCapable@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSDisable@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSEnable@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSForceLevel@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSGetTimeouts@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSGetVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSSetTimeouts@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxGetEventBase@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscGetBugMode@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscSetBugMode@Base 3.5.0.29 - XMissingExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityAllocXauth@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityFreeXauth@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityGenerateAuthorization@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityRevokeAuthorization@Base 3.5.0.29 - XSetExtensionErrorHandler@Base 3.5.0.29 - XShapeCombineMask@Base 3.5.0.29 - XShapeCombineRectangles@Base 3.5.0.29 - XShapeCombineRegion@Base 3.5.0.29 - XShapeCombineShape@Base 3.5.0.29 - XShapeGetRectangles@Base 3.5.0.29 - XShapeInputSelected@Base 3.5.0.29 - XShapeOffsetShape@Base 3.5.0.29 - XShapeQueryExtension@Base 3.5.0.29 - XShapeQueryExtents@Base 3.5.0.29 - XShapeQueryVersion@Base 3.5.0.29 - XShapeSelectInput@Base 3.5.0.29 - XShmAttach@Base 3.5.0.29 - XShmCreateImage@Base 3.5.0.29 - XShmCreatePixmap@Base 3.5.0.29 - XShmDetach@Base 3.5.0.29 - XShmGetEventBase@Base 3.5.0.29 - XShmGetImage@Base 3.5.0.29 - XShmPixmapFormat@Base 3.5.0.29 - XShmPutImage@Base 3.5.0.29 - XShmQueryExtension@Base 3.5.0.29 - XShmQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncAwait@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncChangeAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncChangeCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncCreateAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncCreateCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncDestroyAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncDestroyCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncFreeSystemCounterList@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncGetPriority@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncInitialize@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncIntToValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncIntsToValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncListSystemCounters@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncMaxValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncMinValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncQueryAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncQueryCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncSetCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncSetPriority@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueAdd@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueEqual@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueGreaterOrEqual@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueGreaterThan@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueHigh32@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueIsNegative@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueIsPositive@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueIsZero@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueLessOrEqual@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueLessThan@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueLow32@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueSubtract@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestFakeAckType@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestFakeInput@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestFlush@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestGetInput@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestInputActionType@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestMovePointer@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestPressButton@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestPressKey@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestQueryInputSize@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestReset@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestStopInput@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateAssociation@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateEmbeddedApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateNonembeddedApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagDestroyApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagDestroyAssociation@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagGetApplicationGroupAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagQueryApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XcupGetReservedColormapEntries@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XcupQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XcupStoreColors@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeAllocateBackBufferName@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeBeginIdiom@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeDeallocateBackBufferName@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeEndIdiom@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeFreeVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeGetBackBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeGetVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeSwapBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XeviGetVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XeviQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XeviQueryVersion@Base 3.5.0.29 - XextAddDisplay@Base 3.5.0.29 - XextCreateExtension@Base 3.5.0.29 - XextDestroyExtension@Base 3.5.0.29 - XextFindDisplay@Base 3.5.0.29 - XextRemoveDisplay@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufChangeBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufChangeWindowAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufClearBufferArea@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufCreateBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufCreateStereoWindow@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufDestroyBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufDisplayBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetScreenInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetWindowAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufQueryExtension@Base 3.5.0.29 - _XExtensionErrorFunction@Base 3.5.0.29 diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install index ae415e6ca..dff1fb037 100644 --- a/debian/nx-x11proto-xext-dev.install +++ b/debian/nx-x11proto-xext-dev.install @@ -2,6 +2,5 @@ usr/include/*/nx-X11/extensions/dpmsstr.h usr/include/*/nx-X11/extensions/xteststr.h usr/include/*/nx-X11/extensions/xtestconst.h usr/include/*/nx-X11/extensions/securstr.h -usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/syncstr.h usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/rules b/debian/rules index 2395f43e5..766042fee 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,6 @@ override_dh_auto_build: override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg - dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg -- cgit v1.2.3