From ebcb6a6e172bded13a13963ea03d279541978e8e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 25 Jun 2015 05:37:03 +0200 Subject: library-cleanup: Don't build libNX_Xrender anymore. Use system's libXrender shared library. --- debian/control | 60 ++++++++++++++----------------------- debian/libnx-xrender-dev.install.in | 2 -- debian/libnx-xrender1.install.in | 1 - debian/libnx-xrender1.symbols | 49 ------------------------------ debian/rules | 1 - 5 files changed, 22 insertions(+), 91 deletions(-) delete mode 100644 debian/libnx-xrender-dev.install.in delete mode 100644 debian/libnx-xrender1.install.in delete mode 100644 debian/libnx-xrender1.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index 94aa64014..83aee8e58 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: libxfixes-dev, libxtst-dev, libxinerama-dev, + libxrender-dev, autoconf, pkg-config, x11proto-core-dev, @@ -747,21 +748,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 Rendering Extension client library +Description: nx-X11 Rendering Extension client 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. . - The X Rendering Extension (Render) introduces digital image composition - as the foundation of a new rendering model within the X Window System. - Rendering geometric figures is accomplished by client-side tessellation - into either triangles or trapezoids. Text is drawn by loading glyphs - into the server and rendering sets of them. The Xrender library exposes - this extension to X clients. + This package removes the obsoleted libNX_Xrender.so.1 library. With + recent versions of NX, the system-wide installed libXrender gets used. + . + This package can be safely removed. Package: libnx-xrender-dev Provides: libnx-xrender1-dev @@ -769,24 +765,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrender1 (= ${binary:Version}), - nx-x11proto-render-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Rendering Extension client library (development headers) +Description: nx-X11 Rendering Extension client 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. . - The X Rendering Extension (Render) introduces digital image composition - as the foundation of a new rendering model within the X Window System. - Rendering geometric figures is accomplished by client-side tessellation - into either triangles or trapezoids. Text is drawn by loading glyphs - into the server and rendering sets of them. The Xrender library exposes - this extension to X clients. + This package removes the obsoleted headers for the libNX_Xrender.so.1 + library. With recent versions of NX, the system-wide installed libXrender + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-render-dev Section: libdevel @@ -794,16 +783,16 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Render extension wire protocol +Description: nx-X11 Render 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 provides development headers describing the wire protocol - for the Render extension, used to implement Porter-Duff operations - within X. + This package removes the obsoleted headers for the libNX_Xrender.so.1 + library. With recent versions of NX, the system-wide installed libXrender + gets used. + . + This package can be safely removed. Package: libnx-xrender1-dbg Architecture: any @@ -811,23 +800,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xrender1 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Rendering Extension client library (debug package) +Description: nx-X11 Rendering Extension client 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. . - The X Rendering Extension (Render) introduces digital image composition - as the foundation of a new rendering model within the X Window System. - Rendering geometric figures is accomplished by client-side tessellation - into either triangles or trapezoids. Text is drawn by loading glyphs - into the server and rendering sets of them. The Xrender library exposes - this extension to X clients. + This package removes the obsoleted debug symbols for the libNX_Xrender.so.1 + library. With recent versions of NX, the system-wide installed libXrender + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xtst6 Architecture: any diff --git a/debian/libnx-xrender-dev.install.in b/debian/libnx-xrender-dev.install.in deleted file mode 100644 index 2aede35da..000000000 --- a/debian/libnx-xrender-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xrender.so -usr/include/*/nx-X11/extensions/Xrender.h diff --git a/debian/libnx-xrender1.install.in b/debian/libnx-xrender1.install.in deleted file mode 100644 index 371550abb..000000000 --- a/debian/libnx-xrender1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xrender.so.* diff --git a/debian/libnx-xrender1.symbols b/debian/libnx-xrender1.symbols deleted file mode 100644 index bb51b1a1f..000000000 --- a/debian/libnx-xrender1.symbols +++ /dev/null @@ -1,49 +0,0 @@ -libNX_Xrender.so.1 libnx-xrender1 #MINVER# - XRenderAddGlyphs@Base 3.5.0.29 - XRenderAddTraps@Base 3.5.0.29 - XRenderChangePicture@Base 3.5.0.29 - XRenderCleanGlyphs@Base 3.5.0.29 - XRenderComposite@Base 3.5.0.29 - XRenderCompositeDoublePoly@Base 3.5.0.29 - XRenderCompositeString16@Base 3.5.0.29 - XRenderCompositeString32@Base 3.5.0.29 - XRenderCompositeString8@Base 3.5.0.29 - XRenderCompositeText16@Base 3.5.0.29 - XRenderCompositeText32@Base 3.5.0.29 - XRenderCompositeText8@Base 3.5.0.29 - XRenderCompositeTrapezoids@Base 3.5.0.29 - XRenderCompositeTriFan@Base 3.5.0.29 - XRenderCompositeTriStrip@Base 3.5.0.29 - XRenderCompositeTriangles@Base 3.5.0.29 - XRenderCreateAnimCursor@Base 3.5.0.29 - XRenderCreateConicalGradient@Base 3.5.0.29 - XRenderCreateCursor@Base 3.5.0.29 - XRenderCreateGlyphSet@Base 3.5.0.29 - XRenderCreateLinearGradient@Base 3.5.0.29 - XRenderCreatePicture@Base 3.5.0.29 - XRenderCreateRadialGradient@Base 3.5.0.29 - XRenderCreateSolidFill@Base 3.5.0.29 - XRenderExtensionInfo@Base 3.5.0.29 - XRenderExtensionName@Base 3.5.0.29 - XRenderFillRectangle@Base 3.5.0.29 - XRenderFillRectangles@Base 3.5.0.29 - XRenderFindDisplay@Base 3.5.0.29 - XRenderFindFormat@Base 3.5.0.29 - XRenderFindStandardFormat@Base 3.5.0.29 - XRenderFindVisualFormat@Base 3.5.0.29 - XRenderFreeGlyphSet@Base 3.5.0.29 - XRenderFreeGlyphs@Base 3.5.0.29 - XRenderFreePicture@Base 3.5.0.29 - XRenderParseColor@Base 3.5.0.29 - XRenderQueryExtension@Base 3.5.0.29 - XRenderQueryFilters@Base 3.5.0.29 - XRenderQueryFormats@Base 3.5.0.29 - XRenderQueryPictIndexValues@Base 3.5.0.29 - XRenderQuerySubpixelOrder@Base 3.5.0.29 - XRenderQueryVersion@Base 3.5.0.29 - XRenderReferenceGlyphSet@Base 3.5.0.29 - XRenderSetPictureClipRectangles@Base 3.5.0.29 - XRenderSetPictureClipRegion@Base 3.5.0.29 - XRenderSetPictureFilter@Base 3.5.0.29 - XRenderSetPictureTransform@Base 3.5.0.29 - XRenderSetSubpixelOrder@Base 3.5.0.29 diff --git a/debian/rules b/debian/rules index c90bb6451..578fc84f8 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,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-xrender1 --dbg-package=libnx-xrender1-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