[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.6+dfsg-822-gbbe4102

[Andrew Bartlett]

The following commit has been merged in the samba_4.0 branch:
commit 2a00326ce24cef77e015fa084509283dc75b7df9
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed May 29 11:59:49 2013 +1000

    Drop swat from the debian package
    
    This is so we do not ship this with 4.0 and then have complaints when
    it is gone in 4.1, or have to fix bugs in this unmaintained code.
    
    Andrew Bartlett

diff --git a/debian/control b/debian/control
index b0bc06e..cadf736 100644
--- a/debian/control
+++ b/debian/control
@@ -312,27 +312,6 @@ Description: tools for extending Samba
  This package contains include files shared by the various Samba-based
  libraries.
 
-Package: swat
-Architecture: any
-Depends: samba (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd | inet-superserver
-Pre-Depends: dpkg (>= 1.15.6~)
-Recommends: samba-doc (= ${source:Version})
-Conflicts: samba-doc (<< 2:4.0.5~)
-Replaces: samba-doc (<< 2:4.0.5~)
-Description: Samba Web Administration Tool
- Samba is an implementation of the SMB/CIFS protocol for Unix systems,
- providing support for cross-platform file and printer sharing with
- Microsoft Windows, OS X, and other Unix systems.
- .
- This package allows you to administer a Samba server via a web browser.
- .
- SWAT is no longer actively maintained, and its default configuration is
- not secure for use over an untrusted network.  SWAT will also rewrite
- smb.conf, rearranging the entries and deleting all comments as well as
- include= and copy= options, so is not suitable for use in conjunction
- with hand-edited smb.conf files or the default package-managed
- configuration.
-
 Package: samba-doc
 Section: doc
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 05e93b6..4a480e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,11 @@ override_dh_install:
 	rm $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# MIT plugin not required, we are using Heimdal
 	rm $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mit_samba.so
+	# SWAT is not packaged any more (gone from upstream 4.1)
+	rm $(DESTDIR)/usr/sbin/swat
+	rm $(DESTDIR)/usr/share/man/man8/swat.8
+	rm -rf $(DESTDIR)/usr/share/samba/swat
+	rm $(DESTDIR)/usr/share/samba/codepages/*.msg
 	# Included in python-tevent
 	rm $(DESTDIR)/usr/lib/python*/*-packages/_tevent.so
 	rm $(DESTDIR)/usr/lib/python*/*-packages/tevent.py
diff --git a/debian/swat.dirs b/debian/swat.dirs
deleted file mode 100644
index d5df7df..0000000
--- a/debian/swat.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin
-usr/share/samba/swat
diff --git a/debian/swat.install b/debian/swat.install
deleted file mode 100644
index e5c9ad0..0000000
--- a/debian/swat.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/sbin/swat
-usr/share/samba/codepages/*.msg
-usr/share/samba/swat/help/welcome.html
-usr/share/samba/swat/help/welcome-no-samba-doc.html
-usr/share/samba/swat/images
-usr/share/samba/swat/include
-usr/share/samba/swat/lang
-usr/share/man/man8/swat.8
diff --git a/debian/swat.links b/debian/swat.links
deleted file mode 100644
index 21f1094..0000000
--- a/debian/swat.links
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/samba-doc/htmldocs/manpages  usr/share/samba/swat/help/manpages
-usr/share/doc/samba-doc/htmldocs/Samba3-ByExample  usr/share/samba/swat/help/Samba3-ByExample
-usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide  usr/share/samba/swat/help/Samba3-Developers-Guide
-usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO  usr/share/samba/swat/help/Samba3-HOWTO
diff --git a/debian/swat.postinst b/debian/swat.postinst
deleted file mode 100644
index 878ec10..0000000
--- a/debian/swat.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-action="$1"
-oldversion="$2"
-
-if [ -z "$oldversion" ]
-then
-# Set up swat on first install
-	update-inetd --group OTHER --add \
-	 'swat\t\tstream\ttcp\tnowait.400\troot\t/usr/sbin/tcpd\t/usr/sbin/swat'
-fi
-
-#DEBHELPER#
diff --git a/debian/swat.postrm b/debian/swat.postrm
deleted file mode 100644
index 1ec2dca..0000000
--- a/debian/swat.postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-case "$1" in
-	purge)
-		if [ -x /usr/sbin/update-inetd ]; then
-			update-inetd --remove swat
-		fi
-		;;
-	remove)
-		update-inetd --disable swat
-		;;
-	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-		;;
-	*)
-		echo "$0: unknown action \"$1\""
-		exit 0
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
-

-- 
Debian packaging for Samba