aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-22 22:48:54 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-22 22:48:54 +0200
commit825af1835c81070931d078b153e2d49df4a6bc69 (patch)
tree8f4d31115a2a3e6159f7fba88a84e6d0997291e6 /debian
parenta5bb888248b3887bbe306505f900368b931b7f18 (diff)
parent49fc383a4107062a843bc0c3a8fd9cae7e20e032 (diff)
downloadnx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.gz
nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.bz2
nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.zip
Merge branch 'sunweaver-pr/libxdmcp-cleanup' into arctica-3.6.x
Attributes GH PR #15: https://github.com/ArcticaProject/nx-libs/pull/15
Diffstat (limited to 'debian')
-rw-r--r--debian/control39
-rw-r--r--debian/libnx-x11-6.symbols8
-rw-r--r--debian/libnx-xdmcp-dev.install.in2
-rw-r--r--debian/libnx-xdmcp6.install.in1
-rw-r--r--debian/libnx-xdmcp6.symbols46
-rwxr-xr-xdebian/rules1
6 files changed, 19 insertions, 78 deletions
diff --git a/debian/control b/debian/control
index e17a387e2..4e4918999 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends:
libxml2-dev,
libxpm-dev,
libxfont-dev,
+ libxdmcp-dev,
autoconf,
pkg-config,
x11proto-core-dev,
@@ -367,19 +368,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 Display Manager Control Protocol library
+Description: nx-X11 Display Manager Control Protocol 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.
.
- nx-X11 Display Manager Control Protocol library
+ This package removes the obsoleted libNX_Xdmcp.so.6 library. With
+ recent versions of NX, the system-wide installed libXdmcp gets used.
.
- This package provides the main interface to the nx-X11 display manager control
- protocol library, which allows for remote logins to display managers.
+ This package can be safely removed.
Package: libnx-xdmcp-dev
Provides: libnx-xdmcp6-dev
@@ -387,21 +385,17 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
- libnx-xdmcp6 (= ${binary:Version}),
${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
- libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Display Manager Control Protocol library (development headers)
+Description: nx-X11 Display Manager Control Protocol 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.
.
- nx-X11 Display Manager Control Protocol library
- .
- This package provides the main interface to the nx-X11 display manager control
- protocol library, which allows for remote logins to display managers.
+ This package removes the obsoleted headers for the libNX_Xdmcp.so.6
+ library. With recent versions of NX, the system-wide installed libXdmcp
+ gets used.
.
- This package contains the development headers for this library.
+ This package can be safely removed.
Package: libnx-xdmcp6-dbg
Architecture: any
@@ -409,21 +403,18 @@ Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
Depends:
- libnx-xdmcp6 (= ${binary:Version}),
${misc:Depends},
Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Display Manager Control Protocol library (debug package)
+Description: nx-X11 Display Manager Control Protocol 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.
.
- nx-X11 Display Manager Control Protocol library
- .
- This package provides the main interface to the nx-X11 display manager control
- protocol library, which allows for remote logins to display managers.
+ This package removes the obsoleted debug symbols for the libNX_Xdmcp.so.6
+ library. With recent versions of NX, the system-wide installed libXdmcp
+ gets used.
.
- This package contains debug symbols for this library.
+ This package can be safely removed.
Package: libnx-xext6
Architecture: any
diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols
index 4b7ceacbe..b9ab97120 100644
--- a/debian/libnx-x11-6.symbols
+++ b/debian/libnx-x11-6.symbols
@@ -547,7 +547,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
XcmsTekHVCWhiteShiftColors@Base 3.5.0.29
XcmsUNDEFINEDColorSpace@Base 3.5.0.29
XcmsVisualOfCCC@Base 3.5.0.29
- XdmcpWrap@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0~build1# XdmcpWrap@Base 3.5.0.29
XkbAddDeviceLedInfo@Base 3.5.0.29
XkbAddGeomColor@Base 3.5.0.29
XkbAddGeomDoodad@Base 3.5.0.29
@@ -956,9 +956,9 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XcmsTekHVC_prefix@Base 3.5.0.29
_XcmsUnresolveColor@Base 3.5.0.29
_Xdebug@Base 3.5.0.29
- _XdmcpAuthDoIt@Base 3.5.0.29
- _XdmcpAuthSetup@Base 3.5.0.29
- _XdmcpWrapperToOddParity@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthDoIt@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthSetup@Base 3.5.0.29
+#MISSING: 2:3.5.99.0-0~build1# _XdmcpWrapperToOddParity@Base 3.5.0.29
_Xevent_to_mask@Base 3.5.0.29
_Xglobal_lock@Base 3.5.0.29
_Xi18n_lock@Base 3.5.0.29
diff --git a/debian/libnx-xdmcp-dev.install.in b/debian/libnx-xdmcp-dev.install.in
deleted file mode 100644
index 2c2457b10..000000000
--- a/debian/libnx-xdmcp-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libNX_Xdmcp.so
-usr/include/*/nx/X11/Xdmcp.h
diff --git a/debian/libnx-xdmcp6.install.in b/debian/libnx-xdmcp6.install.in
deleted file mode 100644
index 69100139e..000000000
--- a/debian/libnx-xdmcp6.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xdmcp.so.*
diff --git a/debian/libnx-xdmcp6.symbols b/debian/libnx-xdmcp6.symbols
deleted file mode 100644
index 49645d63a..000000000
--- a/debian/libnx-xdmcp6.symbols
+++ /dev/null
@@ -1,46 +0,0 @@
-libNX_Xdmcp.so.6 libnx-xdmcp6 #MINVER#
- Xalloc@Base 3.5.0.29
- XdmcpARRAY8Equal@Base 3.5.0.29
- XdmcpAllocARRAY16@Base 3.5.0.29
- XdmcpAllocARRAY32@Base 3.5.0.29
- XdmcpAllocARRAY8@Base 3.5.0.29
- XdmcpAllocARRAYofARRAY8@Base 3.5.0.29
- XdmcpCompareKeys@Base 3.5.0.29
- XdmcpCopyARRAY8@Base 3.5.0.29
- XdmcpDecrementKey@Base 3.5.0.29
- XdmcpDisposeARRAY16@Base 3.5.0.29
- XdmcpDisposeARRAY32@Base 3.5.0.29
- XdmcpDisposeARRAY8@Base 3.5.0.29
- XdmcpDisposeARRAYofARRAY8@Base 3.5.0.29
- XdmcpFill@Base 3.5.0.29
- XdmcpFlush@Base 3.5.0.29
- XdmcpGenerateKey@Base 3.5.0.29
- XdmcpIncrementKey@Base 3.5.0.29
- XdmcpReadARRAY16@Base 3.5.0.29
- XdmcpReadARRAY32@Base 3.5.0.29
- XdmcpReadARRAY8@Base 3.5.0.29
- XdmcpReadARRAYofARRAY8@Base 3.5.0.29
- XdmcpReadCARD16@Base 3.5.0.29
- XdmcpReadCARD32@Base 3.5.0.29
- XdmcpReadCARD8@Base 3.5.0.29
- XdmcpReadHeader@Base 3.5.0.29
- XdmcpReadRemaining@Base 3.5.0.29
- XdmcpReallocARRAY16@Base 3.5.0.29
- XdmcpReallocARRAY32@Base 3.5.0.29
- XdmcpReallocARRAY8@Base 3.5.0.29
- XdmcpReallocARRAYofARRAY8@Base 3.5.0.29
- XdmcpUnwrap@Base 3.5.0.29
- XdmcpWrap@Base 3.5.0.29
- XdmcpWriteARRAY16@Base 3.5.0.29
- XdmcpWriteARRAY32@Base 3.5.0.29
- XdmcpWriteARRAY8@Base 3.5.0.29
- XdmcpWriteARRAYofARRAY8@Base 3.5.0.29
- XdmcpWriteCARD16@Base 3.5.0.29
- XdmcpWriteCARD32@Base 3.5.0.29
- XdmcpWriteCARD8@Base 3.5.0.29
- XdmcpWriteHeader@Base 3.5.0.29
- Xfree@Base 3.5.0.29
- Xrealloc@Base 3.5.0.29
- _XdmcpAuthDoIt@Base 3.5.0.29
- _XdmcpAuthSetup@Base 3.5.0.29
- _XdmcpWrapperToOddParity@Base 3.5.0.29
diff --git a/debian/rules b/debian/rules
index 6d076a1c4..dd4f1c7c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,6 @@ override_dh_strip:
dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg
dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg
dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg
- dh_strip -plibnx-xdmcp6 --dbg-package=libnx-xdmcp6-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