nxauth: Drop nxauth tool completely, xauth can be successfully used with nxagent / nxproxy instead.

5 files changed, 11 insertions, 41 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..be1e1b2f2 100644
--- a/debian/control
+++ b/debian/control
@@ -430,6 +430,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 +477,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 +515,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/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..a3979b0fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,5 +63,4 @@ override_dh_strip:
 	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