[interchange-cvs] interchange - racke modified 6 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2008-01-02 09:21:49 GMT
Modified:  .        WHATSNEW-5.5
Modified:  debian   changelog interchange.config interchange.postinst
Modified:           interchange.templates makecat.wrapper
Log:
Apache 2 is now default webserver for Debian packages.

Revision  Changes    Path
1.82      +5 -0      interchange/WHATSNEW-5.5


rev 1.82, prev_rev 1.81
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- WHATSNEW-5.5	27 Dec 2007 08:49:22 -0000	1.81
+++ WHATSNEW-5.5	2 Jan 2008 09:21:48 -0000	1.82
@@ -121,6 +121,11 @@
 * Option editor will now correctly generate variants for options that use
   widgets capable of multiple selections (ie, multiple or checkout widgets).
 
+Packaging
+---------
+
+* Apache 2 is now default webserver for Debian packages.
+
 
 Interchange 5.5.1 released on 2007-08-21.
 



2.83      +2 -1      interchange/debian/changelog


rev 2.83, prev_rev 2.82
Index: changelog
===================================================================
RCS file: /var/cvs/interchange/debian/changelog,v
retrieving revision 2.82
retrieving revision 2.83
diff -u -r2.82 -r2.83
--- changelog	6 Sep 2007 20:47:16 -0000	2.82
+++ changelog	2 Jan 2008 09:21:49 -0000	2.83
@@ -2,12 +2,13 @@
 
   * updated French translation of Debconf templates (Closes: #440784,
     thanks to Christian Perrier <bubulle at debian.org>)
+  * don't care about Apache 1 anymore 
   * fix error in German translation of Debconf templates
   * dependency on adduser added
   * use type error for wrong Debconf input
   * use colon style for Debconf questions
   
- -- Stefan Hornburg (Racke) <racke at linuxia.de>  Thu,  6 Sep 2007 22:47:16 +0200
+ -- Stefan Hornburg (Racke) <racke at linuxia.de>  Wed,  2 Jan 2008 09:58:43 +0100
 
 interchange (5.5.1-1) unstable; urgency=low
 



2.14      +0 -15     interchange/debian/interchange.config


rev 2.14, prev_rev 2.13
Index: interchange.config
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.config,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -r2.13 -r2.14
--- interchange.config	30 Mar 2007 11:39:41 -0000	2.13
+++ interchange.config	2 Jan 2008 09:21:49 -0000	2.14
@@ -38,9 +38,6 @@
 	if [ "$GPGHOME" ]; then
 		db_set interchange/gpghome $GPGHOME
 	fi
-	if [ "$WEBSERVER" ]; then
-		db_set interchange/webserver $WEBSERVER
-	fi
 fi
 
 # Which mode we should use ?
@@ -176,18 +173,6 @@
 # GNUPG Home
 db_input low interchange/gpghome || [ $? -eq 30 ]
 db_go
-
-# Webserver
-if [ -x /usr/sbin/apache2ctl ]; then
-	if [ -x /usr/sbin/apachectl ]; then
-		db_input medium interchange/webserver || [ $? -eq 30 ]
-		db_go
-	else
-		db_set interchange/webserver Apache2
-	fi
-else
-	db_set interchange/webserver Apache
-fi
 
 # Catalog configuration
 db_input medium interchange/docroot || [ $? -eq 30 ]



2.27      +0 -3      interchange/debian/interchange.postinst


rev 2.27, prev_rev 2.26
Index: interchange.postinst
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.postinst,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -r2.26 -r2.27
--- interchange.postinst	30 Mar 2007 11:39:41 -0000	2.26
+++ interchange.postinst	2 Jan 2008 09:21:49 -0000	2.27
@@ -81,9 +81,6 @@
 echo USER=$USER >> $INITCFG
 echo GROUP=$GROUP >> $INITCFG
 
-db_get interchange/webserver
-echo WEBSERVER=$RET >> $INITCFG
-
 db_get interchange/docroot
 echo DOCROOT=$RET >> $INITCFG
 



2.12      +0 -8      interchange/debian/interchange.templates


rev 2.12, prev_rev 2.11
Index: interchange.templates
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.templates,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- interchange.templates	6 Sep 2007 20:47:16 -0000	2.11
+++ interchange.templates	2 Jan 2008 09:21:49 -0000	2.12
@@ -51,14 +51,6 @@
 Default: ""
 Description: 
 
-Template: interchange/webserver
-Type: select
-__Choices: Apache2, Apache
-Default: Apache2
-_Description: Webserver for your Interchange applications:
- This information is necessary for the makecat script. Please specify
- which webserver you want to use for your Interchange applications.
-
 Template: interchange/docroot
 Type: string
 Default: /var/www/shops



2.3       +1 -4      interchange/debian/makecat.wrapper


rev 2.3, prev_rev 2.2
Index: makecat.wrapper
===================================================================
RCS file: /var/cvs/interchange/debian/makecat.wrapper,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- makecat.wrapper	2 Mar 2005 09:01:09 -0000	2.2
+++ makecat.wrapper	2 Jan 2008 09:21:49 -0000	2.3
@@ -1,10 +1,7 @@
 #! /bin/sh -e
 
 . /etc/interchange/init.cfg
-OPTS="--interchangeuser=$USER --linkprogram=/usr/lib/cgi-bin/ic/vlink --documentroot=$DOCROOT --catalogconf=/etc/interchange/catalogs.cfg"
-if [ "$WEBSERVER" = "Apache2" ]; then
-	OPTS="$OPTS --serverconf=/etc/apache2/apache2.conf"
-fi
+OPTS="--interchangeuser=$USER --linkprogram=/usr/lib/cgi-bin/ic/vlink --documentroot=$DOCROOT --catalogconf=/etc/interchange/catalogs.cfg --serverconf=/etc/apache2/apache2.conf"
 
 CMD="/usr/lib/interchange/bin/makecat $OPTS $@"
 if [ "$UID" -eq 0 ]; then