[xml/sgml-commit] r1855 - in /packages/w3c-markup-validator/trunk: debian/rules htdocs/config/validator.conf htdocs/header.html htdocs/intro.html htdocs/no_referer.asis htdocs/style/base.css httpd/conf/httpd.conf share/templates/en_US/header.tmpl
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Wed Mar 16 17:03:57 UTC 2011
Author: periapt-guest
Date: Wed Mar 16 17:03:54 2011
New Revision: 1855
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1855
Log:
fixed missing file
Modified:
packages/w3c-markup-validator/trunk/debian/rules
packages/w3c-markup-validator/trunk/htdocs/config/validator.conf
packages/w3c-markup-validator/trunk/htdocs/header.html
packages/w3c-markup-validator/trunk/htdocs/intro.html
packages/w3c-markup-validator/trunk/htdocs/no_referer.asis
packages/w3c-markup-validator/trunk/htdocs/style/base.css
packages/w3c-markup-validator/trunk/httpd/conf/httpd.conf
packages/w3c-markup-validator/trunk/share/templates/en_US/header.tmpl
Modified: packages/w3c-markup-validator/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/rules?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/rules (original)
+++ packages/w3c-markup-validator/trunk/debian/rules Wed Mar 16 17:03:54 2011
@@ -14,9 +14,10 @@
override_dh_install:
dh_install httpd/cgi-bin/check ${CGIBIN_DIR}
dh_install httpd/cgi-bin/sendfeedback.pl ${CGIBIN_DIR}
+ dh_install httpd/conf/* ${CONFIG_DIR}
dh_install htdocs/config/* ${CONFIG_DIR}
dh_install share/templates/en_US/* ${SHARED_DIR}/templates/en_US
- dh_install -XLICENSE -Xconf -X.gz -Xtest htdocs/* ${HTML_DIR}
+ dh_install -XLICENSE -Xconfig -X.gz -Xtest htdocs/* ${HTML_DIR}
dh_install debian/logo.png ${IMAGES_DIR}
override_dh_installdocs:
Modified: packages/w3c-markup-validator/trunk/htdocs/config/validator.conf
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/htdocs/config/validator.conf?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/htdocs/config/validator.conf (original)
+++ packages/w3c-markup-validator/trunk/htdocs/config/validator.conf Wed Mar 16 17:03:54 2011
@@ -19,11 +19,11 @@
#
# Base path. Defaults to the value of the W3C_VALIDATOR_HOME environment
# variable or /usr/local/validator if the variable does not exist.
- #Base = /usr/local/validator
+ Base = /usr/share/w3c-markup-validator
#
# Location of template files
- Templates = $Base/share/templates
+ Templates = $Base/templates
#
# Directory where to store cached templates. Relative paths are
@@ -34,12 +34,12 @@
#Cache = validator
# configuration file for HTML::Tidy Module, if available
- TidyConf = $Base/htdocs/config/tidy.conf
+ TidyConf = /etc/w3c/tidy.conf
<SGML>
#
# The SGML Library Path.
- Library = $Base/htdocs/sgml-lib
+ Library = /usr/share/xml/xhtml/schema/dtd
</SGML>
</Paths>
@@ -72,12 +72,12 @@
# Protocols the validator is allowed to use for retrieving documents.
# The default is to allow http and https.
<Protocols>
- Allow = data,ftp,http,https
+ Allow = http
</Protocols>
#
# Email address of the maintainer of this service.
-Maintainer = www-validator at w3.org
+Maintainer = webmaster at localhost
# Localization
# only English available for now
Modified: packages/w3c-markup-validator/trunk/htdocs/header.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/htdocs/header.html?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/htdocs/header.html (original)
+++ packages/w3c-markup-validator/trunk/htdocs/header.html Wed Mar 16 17:03:54 2011
@@ -31,7 +31,7 @@
<body>
<div id="banner">
<h1 id="title">
- <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="<!--#echo var="relroot" -->images/w3c.png" /></a>
+ <a href="http://www.debian.org/"><img alt="W3C on Debian" width="110" height="61" id="logo" src="./images/logo.png" /></a>
<a href="<!--#echo var="relroot" -->"><span>Markup Validation Service</span></a>
</h1>
<p id="tagline">Check the markup (HTML, XHTML, …) of Web documents</p>
Modified: packages/w3c-markup-validator/trunk/htdocs/intro.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/htdocs/intro.html?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/htdocs/intro.html (original)
+++ packages/w3c-markup-validator/trunk/htdocs/intro.html Wed Mar 16 17:03:54 2011
@@ -15,7 +15,3 @@
<div class="intro" id="don_program"></div>
<script type="text/javascript" src="http://www.w3.org/QA/Tools/don_prog.js"></script>
-<p id="test_warning"><img src="images/info_icons/warning.png" alt="Important" />
- This instance of the validator is either a development version used for testing purposes, or a local copy of the <a href="http://validator.w3.org/source/">W3C Markup Validator software</a> used for development and testing purposes.<br />
- The official validation service supported by the W3C is at <a href="http://validator.w3.org/">validator.w3.org</a>.
-</p>
Modified: packages/w3c-markup-validator/trunk/htdocs/no_referer.asis
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/htdocs/no_referer.asis?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/htdocs/no_referer.asis (original)
+++ packages/w3c-markup-validator/trunk/htdocs/no_referer.asis Wed Mar 16 17:03:54 2011
@@ -22,7 +22,7 @@
<div id="banner">
<h1 id="title">
- <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="./images/no_w3c.png" /></a>
+ <a href="http://www.debian.org/"><img alt="W3C on Debian" width="110" height="61" id="logo" src="./images/logo.png" /></a>
<a href="./"><span>Markup Validation Service</span></a>
</h1>
Modified: packages/w3c-markup-validator/trunk/htdocs/style/base.css
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/htdocs/style/base.css?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/htdocs/style/base.css (original)
+++ packages/w3c-markup-validator/trunk/htdocs/style/base.css Wed Mar 16 17:03:54 2011
@@ -721,26 +721,6 @@
}
-/* warning on the home page for test instances */
-#test_warning {
- border-left: 1px solid #ccc;
- border-right: 1px solid #ccc;
- line-height: 160%;
- text-align: center;
- margin-top: 2em;
- margin-left: 12%;
- margin-right: 12%;
- padding-left: 1.5em;
- padding-right: 1.5em;
- color: black;
- background-color: white;
-}
-
-#test_warning img {
- width: 1.3em;
- vertical-align: middle;
-}
-
/* donation and sponsorship program */
div#don_program { border: 1px solid #55b05a; padding: .5em; line-height: 150%; text-align: center; margin-top: .5em; }
Modified: packages/w3c-markup-validator/trunk/httpd/conf/httpd.conf
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/httpd/conf/httpd.conf?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/httpd/conf/httpd.conf (original)
+++ packages/w3c-markup-validator/trunk/httpd/conf/httpd.conf Wed Mar 16 17:03:54 2011
@@ -1,34 +1,22 @@
# -*- apache -*-
-# Example httpd.conf snippet for W3C Markup Validation Service
+# Debianized httpd.conf snippet for W3C Markup Validation Service
# Note that this is not a complete server configuration file, but contains
# only the validator-specific part.
#
-# You can use the Include directive for including this in your main httpd.conf.
+# The w3c-markup-validator postinst script will link
+# /etc/apache2/conf.d/w3c-markup-validator.conf -> /etc/w3c/httpd.conf
#
-# The values below assume that you have the validator files in
-# /usr/local/validator. If not, tune them according to your setup.
+# Note: mod_perl has been disabled. See #618469.
#
-# To run the validator without mod_perl 2.x even if it is loaded, comment
-# out the "IfDefine MODPERL2" sections below.
# First, tell httpd that check and sendfeedback.pl are CGI scripts.
-AliasMatch ^/+w3c-validator/+check(/+referer)?$ /usr/local/validator/cgi-bin/check
-AliasMatch ^/+w3c-validator/+feedback(\.html)?$ /usr/local/validator/cgi-bin/sendfeedback.pl
-
-<IfDefine MODPERL2>
-# Note: this affects the whole server, not just the validator.
-PerlSwitches -T
-</IfDefine>
+AliasMatch ^/+w3c-validator/+check(/+referer)?$ /usr/lib/cgi-bin/w3c-markup-validator/check
+AliasMatch ^/+w3c-validator/+feedback(\.html)?$ /usr/lib/cgi-bin/w3c-markup-validator/sendfeedback.pl
<LocationMatch "^/+w3c-validator/+(check(/+referer)?|feedback(\.html)?)$">
Options +ExecCGI
SetHandler cgi-script
-<IfDefine MODPERL2>
- SetHandler perl-script
- PerlResponseHandler ModPerl::Registry
- PerlOptions +ParseHeaders
-</IfDefine>
# Environment settings affecting validator's outside connectivity, see
# LWP::UserAgent and Net::FTP documentation for details.
#SetEnv http_proxy http://proxy:3128
@@ -40,8 +28,8 @@
# This is the directory where you have the validator's *.html, *.css etc files.
-Alias /w3c-validator/ /usr/local/validator/htdocs/
-<Directory /usr/local/validator/htdocs/>
+Alias /w3c-validator/ /usr/share/w3c-markup-validator/html/
+<Directory /usr/share/w3c-markup-validator/html/>
Options IncludesNOEXEC Indexes MultiViews
AllowOverride None
AddHandler server-parsed .html
Modified: packages/w3c-markup-validator/trunk/share/templates/en_US/header.tmpl
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/share/templates/en_US/header.tmpl?rev=1855&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/share/templates/en_US/header.tmpl (original)
+++ packages/w3c-markup-validator/trunk/share/templates/en_US/header.tmpl Wed Mar 16 17:03:54 2011
@@ -29,7 +29,7 @@
<div id="banner">
<h1 id="title">
- <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="./images/w3c.png" /></a>
+ <a href="http://www.debian.org/"><img alt="W3C on Debian" width="110" height="61" id="logo" src="./images/logo.png" /></a>
<a href="./"><span>Markup Validation Service</span></a>
</h1>
<p id="tagline">Check the markup (HTML, XHTML, …) of Web documents</p>
More information about the debian-xml-sgml-commit
mailing list