From 96645e3f1638061cc3817e90114e037802e9c43a Mon Sep 17 00:00:00 2001
From: Stefan Hornburg <racke@linuxia.de>
Date: Wed, 4 Jun 2008 12:42:26 +0000
Subject: [PATCH] remove SOAP questions from Debconf

---
 README.debian                | 10 ++++++++++
 debian/changelog             |  4 +++-
 debian/interchange.config    | 13 +------------
 debian/interchange.postinst  | 10 +---------
 debian/interchange.templates | 13 -------------
 5 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/README.debian b/README.debian
index c9fbf5854..59f1ccbbe 100644
--- a/README.debian
+++ b/README.debian
@@ -37,6 +37,16 @@ Standard Demo
 For the administration of the standard demo (interchange-cat-standard
 package) a secure webserver (https://) is required.
 
+SOAP
+====
+
+The Interchange SOAP server is disabled by default. Run the following
+commands to activate the SOAP server:
+
+apt-get install libsoap-lite-perl
+interchangeconfig SOAP=1
+/etc/init.d/interchange restart
+
 Other Notes
 ===========
 
diff --git a/debian/changelog b/debian/changelog
index 706c6775e..01efa46f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,12 @@ interchange (5.6.0-0.1) unstable; urgency=low
     - added defaults for database name and database user 
   * added Dutch translation of Debconf templates (Closes: #474696,
     thanks to Bart Cornelis <cobaco@skolelinux.no>)
+  * Debconf
+    - use colon style
+    - remove SOAP questions
   * don't care about Apache 1 anymore 
   * fix error in German translation of Debconf templates
   * use type error for wrong Debconf input
-  * use colon style for Debconf questions
   * fixed POD error in interchangeconfig script
   * lintian fixes
     - fix section in interchangeconfig/te manual pages
diff --git a/debian/interchange.config b/debian/interchange.config
index 6d94f8333..e73f22e3b 100755
--- a/debian/interchange.config
+++ b/debian/interchange.config
@@ -1,6 +1,6 @@
 #! /bin/sh -e
 #
-# Copyright 2000,2001,2002,2003,2004,2005,2007 by Stefan Hornburg (Racke) <racke@linuxia.de>
+# Copyright 2000,2001,2002,2003,2004,2005,2007,2008 by Stefan Hornburg (Racke) <racke@linuxia.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -140,9 +140,6 @@ if [ -f /etc/interchange/settings.cfg ]; then
 			if [ "$name" = "ROBOTS" ]; then
 				db_set interchange/robots $FLAG
 			fi
-			if [ "$name" = "SOAP" ]; then
-				db_set interchange/soap $FLAG
-			fi
 			if [ "$name" = "TRAFFIC" ]; then
 				db_set interchange/traffic $value
 			fi
@@ -154,14 +151,6 @@ fi
 db_input low interchange/full_url || [ $? -eq 30 ]
 db_go
 
-# SOAP server
-if /usr/bin/perl -MSOAP::Lite -e '' 2>/dev/null; then
-	db_set interchange/cansoap true
-	db_input low interchange/soap || [ $? -eq 30 ]
-else
-	db_input low interchange/cansoap || [ $? -eq 30 ]
-fi
-
 # Inclusion of robots directives
 db_input low interchange/robots || [ $? -eq 30 ]
 db_go
diff --git a/debian/interchange.postinst b/debian/interchange.postinst
index b0b0e3a33..5ae8b5de1 100644
--- a/debian/interchange.postinst
+++ b/debian/interchange.postinst
@@ -96,18 +96,10 @@ if [ "$RET" = true ]; then
 else
 	FULL_URL=0
 fi
-db_get interchange/cansoap
-SOAP=0
-if [ "$RET" = true ]; then
-	db_get interchange/soap
-	if [ "$RET" = true ]; then
-		SOAP=1
-	fi
-fi
 db_get interchange/traffic
 TRAFFIC="$RET"
 
-/usr/sbin/interchangeconfig FULL_URL=$FULL_URL SOAP=$SOAP TRAFFIC=$RET
+/usr/sbin/interchangeconfig FULL_URL=$FULL_URL TRAFFIC=$RET
 
 # Make configuration files owned by the interchange user
 chown -R $USER.$GROUP /etc/interchange
diff --git a/debian/interchange.templates b/debian/interchange.templates
index ec40ccb85..e1ee388b4 100644
--- a/debian/interchange.templates
+++ b/debian/interchange.templates
@@ -84,19 +84,6 @@ _Description: Enable the FullURL directive?
  This setting determines if the whole URL is considered while checking for
  the corresponding catalog.
 
-Template: interchange/cansoap
-Type: note
-_Description: SOAP server not available
- Because the Perl module SOAP::Lite is not installed, you are unable to run
- the Interchange SOAP server. To change this, install the libsoap-lite-perl
- Debian package and run interchangeconfig SOAP=1.
-
-Template: interchange/soap
-Type: boolean
-Default: false
-_Description: Enable the SOAP server?
- This setting determines if the SOAP server is started or not.
-
 Template: interchange/robots
 Type: boolean
 Default: true