[Webapps-common-discuss] webapps-common/debian rules, 1.2, 1.3 webapps-common.templates, 1.3, 1.4

[seanius at haydn.debian.org]

Update of /cvsroot/webapps-common/webapps-common/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv11323/debian

Modified Files:
	rules webapps-common.templates 
Log Message:
initial support for the test-apache-simple version


Index: rules
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rules	30 Jul 2005 09:37:06 -0000	1.2
+++ rules	2 Aug 2005 23:57:46 -0000	1.3
@@ -40,8 +40,10 @@
 #	debian/credit-xlators > ${DOC}/TRANSLATORS
 	cp -Pr internal debian/webapps-common/usr/share/webapps-common/
 	cp -Pr dpkg debian/webapps-common/usr/share/webapps-common/
+	cp -Pr templates debian/webapps-common/usr/share/webapps-common/
 	rm -rf debian/webapps-common/usr/share/webapps-common/internal/CVS
 	rm -rf debian/webapps-common/usr/share/webapps-common/dpkg/CVS
+	rm -rf debian/webapps-common/usr/share/webapps-common/templates/CVS
 
 # Build architecture-independent files here.
 binary-indep: build install

Index: webapps-common.templates
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/webapps-common.templates,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- webapps-common.templates	30 Jul 2005 09:37:06 -0000	1.3
+++ webapps-common.templates	2 Aug 2005 23:57:46 -0000	1.4
@@ -69,7 +69,8 @@
 
 Template: webapps-common/httpd/select_httpd
 Type: multiselect
-_Choices: ${httpd}
+_Choices: ${httpds}
+Default: ${httpds}
 _Description: Please select the webserver(s) to be configured for ${pkg}
 
 Template: webapps-common/httpd/install_type