[Webapps-common-discuss] webapps-common/debian changelog, 1.1, 1.2 rules, 1.1, 1.2 webapps-common.dirs, 1.1, 1.2 webapps-common.docs, NONE, 1.1 webapps-common.postinst, NONE, 1.1 webapps-common.templates, 1.2, 1.3

seanius at haydn.debian.org seanius at haydn.debian.org
Sat Jul 30 09:37:08 UTC 2005


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

Modified Files:
	changelog rules webapps-common.dirs webapps-common.templates 
Added Files:
	webapps-common.docs webapps-common.postinst 
Log Message:
huge chunk of work on a first stab at implementation.  still incomplete
and unworking, but one of the included baseline packages (-simple) shows
the most work so far.  not worth mentioning to anyone just yet, but i
want to get this in CVS in case something bad happens to my laptop


Index: changelog
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- changelog	24 May 2005 03:50:54 -0000	1.1
+++ changelog	30 Jul 2005 09:37:06 -0000	1.2
@@ -1,5 +1,7 @@
 webapps-common (0.0) UNRELEASED; urgency=low
 
   * initial version.
+  * including initial versions of 'test' packages to utilize various
+    aspects of webapps-common in the examples directory.
 
  -- sean finney <seanius at debian.org>  Mon, 23 May 2005 23:20:17 -0400

Index: rules
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rules	24 May 2005 03:50:54 -0000	1.1
+++ rules	30 Jul 2005 09:37:06 -0000	1.2
@@ -39,7 +39,9 @@
 	dh_installdirs
 #	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/
 	rm -rf debian/webapps-common/usr/share/webapps-common/internal/CVS
+	rm -rf debian/webapps-common/usr/share/webapps-common/dpkg/CVS
 
 # Build architecture-independent files here.
 binary-indep: build install

Index: webapps-common.dirs
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/webapps-common.dirs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webapps-common.dirs	24 May 2005 03:50:54 -0000	1.1
+++ webapps-common.dirs	30 Jul 2005 09:37:06 -0000	1.2
@@ -1 +1,2 @@
 usr/share/webapps-common/internal
+usr/share/webapps-common/install

--- NEW FILE: webapps-common.docs ---
examples

--- NEW FILE: webapps-common.postinst ---
#!/bin/sh

set -e
. /usr/share/debconf/confmodule

#DEBHELPER#

Index: webapps-common.templates
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/webapps-common.templates,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- webapps-common.templates	29 Jun 2005 05:37:33 -0000	1.2
+++ webapps-common.templates	30 Jul 2005 09:37:06 -0000	1.3
@@ -2,14 +2,14 @@
 Type: boolean
 Default: true
 _Description: Configure web server(s) for ${pkg} with webapps-common?
- ${pkg} must be registered and configured with a web server before
- it can be used.  If you like, this can be handled with
- webapps-common.
+ ${pkg} must be registered and configured with a web server before it can
+ be used.  If you like, this can be handled with webapps-common.
  .
- If you are an advanced web server administrator and know that you want
- to perform this configuration manually, or if your web server has already
- been configured for ${pkg}, you should refuse this option.  Details on what
- needs to be done should most likely be provided in /usr/share/doc/${pkg}.
+ If you are an advanced web server administrator and know that you want to
+ perform this configuration manually, or if your web server has already
+ been configured for ${pkg}, you should refuse this option.  Details on
+ what needs to be done should most likely be provided in
+ /usr/share/doc/${pkg}.
  .
  Otherwise, you should probably choose this option.
 
@@ -17,78 +17,79 @@
 Type: boolean
 Default: true
 _Description: Deconfigure web server(s) for ${pkg} with webapps-common?
- Since you are removing ${pkg}, it's probable that you no longer
- wish to have any web servers configured to use ${pkg}.
+ Since you are removing ${pkg}, it's probable that you no longer wish to
+ have any web servers configured to use ${pkg}.
  .
- If you like, web server deconfiguration can be handled with webapps-common.
+ If you like, web server deconfiguration can be handled with
+ webapps-common.
  .
- If you know that you do want to keep the web server configuration
- for ${pkg}, or if you want to handle the deconfiguration manually,
- you should refuse this option.
+ If you know that you do want to keep the web server configuration for
+ ${pkg}, or if you want to handle the deconfiguration manually, you should
+ refuse this option.
  .
  Otherwise, you should choose this option.
 
 Template: webapps-common/install_error
 Type: select
-Choices: abort, retry, retry (skip questions)
+_Choices: abort, retry, retry (skip questions)
 Default: abort
 _Description: Error registering ${pkg} with webserver(s).  Retry?
- An error seems to have occurred while registering ${pkg} with
- one or more of the web servers on your system.  If it's of any help,
- this was the error encountered:
+ An error seems to have occurred while registering ${pkg} with one or more
+ of the web servers on your system.  If it's of any help, this was the
+ error encountered:
  .
  ${error}
  .
- At this point, you have the option to retry or abort the operation.
- If you choose "retry", you will be prompted with all the configuration
- questions once more and another attempt will be made at performing the
- operation. "retry (skip questions)" will immediately attempt the operation
- again, skipping all questions.  If you choose "abort", the operation will
- fail and you will need to downgrade, reinstall, reconfigure this package,
- or otherwise manually intervene to continue using it.
+ At this point, you have the option to retry or abort the operation. If you
+ choose "retry", you will be prompted with all the configuration questions
+ once more and another attempt will be made at performing the operation.
+ "retry (skip questions)" will immediately attempt the operation again,
+ skipping all questions.  If you choose "abort", the operation will fail
+ and you will need to downgrade, reinstall, reconfigure this package, or
+ otherwise manually intervene to continue using it.
 
 Template: webapps-common/remove_error
 Type: select
-Choices: abort, retry
+_Choices: abort, retry
 Default: abort
 _Description: Error deconfiguring ${pkg} with webserver(s).  Retry?
- An error seems to have occurred while unregistering ${pkg} with
- one or more of the web servers on your system.  If it's of any help,
- this was the error encountered:
+ An error seems to have occurred while unregistering ${pkg} with one or
+ more of the web servers on your system.  If it's of any help, this was the
+ error encountered:
  .
  ${error}
  .
- At this point, you have the option to retry or abort the operation.
- If you choose "retry", you will be prompted with all the configuration
- questions once more and another attempt will be made at performing the
- operation. "retry (skip questions)" will immediately attempt the operation
- again, skipping all questions.  If you choose "abort", the operation will
- fail and you will need to downgrade, reinstall, reconfigure this package,
- or otherwise manually intervene to continue using it.
+ At this point, you have the option to retry or abort the operation. If you
+ choose "retry", you will be prompted with all the configuration questions
+ once more and another attempt will be made at performing the operation.
+ "retry (skip questions)" will immediately attempt the operation again,
+ skipping all questions.  If you choose "abort", the operation will fail
+ and you will need to downgrade, reinstall, reconfigure this package, or
+ otherwise manually intervene to continue using it.
 
 Template: webapps-common/httpd/select_httpd
 Type: multiselect
-Choices: ${httpd}
+_Choices: ${httpd}
 _Description: Please select the webserver(s) to be configured for ${pkg}
 
 Template: webapps-common/httpd/install_type
 Type: select
-Choices: single, virtualhost
+_Choices: single, virtualhost
 _Description: Select how ${pkg} should be installed for ${httpd}.
- Web server package configuration can be done as either 'single' installation
- or a 'virtualhost' configuration.  
+ Web server package configuration can be done as either 'single'
+ installation or a 'virtualhost' configuration.
  .
  The former will enable the package for a standard web server installation.
  The latter will give you the ability to install multiple instances of of
- this package.
- 
+ this package. 
+
 Template: webapps-common/httpd/virtualhost_new
 Type: string
 _Description: Please enter the name of a new virtualhost.
 
 Template: webapps-common/httpd/virtualhost
 Type: select
-Choices: new vhost
+_Choices: new vhost
 _Description: Please select a virtualhost with which to register ${pkg}
 
 Template: webapps-common/httpd/virtualhost_more
@@ -96,7 +97,7 @@
 Default: false
 _Description: Configure ${pkg} with another virtualhost?
 
-Template: webapps-common/httpd/site_directory
+Template: webapps-common/httpd/website_subdirectory
 Type: string
-Default: ${pkg}
-_Description: Please select the webserver directory name for ${pkg}
+_Default: ${pkg}
+_Description: Please provide the website subdirectory name for ${pkg}




More information about the Webapps-common-discuss mailing list