Merge branch 'sunweaver-pr/libXau-cleanup' into 3.6.x

Attributes GH PR #152: https://github.com/ArcticaProject/nx-libs/pull/152
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com>  -- Fri, 01 Jul 2016 14:55:00 +0200

9 files changed, 18 insertions, 112 deletions

diff --git a/debian/README.source b/debian/README.source
index a43fa1de5..71cc0c2b2 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,7 +10,7 @@ This package originally pulled in 7 source tarballs from NoMachine:
 
   nx-X11
   nxagent
-  nxauth
+  nxauth (discontinued in nx-libs)
   nxcomp
   nxcompshad
   nxcompext
diff --git a/debian/control b/debian/control
index 1a58cf6a7..c7e36f50c 100644
--- a/debian/control
+++ b/debian/control
@@ -75,6 +75,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-xau6 (<< 2:3.6.0.0),
         libnx-xcomposite1 (<< 2:3.6.0.0),
         libnx-xdamage1 (<< 2:3.6.0.0),
         libnx-xdmcp6 (<< 2:3.6.0.0),
@@ -85,6 +86,7 @@ Breaks: nxlibs (<= 3.5.1),
         libnx-xrender1 (<< 2:3.6.0.0),
         libnx-xtst6 (<< 2:3.6.0.0),
 Replaces: nxlibs,
+          libnx-xau6,
           libnx-xcomposite1,
           libnx-xdamage1,
           libnx-xdmcp6,
@@ -107,6 +109,7 @@ Provides: libnx-x11-6-dev
 Section: libdevel
 Architecture: any
 Breaks: nxlibs-dev (<=3.5.1),
+        libnx-xau-dev (<< 2:3.6.0.0),
         libnx-xcomposite-dev (<< 2:3.6.0.0),
         libnx-xdamage-dev (<< 2:3.6.0.0),
         libnx-xdmcp-dev (<< 2:3.6.0.0),
@@ -117,6 +120,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-xau-dev,
           libnx-xcomposite-dev,
           libnx-xdamage-dev,
           libnx-xdmcp-dev,
@@ -145,6 +149,7 @@ Depends:
  ${misc:Depends},
 Section: debug
 Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
+        libnx-xau6-dbg (<< 2:3.6.0.0),
         libnx-xcomposite1-dbg (<< 2:3.6.0.0),
         libnx-xdamage1-dbg (<< 2:3.6.0.0),
         libnx-xdmcp6-dbg (<< 2:3.6.0.0),
@@ -155,6 +160,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-xau6-dbg,
           libnx-xcomposite1-dbg,
           libnx-xdamage1-dbg,
           libnx-xdmcp6-dbg,
@@ -172,63 +178,6 @@ Description: nx-X11 client-side library (debug package)
  This package contains debug symbols for the core nx-X11 libraries
  customized for nxagent.
 
-Package: libnx-xau6
-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 authorisation 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 provides the main interface to the nx-X11 authorisation handling,
- which controls authorisation for X connections, both client-side and
- server-side.
-
-Package: libnx-xau-dev
-Provides: libnx-xau6-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends:
- libnx-xau6 (= ${binary:Version}),
- ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-1~),
-Description: nx-X11 authorisation 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 provides the main interface to the nx-X11 authorisation handling,
- which controls authorisation for X connections, both client-side and
- server-side.
- .
- This package contains the development headers for this library.
-
-Package: libnx-xau6-dbg
-Architecture: any
-Multi-Arch: same
-Depends:
- libnx-xau6 (= ${binary:Version}),
- ${misc:Depends},
-Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
-Description: nx-X11 authorisation 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 provides the main interface to the nx-X11 authorisation handling,
- which controls authorisation for X connections, both client-side and
- server-side.
- .
- This package contains debug symbols for this library.
-
 Package: nx-x11proto-composite-dev
 Section: libdevel
 Architecture: any
@@ -430,6 +379,10 @@ Depends:
 Recommends:
  xfonts-base,
  xkb-data,
+Breaks:
+ nxauth,
+Replaces:
+ nxauth,
 Description: NX agent
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -473,12 +426,16 @@ Description: NX agent (debug package)
 
 Package: nxproxy
 Architecture: any
-Breaks: qvd-nxproxy
-Replaces: qvd-nxproxy
 Multi-Arch: foreign
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Breaks:
+ qvd-nxproxy,
+ nxauth,
+Replaces:
+ qvd-nxproxy,
+ nxauth,
 Description: NX proxy
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -507,38 +464,6 @@ Description: NX proxy (debug package)
  helpful backtraces. You can safely remove it if you do not intend to
  debug NX packages on this system.
 
-Package: nxauth
-Architecture: any
-Multi-Arch: foreign
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: NX xauth
- 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 the NX xauth binary.
-
-Package: nxauth-dbg
-Section: debug
-Architecture: any
-Multi-Arch: foreign
-Depends:
- nxauth (= ${binary:Version}),
- ${misc:Depends},
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
-Description: NX auth (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 provides the NX auth binary.
- .
- This package contains detached debug symbols that help generating more
- helpful backtraces. You can safely remove it if you do not intend to
- debug NX packages on this system.
-
 Package: libxcomp3
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install
index 83e2def0e..5f9590cbc 100644
--- a/debian/libnx-x11-dev.install
+++ b/debian/libnx-x11-dev.install
@@ -1,5 +1,6 @@
 usr/lib/*/libNX_X11.so
 usr/include/*/nx-X11/ImUtil.h
+usr/include/*/nx-X11/Xauth.h
 usr/include/*/nx-X11/XKBlib.h
 usr/include/*/nx-X11/Xcms.h
 usr/include/*/nx-X11/Xlib.h
diff --git a/debian/libnx-xau-dev.install b/debian/libnx-xau-dev.install
deleted file mode 100644
index 1bf954c00..000000000
--- a/debian/libnx-xau-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libNX_Xau.so
-usr/include/*/nx-X11/Xauth.h
diff --git a/debian/libnx-xau6.install b/debian/libnx-xau6.install
deleted file mode 100644
index 246377f12..000000000
--- a/debian/libnx-xau6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xau.so.*
diff --git a/debian/libnx-xau6.symbols b/debian/libnx-xau6.symbols
deleted file mode 100644
index 03eeee753..000000000
--- a/debian/libnx-xau6.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-libNX_Xau.so.6 libnx-xau6 #MINVER#
- XauDisposeAuth@Base 3.5.0.29
- XauFileName@Base 3.5.0.29
- XauGetAuthByAddr@Base 3.5.0.29
- XauGetBestAuthByAddr@Base 3.5.0.29
- XauLockAuth@Base 3.5.0.29
- XauReadAuth@Base 3.5.0.29
- XauUnlockAuth@Base 3.5.0.29
- XauWriteAuth@Base 3.5.0.29
diff --git a/debian/nxauth.dirs b/debian/nxauth.dirs
deleted file mode 100644
index 7c8e1505c..000000000
--- a/debian/nxauth.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/lib/nx/bin
diff --git a/debian/nxauth.install b/debian/nxauth.install
deleted file mode 100644
index eefba46b9..000000000
--- a/debian/nxauth.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/nx/bin/nxauth
-usr/bin/nxauth
-usr/share/man/man1/nxauth.1*
diff --git a/debian/rules b/debian/rules
index e41f97c81..2395f43e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,12 +56,9 @@ override_dh_auto_build:
 
 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 -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
-	dh_strip -pnxauth --dbg-package=nxauth-dbg
-