Remove packages heimdal-clients-x and heimdal-servers-x, as their binaries are no longer shipped upstream.

8 files changed, 9 insertions, 119 deletions

diff --git a/debian/changelog b/debian/changelog
index 7403ef76d..35f0ce80c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,14 @@ heimdal (1.7~git20150920+dfsg-1) UNRELEASED; urgency=medium
 
   * Set Multi-Arch: same for heimdal-dbg.
   * New upstream snapshot.
-  * Drop patch 024_rxtelnet: source files removed upstream.
-  * Drop patch 044_hdb_ldap_static: applied upstream.
-  * Drop patch 045_hx509_symbol_names: applied upstream.
-  * Drop patch 048_private_libs: applied upstream.
-  * Drop patch 050_kadmin_to_usr_bin: applied upstream.
-  * Drop patch 051_bug746486-memleak: was cherry-picked from upstream.
+   + Drop patch 024_rxtelnet: source files removed upstream.
+   + Drop patch 044_hdb_ldap_static: applied upstream.
+   + Drop patch 045_hx509_symbol_names: applied upstream.
+   + Drop patch 048_private_libs: applied upstream.
+   + Drop patch 050_kadmin_to_usr_bin: applied upstream.
+   + Drop patch 051_bug746486-memleak: was cherry-picked from upstream.
+   + Remove packages heimdal-clients-x and heimdal-servers-x, as their binaries
+     are no longer shipped upstream.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sun, 20 Sep 2015 15:56:49 +0000
 
diff --git a/debian/control b/debian/control
index ffa99a0a2..ab303a9fb 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Replaces: heimdal-lib (<< 0.3c-5),
           heimdal-servers (<< 0.6.3-3),
           libkrb5-15-heimdal
 Conflicts: heimdal-lib (<< 0.3c-5)
-Suggests: heimdal-clients, heimdal-clients-x, heimdal-servers, heimdal-servers-x
+Suggests: heimdal-clients, heimdal-servers
 Description: Heimdal Kerberos - documentation
  Heimdal is a free implementation of Kerberos 5 that aims to be
  compatible with MIT Kerberos.
@@ -122,20 +122,6 @@ Description: Heimdal Kerberos - development files
  This is the development package, required for developing
  programs for Heimdal.
 
-Package: heimdal-clients-x
-Priority: extra
-Architecture: any
-Depends: heimdal-clients, ${misc:Depends}, ${shlibs:Depends}
-Replaces: heimdal-clients (<< 0.2l-2)
-Conflicts: heimdal-clients (<< 0.2l-2), kerberos4kth-x11
-Suggests: heimdal-docs
-Description: Heimdal Kerberos - X11 client programs
- Heimdal is a free implementation of Kerberos 5 that aims to be
- compatible with MIT Kerberos.
- .
- This package includes Kerberos client programs for forwarding the X
- connection securely to a remote computer.
-
 Package: heimdal-clients
 Priority: extra
 Architecture: any
@@ -172,23 +158,6 @@ Description: Heimdal Kerberos - KCM daemon
  the UID and GID of the user. The tickets are renewed as long as is
  permitted by the KDC's policy.
 
-Package: heimdal-servers-x
-Priority: extra
-Architecture: any
-Conflicts: heimdal-servers (<< 0.2l-3), kerberos4kth-x11
-Depends: heimdal-servers,
-         openbsd-inetd|inet-superserver,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: heimdal-docs
-Replaces: heimdal-servers (<< 0.2l-3)
-Description: Heimdal Kerberos - X11 server programs
- Heimdal is a free implementation of Kerberos 5 that aims to be
- compatible with MIT Kerberos.
- .
- This package includes Kerberos server programs for forwarding the X
- connection securely from a remote computer.
-
 Package: heimdal-servers
 Priority: extra
 Architecture: any
diff --git a/debian/heimdal-clients-x.install b/debian/heimdal-clients-x.install
deleted file mode 100644
index 9d48be6d3..000000000
--- a/debian/heimdal-clients-x.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/bin/kx
-usr/bin/rxtelnet
-usr/bin/rxterm
-usr/bin/tenletxr
-usr/bin/xnlock
-usr/share/man/man1/kx.1
-usr/share/man/man1/rxtelnet.1
-usr/share/man/man1/rxterm.1
-usr/share/man/man1/tenletxr.1
-usr/share/man/man1/xnlock.1
diff --git a/debian/heimdal-servers-x.dirs b/debian/heimdal-servers-x.dirs
deleted file mode 100644
index 6209a9dfe..000000000
--- a/debian/heimdal-servers-x.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/heimdal-servers
diff --git a/debian/heimdal-servers-x.install b/debian/heimdal-servers-x.install
deleted file mode 100644
index f584997a9..000000000
--- a/debian/heimdal-servers-x.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin/kxd usr/lib/heimdal-servers
-usr/share/man/man8/kxd.8
diff --git a/debian/heimdal-servers-x.postinst b/debian/heimdal-servers-x.postinst
deleted file mode 100644
index bb0ea22fd..000000000
--- a/debian/heimdal-servers-x.postinst
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-
-add_servers() {
-    kx_entry="kx	stream	tcp	nowait	root	/usr/sbin/tcpd /usr/lib/heimdal-servers/kxd"
-	update-inetd --group KRB5 --add "$kx_entry"
-}
-
-enable_servers() {
-	update-inetd --pattern '[ \t]/usr/lib/heimdal-servers/kx' --enable kx
-}
-
-remove_servers() {
-	update-inetd --remove 'kx[ \t].*[ \t]/usr/lib/heimdal-servers/kxd'
-}
-
-case "$1" in
-abort-upgrade | abort-deconfigure | abort-remove)
-	enable_servers
-	;;
-configure)
-	if [ -n "$2" ] && dpkg --compare-versions "$2" ge 0.2h-1; then
-		enable_servers
-	else
-		remove_servers
-		add_servers
-	fi
-	;;
-*)
-	printf "$0: incorrect arguments: $*\n" >&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
diff --git a/debian/heimdal-servers-x.postrm b/debian/heimdal-servers-x.postrm
deleted file mode 100644
index 4bfc21456..000000000
--- a/debian/heimdal-servers-x.postrm
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-# $Id: heimdal-servers-x.postrm,v 1.2 1999/12/26 00:00:46 bam Exp $
-
-remove_servers() {
-	update-inetd --remove 'kx[ \t].*[ \t]/usr/lib/heimdal-servers/kxd'
-}
-
-case "$1" in
-abort-install | remove | abort-upgrade | upgrade | failed-upgrade | disappear)
-	;;
-purge)
-	# If netbase is not installed, then we don't need to do the remove.
-	if command -v update-inetd >/dev/null 2>&1; then
-		remove_servers
-	fi
-	;;
-*)
-	echo "$0: incorrect arguments: $*" >&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
diff --git a/debian/heimdal-servers-x.prerm b/debian/heimdal-servers-x.prerm
deleted file mode 100644
index 646eb898c..000000000
--- a/debian/heimdal-servers-x.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-disable_servers() {
-	update-inetd --pattern '[ \t]/usr/lib/heimdal-servers/kx' --disable kx
-}
-
-if command -v update-inetd >/dev/null 2>&1; then
-	disable_servers
-fi
-
-#DEBHELPER#