[xml/sgml-commit] r1734 - in /packages/w3c-markup-validator/trunk/debian: apache.conf changelog patches/httpd_conf_debianize.patch patches/series rules
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Wed Aug 18 15:02:06 UTC 2010
Author: periapt-guest
Date: Wed Aug 18 15:01:59 2010
New Revision: 1734
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1734
Log:
Basing apache config fragment on supplied fragment
Added:
packages/w3c-markup-validator/trunk/debian/patches/httpd_conf_debianize.patch
Removed:
packages/w3c-markup-validator/trunk/debian/apache.conf
Modified:
packages/w3c-markup-validator/trunk/debian/changelog
packages/w3c-markup-validator/trunk/debian/patches/series
packages/w3c-markup-validator/trunk/debian/rules
Modified: packages/w3c-markup-validator/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/changelog?rev=1734&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/changelog (original)
+++ packages/w3c-markup-validator/trunk/debian/changelog Wed Aug 18 15:01:59 2010
@@ -5,6 +5,8 @@
some actions throw a taint error
Old install scripts need to be reintegrated
As many bugs as possible need to be closed
+ Feedback link is broken
+ Image stuff
* New maintainer rebuilt package from first principles (Closes: #573497)
* Upgraded to upstream version 1.1 (Closes: #461021 and Closes: #437795)
@@ -12,6 +14,7 @@
integration for other web servers.
* Changed action="check" to action="/w3c-markup-validator/check" throughout
* Changed dependency from w3c-dtd-xhtml and sgml-data to w3c-sgml-lib.
+ * Basing apache config fragment on upstream supplied fragment.
-- Nicholas Bamber <nicholas at periapt.co.uk> Fri, 30 Jul 2010 22:41:09 +0100
Added: packages/w3c-markup-validator/trunk/debian/patches/httpd_conf_debianize.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/patches/httpd_conf_debianize.patch?rev=1734&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/httpd_conf_debianize.patch (added)
+++ packages/w3c-markup-validator/trunk/debian/patches/httpd_conf_debianize.patch Wed Aug 18 15:01:59 2010
@@ -1,0 +1,43 @@
+Subject: Cutomization for httpd.conf fragment
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Forwarded: not-needed
+Last-Update: 2010-08-18
+--- a/httpd/conf/httpd.conf
++++ b/httpd/conf/httpd.conf
+@@ -1,20 +1,18 @@
+ # -*- 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 values below assume that you have the validator files in
+-# /usr/local/validator. If not, tune them according to your setup.
++# The w3c-markup-validator postinst script will link
++# /etc/apache2/conf.d/w3c-markup-validator.conf -> /etc/w3c/httpd.conf
+ #
+ # 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
++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
+
+ <IfDefine MODPERL2>
+ # Note: this affects the whole server, not just the validator.
+@@ -40,8 +38,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/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/patches/series?rev=1734&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/series (original)
+++ packages/w3c-markup-validator/trunk/debian/patches/series Wed Aug 18 15:01:59 2010
@@ -1,3 +1,4 @@
mootools.patch
validator_conf_debianize.patch
full_path_for_form_actions.patch
+httpd_conf_debianize.patch
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=1734&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/rules (original)
+++ packages/w3c-markup-validator/trunk/debian/rules Wed Aug 18 15:01:59 2010
@@ -18,20 +18,21 @@
dh $@
override_dh_install:
- dh_install httpd/cgi-bin/check ${CGIBIN_DIR}
- dh_install htdocs/config/* ${CONFIG_DIR}
- dh_install share/templates/en_US/* ${SHARED_DIR}/templates/en_US
- dh_install debian/apache.conf ${CONFIG_DIR}
- dh_install htdocs/*.html ${SHARED_DIR}/html
- dh_install htdocs/*.css ${SHARED_DIR}/html
- dh_install htdocs/style/*.css ${SHARED_DIR}/html/style
- dh_install htdocs/dev/tests/* ${SHARED_DIR}/html/dev/tests
- dh_install htdocs/docs/* ${SHARED_DIR}/html/docs
- dh_install htdocs/source/* ${SHARED_DIR}/html/source
- dh_install htdocs/images/*.png ${SHARED_DIR}/html/images
- dh_install htdocs/images/*.gif ${SHARED_DIR}/html/images
- dh_install htdocs/images/*.jpg ${SHARED_DIR}/html/images
- dh_install htdocs/scripts/w3c-validator.js ${SHARED_DIR}/html/scripts
+ dh_install httpd/cgi-bin/check ${CGIBIN_DIR}
+ dh_install httpd/cgi-bin/sendfeedback.pl ${CGIBIN_DIR}
+ dh_install htdocs/config/* ${CONFIG_DIR}
+ dh_install share/templates/en_US/* ${SHARED_DIR}/templates/en_US
+ dh_install httpd/conf/httpd.conf ${CONFIG_DIR}
+ dh_install htdocs/*.html ${SHARED_DIR}/html
+ dh_install htdocs/*.css ${SHARED_DIR}/html
+ dh_install htdocs/style/*.css ${SHARED_DIR}/html/style
+ dh_install htdocs/dev/tests/* ${SHARED_DIR}/html/dev/tests
+ dh_install htdocs/docs/* ${SHARED_DIR}/html/docs
+ dh_install htdocs/source/* ${SHARED_DIR}/html/source
+ dh_install htdocs/images/*.png ${SHARED_DIR}/html/images
+ dh_install htdocs/images/*.gif ${SHARED_DIR}/html/images
+ dh_install htdocs/images/*.jpg ${SHARED_DIR}/html/images
+ dh_install htdocs/scripts/w3c-validator.js ${SHARED_DIR}/html/scripts
override_dh_installdocs:
mkdir -p debian/tmp
More information about the debian-xml-sgml-commit
mailing list