Merge pull request #4 from sunweaver/feature/libxpm-cleanup

library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared library.

 One release goal for version 3.6.x of nx-libs is dropping as many bundled libraries as possible that haven't 
 been adapted to nx-libs.

 Starting with libNX_Xpm here.

 The libNX_Xpm library is only referenced once (nx-X11/programs/Xserver/hw/nxagent/Holder.c).
 When grepping through Xserver/hw/nxagent the suspicion comes up, that the libXpm linkage is not
 needed at all, because none of the provided functions are used inside the nxagent Xserver.

4 files changed, 16 insertions, 93 deletions

diff --git a/debian/control b/debian/control
index b931567c4..65a8f9433 100644
--- a/debian/control
+++ b/debian/control
@@ -17,12 +17,12 @@ Build-Depends:
  libfreetype6-dev,
  libxmltok1-dev,
  libxml2-dev,
+ libxpm-dev,
  autoconf,
  pkg-config,
  x11proto-core-dev,
  expat,
 Build-Conflicts:
- x11proto-kb-dev,
  x11proto-randr-dev,
  x11proto-record-dev,
  x11proto-xinerama-dev,
@@ -683,18 +683,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 pixmap library
+Description: nx-X11 pixmap 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_Xpm provides support and common operation for the XPM pixmap
- format, which is commonly used in legacy X applications. XPM is an
- extension of the monochrome XBM bitmap specified in the X protocol.
+ This package removes the obsoleted libNX_Xpm.so.4 library. With
+ recent versions of NX, the system-wide installed libXpm gets used.
+ .
+ This package can be safely removed.
 
 Package: libnx-xpm-dev
 Provides: libnx-xpm4-dev
@@ -702,20 +700,17 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libnx-xpm4 (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 pixmap library (development headers)
+Description: nx-X11 pixmap library (development headers, 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_Xpm provides support and common operation for the XPM pixmap
- format, which is commonly used in legacy X applications. XPM is an
- extension of the monochrome XBM bitmap specified in the X protocol.
+ This package removes the obsoleted headers for the libNX_Xpm.so.4
+ library. With recent versions of NX, the system-wide installed libXpm
+ gets used.
  .
- This package contains the development headers for this library.
+ This package can be safely removed.
 
 Package: libnx-xpm4-dbg
 Architecture: any
@@ -723,20 +718,19 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libnx-xpm4 (= ${binary:Version}),
  ${misc:Depends},
 Section: debug
 Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 pixmap library (debug package)
+Description: nx-X11 pixmap library (debug package, 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_Xpm provides support and common operation for the XPM pixmap
- format, which is commonly used in legacy X applications. XPM is an
- extension of the monochrome XBM bitmap specified in the X protocol.
+ This package removes the obsoleted debug symbols for the libNX_Xpm.so.4
+ library. With recent versions of NX, the system-wide installed libXpm
+ gets used.
  .
- This package contains debug symbols for this library.
+ This package can be safely removed.
 
 Package: libnx-xrandr2
 Architecture: any
diff --git a/debian/libnx-xpm-dev.install.in b/debian/libnx-xpm-dev.install.in
deleted file mode 100644
index 36c9bb485..000000000
--- a/debian/libnx-xpm-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libNX_Xpm.so
-usr/include/*/nx/X11/xpm.h
diff --git a/debian/libnx-xpm4.install.in b/debian/libnx-xpm4.install.in
deleted file mode 100644
index 5bc9da2a0..000000000
--- a/debian/libnx-xpm4.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xpm.so.*
diff --git a/debian/libnx-xpm4.symbols b/debian/libnx-xpm4.symbols
deleted file mode 100644
index f5aa3297d..000000000
--- a/debian/libnx-xpm4.symbols
+++ /dev/null
@@ -1,68 +0,0 @@
-libNX_Xpm.so.4 libnx-xpm4 #MINVER#
- XpmAttributesSize@Base 3.5.0.29
- XpmCreateBufferFromImage@Base 3.5.0.29
- XpmCreateBufferFromPixmap@Base 3.5.0.29
- XpmCreateBufferFromXpmImage@Base 3.5.0.29
- XpmCreateDataFromImage@Base 3.5.0.29
- XpmCreateDataFromPixmap@Base 3.5.0.29
- XpmCreateDataFromXpmImage@Base 3.5.0.29
- XpmCreateImageFromBuffer@Base 3.5.0.29
- XpmCreateImageFromData@Base 3.5.0.29
- XpmCreateImageFromXpmImage@Base 3.5.0.29
- XpmCreatePixmapFromBuffer@Base 3.5.0.29
- XpmCreatePixmapFromData@Base 3.5.0.29
- XpmCreatePixmapFromXpmImage@Base 3.5.0.29
- XpmCreateXpmImageFromBuffer@Base 3.5.0.29
- XpmCreateXpmImageFromData@Base 3.5.0.29
- XpmCreateXpmImageFromImage@Base 3.5.0.29
- XpmCreateXpmImageFromPixmap@Base 3.5.0.29
- XpmFree@Base 3.5.0.29
- XpmFreeAttributes@Base 3.5.0.29
- XpmFreeExtensions@Base 3.5.0.29
- XpmFreeXpmImage@Base 3.5.0.29
- XpmFreeXpmInfo@Base 3.5.0.29
- XpmGetErrorString@Base 3.5.0.29
- XpmLibraryVersion@Base 3.5.0.29
- XpmReadFileToBuffer@Base 3.5.0.29
- XpmReadFileToData@Base 3.5.0.29
- XpmReadFileToImage@Base 3.5.0.29
- XpmReadFileToPixmap@Base 3.5.0.29
- XpmReadFileToXpmImage@Base 3.5.0.29
- XpmWriteFileFromBuffer@Base 3.5.0.29
- XpmWriteFileFromData@Base 3.5.0.29
- XpmWriteFileFromImage@Base 3.5.0.29
- XpmWriteFileFromPixmap@Base 3.5.0.29
- XpmWriteFileFromXpmImage@Base 3.5.0.29
- xpmColorKeys@Base 3.5.0.29
- xpmCreateImageFromPixmap@Base 3.5.0.29
- xpmCreatePixmapFromImage@Base 3.5.0.29
- xpmDataTypes@Base 3.5.0.29
- xpmFreeColorTable@Base 3.5.0.29
- xpmFreeRgbNames@Base 3.5.0.29
- xpmGetCmt@Base 3.5.0.29
- xpmGetRgbName@Base 3.5.0.29
- xpmGetString@Base 3.5.0.29
- xpmHashIntern@Base 3.5.0.29
- xpmHashSlot@Base 3.5.0.29
- xpmHashTableFree@Base 3.5.0.29
- xpmHashTableInit@Base 3.5.0.29
- xpmInitAttributes@Base 3.5.0.29
- xpmInitXpmImage@Base 3.5.0.29
- xpmInitXpmInfo@Base 3.5.0.29
- xpmNextString@Base 3.5.0.29
- xpmNextUI@Base 3.5.0.29
- xpmNextWord@Base 3.5.0.29
- xpmParseColors@Base 3.5.0.29
- xpmParseData@Base 3.5.0.29
- xpmParseDataAndCreate@Base 3.5.0.29
- xpmParseExtensions@Base 3.5.0.29
- xpmParseHeader@Base 3.5.0.29
- xpmParseValues@Base 3.5.0.29
- xpmPipeThrough@Base 3.5.0.29
- xpmReadRgbNames@Base 3.5.0.29
- xpmSetAttributes@Base 3.5.0.29
- xpmSetInfo@Base 3.5.0.29
- xpmSetInfoMask@Base 3.5.0.29
- xpm_xynormalizeimagebits@Base 3.5.0.29
- xpm_znormalizeimagebits@Base 3.5.0.29
- xpmatoui@Base 3.5.0.29