debian/0000755000000000000000000000000012121320775007166 5ustar debian/control0000644000000000000000000000270012121310676010567 0ustar Source: w3c-markup-validator Section: web Priority: optional Maintainer: Nicholas Bamber Uploaders: Jaldhar H. Vyas Build-Depends: debhelper (>= 8) Build-Depends-Indep: sharutils, perl, lynx, yui-compressor, w3c-sgml-lib (>= 1.3), libhtml-template-perl, libconfig-general-perl Standards-Version: 3.9.4 Homepage: http://validator.w3.org/about.html Vcs-Git: git://github.com/periapt/w3c-markup-validator.git Vcs-Browser: http://github.com/periapt/w3c-markup-validator/ Package: w3c-markup-validator Architecture: all Depends: ${perl:Depends}, ${misc:Depends}, apache2 | httpd-cgi, libwww-perl (>= 6), liburi-perl, libhtml-template-perl, libhtml-parser-perl (>= 3.60), libtext-iconv-perl, libset-intspan-perl, libnet-ip-perl, libconfig-general-perl, w3c-sgml-lib (>= 1.3), libencode-hanextra-perl, libhtml-encoding-perl, libjson-perl, libxml-libxml-perl (>= 1.70), libsgml-parser-opensp-perl, liblwp-protocol-https-perl Recommends: libhtml-tidy-perl, libencode-jis2k-perl Suggests: libwebservice-validator-html-w3c-perl, libtest-html-w3c-perl, libxml-xpath-perl Description: W3C Markup Validator The W3C Markup Validator is a CGI script which lets you enter the URL of a web page which will be then checked against a validating SGML parser for conformance to official W3C recommendations. Pages can also be uploaded. . These are the same scripts that are available on the W3C web site, http://validator.w3.org/. debian/repack.stub0000755000000000000000000000325112033140320011322 0ustar #!/bin/sh : <<=cut =pod =head1 NAME repack.stub - script to repack upstream tarballs from uscan =head1 INSTRUCTIONS put this in debian/repack.stub and add "debian sh debian/repack.stub" to the end of the line in debian/watch. you will also need to add a version mangle to debian/watch. then create a debian/repack.local. this is a shell script that is sources under "set -e", so be careful to check returns codes. =head1 FUNCTIONS =over 4 =item rm rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1 =item mv mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1 =item requires_version requires_version is there for future usage for requiring certain versions of the script =back =head1 VARIABLES =over 4 =item SUFFIX defaults to +dfsg what to append to the upstream version =item RM_OPTS defaults to -vrf options to pass to rm =item MANIFEST defaults to 0, set to 1 to turn on. this will manipulate MANIFEST files in CPAN tarballs. =item UP_BASE this is the directory where the upstream source is. =back =cut if [ -z "$REPACK_SH" ]; then if [ -f ../../scripts/repack.sh ]; then REPACK_SH=../../scripts/repack.sh fi if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then REPACK_SH=$(which repack.sh) fi fi if [ ! -f "$REPACK_SH" ]; then echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable" echo "You can get it from http://svn.debian.org/viewsvn/pkg-perl/scripts/repack.sh" exit 1 fi exec "$REPACK_SH" "$@" debian/repack.local0000644000000000000000000000057712117602103011451 0ustar rm -rf htdocs/images/valid_icons/ rm -f htdocs/navbar.css.gz rm -f htdocs/base.css.gz rm -f htdocs/tips.css.gz rm -f htdocs/print.css.gz rm -f htdocs/scripts/combined.js.gz rm -f htdocs/scripts/combined.js rm -f htdocs/docs.css.gz rm -f htdocs/handheld.css.gz rm -f htdocs/results.css.gz rm -f htdocs/style/base.css.gz rm -f htdocs/style/results.css.gz rm -f htdocs/docs/errors.html debian/changelog0000644000000000000000000004117212121320405011033 0ustar w3c-markup-validator (1.3+dfsg-1) unstable; urgency=low * New upstream release * Refreshed and fixed patches * Removed patch html-template-ver.patch as it was applied upstream * Removed mod_perl_disable.patch as mod_perl issues now resolved upstream but add mod_perl.patch to debianize paths (Closes: #618416) * Upstream Makefile now generates some resources but had to be debianized * Raised standards version to 3.9.4 * Added config file for license-reconcile and updated debian/copyright * Updated debian/watch to repack upstream tarball * Aded libhtml-template-perl and libconfig-general-perl as build dependencies -- Nicholas Bamber Sun, 17 Mar 2013 10:54:36 +0000 w3c-markup-validator (1.2+dfsg-6) unstable; urgency=low * Changed to new location of w3c-sgml-lib files -- Nicholas Bamber Sat, 14 Apr 2012 13:17:45 +0100 w3c-markup-validator (1.2+dfsg-5) unstable; urgency=low * Corrected typo in VCS URL (Closes: #662735) -- Nicholas Bamber Wed, 07 Mar 2012 20:42:37 +0000 w3c-markup-validator (1.2+dfsg-4) unstable; urgency=low * Updated debian/copyright to latest format and corrected copyright, especially after a closer reading of notices in htdocs/scripts/mootools-1.2.5-core-nc.js * Raised standards version to 3.9.3 * Removed unused lintian override * Removed patch restricting protocols to http and made an explicit dependency on liblwp-protocol-https (Closes: #445265) -- Nicholas Bamber Sat, 03 Mar 2012 15:57:12 +0000 w3c-markup-validator (1.2+dfsg-3) unstable; urgency=low * Changed Maintainership as the repository is no longer that of the Debian XML/SGML group * Updated copyright * Fixed various broken dependencies including broadening apache2 dependency to include httpd-cgi (Closes: #627962). The reason for this was that there seems to be no prospect of seeing the debate in http://lists.debian.org/debian-devel/2012/01/msg00148.html resolved in a satisfactory manner. * Updated debhelper version and compat level to 8 -- Nicholas Bamber Thu, 09 Feb 2012 20:37:22 +0000 w3c-markup-validator (1.2+dfsg-2) unstable; urgency=low * Corrected bug number regarding mod_perl disablement in patch. Thanks to Jorg Sommer for pointing this out. * Patched out versioned dependency on HTML::Template (Closes: 639711) * Raised standards version to 3.9.2 * Added lintian override about apparently phoney duplicate file warning * Changed repository to github -- Nicholas Bamber Tue, 30 Aug 2011 21:03:25 +0100 w3c-markup-validator (1.2+dfsg-1) unstable; urgency=low * New upstream release * Reviewed and refreshed patches * Simplified rules and compressed files as required by upstream to support content negotiation (Closes: #618469) * Moved test files to the examples directory * Reviewed dependencies * Disabled mod_perl support (cf. #618416) * Refreshed copyright * Refreshed lintian overrides * Add apache config ensuring directory access (Closes: #608225) * Change rules to rebuild htdocs/scripts/combined.js * Added Suggests clause and reviewed the long description * Added example perl script that uses WebService::Validator::HTML::W3C * Removed non-DFSG files (and files that will be rebuilt anyway) -- Nicholas Bamber Thu, 17 Mar 2011 19:02:11 +0000 w3c-markup-validator (1.1-2) unstable; urgency=low * Releasing to unstable -- Nicholas Bamber Tue, 25 Jan 2011 22:42:59 +0000 w3c-markup-validator (1.1-1) experimental; urgency=low * New maintainer rebuilt package from first principles (Closes: #573497) * Upgraded to upstream version 1.1 (Closes: #461021 and Closes: #437795) * Restricting dependency to apache2 until someone volunteers to do integration for other web servers. * Changed dependency from w3c-dtd-xhtml and sgml-data to w3c-sgml-lib. * Basing apache config fragment on upstream supplied fragment. As a consequence of this the home page is http://localhost/w3c-validator/. (Closes: #456904). * Setting version dependency on libwww-perl after investigating taint issues * Replacing W3C placeholder logo with customized Debian logo. * Restricting support to http. This is a holding operation for #445265. * Reviewed and rewrote README.Debian (Closes: #549025). * Adding lintian override over inclusion of mootools convenience library. * Simplified install scripts as much as possible, though leaving some abstraction in case there is a need to add support for more webservers. * Removed dependency on wwwconfig-common. * Automatically enable mod_include and mod_rewrite before bouncing the server (Closes: #477792). * The simplified install scripts mean that translation is no longer required. In fact the translated text referred to old versions of Apache that are no longer part of Debian. (Closes: #551185). -- Nicholas Bamber Sat, 21 Aug 2010 18:22:35 +0100 w3c-markup-validator (0.7.4-5.2) unstable; urgency=low * Non-maintainer upload. * Add watch file. Closes: #435685 * Fix pending l10n bugs. Debconf translations: - Finnish. Closes: #484548 - Swedish. Closes: #499341 -- Christian Perrier Tue, 23 Sep 2008 20:17:15 +0200 w3c-markup-validator (0.7.4-5.1) unstable; urgency=low * Non-maintainer upload to fix pending l10n issues. * Debconf translations: - German. Closes: #425433 - Galician. Closes: #483201 - Basque. Closes: #483482 - Russian. Closes: #484315 * [Lintian] Convert debian/copyright to UTF-8 * [Lintian] Remove usr/share/w3c-markup-validator/config/ empty directory * [Lintian] No longer add an empty /usr/bin directory * Turkish. Closes: #484690 -- Christian Perrier Fri, 16 May 2008 23:16:57 +0200 w3c-markup-validator (0.7.4-5) unstable; urgency=low * Remove dependency on w3c-linkchecker now that Etch is released * debian/po: + updated German po-debconf translation, courtesy of Helge Kreutzmann (closes: Bug#411327) * Upload sponsored thanks to Jaldhar H. Vyas. -- Frederic Schutz Tue, 15 May 2007 01:53:22 +0200 w3c-markup-validator (0.7.4-4) unstable; urgency=low * debian/po: + updated Czech po-debconf translation, courtesy of Jan Outrata (closes: Bug#408727) * Upload sponsored thanks to Jaldhar H. Vyas. -- Frederic Schutz Mon, 12 Feb 2007 19:23:24 +0100 w3c-markup-validator (0.7.4-3) unstable; urgency=low * debian/po: + updated Dutch po-debconf translation, courtesy of Bart Cornelis (closes: Bug#407443) * Upload sponsored thanks to Jaldhar H. Vyas. -- Frederic Schutz Mon, 22 Jan 2007 22:31:46 +0100 w3c-markup-validator (0.7.4-2) unstable; urgency=low * debian/po: + updated Danish po-debconf translation, courtesy of Morten Bo Johansen (Closes: Bug#401618) * Upload sponsored thanks to Jaldhar H. Vyas. -- Frederic Schutz Mon, 4 Dec 2006 23:41:20 +0100 w3c-markup-validator (0.7.4-1) unstable; urgency=medium * New upstream release, a "maintenance release including bug fixes and documentation updates" (see whatsnew.html) * Requires version >= 0.0.48 of package wwwconfig-common for checking errors when restarting the web server (see bug #399115) * Check if the script restart.sh from wwwconfig-common returns an error when called from postinst or prerm (Closes: Bug# 398638). * Urgency medium because this is related to an RC bug (partly solved and downgraded to important) * Upload sponsored thanks to Anibal Monsalve Salazar -- Frederic Schutz Sun, 19 Nov 2006 01:36:59 +0100 w3c-markup-validator (0.7.3-1) unstable; urgency=low * New upstream release * Remove "Suggests: libterm-readkey-perl (>= 2.00)", which applies only to the linkchecker. * debian/po: + Update of the Japanese po-debconf template, thanks to Hideki Yamane (Closes: Bug#393210) * Upload sponsored thanks to Jaldhar H. Vyas. -- Frederic Schutz Sun, 29 Oct 2006 22:17:52 +0100 w3c-markup-validator (0.7.2-3) unstable; urgency=low * Remove all files from the w3c-linkchecker, since it is now in its own package. * Depends on the new w3c-linkchecker package until Debian Etch is released, to ensure a smooth transition. * debian/po: + Update of the French po-debconf template, thanks to Thomas Huriaux (Closes: Bug#369296) + Update of the Portuguese po-debconf translation, courtesy of Rui Branco (Closes: Bug#381200) * Update README.Debian and README.config so that they match the recent changes in this package (version 0.7.2-1 and beyond). * Upload sponsored thanks to Jaldhar H. Vyas. -- Frederic Schutz Sun, 13 Aug 2006 02:08:07 +0200 w3c-markup-validator (0.7.2-2) unstable; urgency=low * Moved debhelper from Build-Depends-Indep to Build-Depends (needed for the 'clean' target); thanks to Steve Langasek and the newer version of Lintian. * Small updates to the debconf template following a Lintian warning + French po-debconf translation updated. + Italian po-debconf translation updated, thanks to Luca Monducci (Closes: Bug#367225) * Update latin1 characters in the checklink manpage, following a Lintian warning, and some helpful comments by Steve Langasek. * Update to standards 3.7.2.0 (nothing to change) -- Frederic Schutz Mon, 15 May 2006 22:47:14 +0200 w3c-markup-validator (0.7.2-1) unstable; urgency=low * New upstream release (Closes: Bug#324028 ) + Works with newer version of libconfig-general-perl (Closes: Bug#358901) * Update dependencies: libconfig-general-perl (>= 2.19), libhtml-template-perl (>= 2.6). * Added automatic configuration for Apache and Apache-Perl; several servers can now be configured at the same time * debian/templates: add Apache2 and Apache-Perl as options * Add lintian overrides; see the override file for complete rationale. -- Frederic Schutz Sun, 7 May 2006 22:53:38 +0200 w3c-markup-validator (0.6.7-4) unstable; urgency=low * Depends on debconf | debconf-2.0 (by way of ${misc:Depends}) (Closes: Bug#332140) * debian/po: + added Vietnamese po-debconf translation, courtesy of Clytie Siddall (Closes: Bug#324078) + added Swedish po-debconf translation, courtesy of Daniel Nylander (Closes: Bug#330946) + added Portuguese po-debconf translation, courtesy of Rui Branco (Closes: Bug#335954) * Updated to standards 3.6.2 (nothing to change) -- Frederic Schutz Thu, 27 Oct 2005 23:19:21 +0200 w3c-markup-validator (0.6.7-3) unstable; urgency=low * README.Debian: Added note from Adam Sjøgren (see bug 286091) about the use of check to validate pages that require http-authorization. I am not sure that it is a good idea to turn mod_rewrite on by default on every installation, so I have not applied the patch yet, and have left the bug open for now. * debian/po: + added Czech po-debconf translation, courtesy of Jan Outrata (Closes: Bug#276668) + added Danish po-debconf translation, courtesy of Morten Bo Johansen (Closes: Bug#286091) -- Frederic Schutz Mon, 11 Apr 2005 22:53:09 +1000 w3c-markup-validator (0.6.7-2) unstable; urgency=low * Added documentation in README.Debian about validation of pages on private IP addresses (Closes: Bug#268089) * Corrected a few broken image links in footer.html and check -- Frederic Schutz Mon, 30 Aug 2004 16:36:18 +1000 w3c-markup-validator (0.6.7-1) unstable; urgency=low * New upstream release * Updated internal SGML catalogs to use the new location of XML DTDs in Debian. Requires w3c-dtd-xhtml >= 1.1-5. * Updated linkchecker to version 4.0; in the future, it will be provided as a separate package (w3c-linkchecker) * Apache configuration now uses the conf.d directory (Closes: Bug#227855) Requires apache (>= 1.3.29.0.1-1). * debian/po: + added Italian po-debconf translation, courtesy of Luca Monducci (Closes: Bug#251741) + added Catalan po-debconf translation, courtesy of Aleix Badia i Bosch (Closes: Bug#254867) -- Frederic Schutz Mon, 9 Aug 2004 21:18:12 +1000 w3c-markup-validator (0.6.1-4) unstable; urgency=low * debian/control: + added dependencies on libnet-ip-perl and libconfig-general-perl, now required by checklink.pl + added suggestion on libterm-readkey-perl, which can be used to enter a password for checklink.pl * httpd/cgi-bin/checklink.pl: updated to latest CVS version + Unbreak --masquerade in checklink.pl (Closes: Bug#187791) * check: backport fixes from CVS + Untaint variables read from the configuration file (we must trust them anyway) so that Perl (>= 5.8.1) does not yield an error when calling the Open3 function. (Closes: Bug#217353) * debian/po: + added German po-debconf translation, translated by Pattrick William, Tomas and Friedemann from the german Skolelinux team, courtesy of . (Closes: Bug#223121) + added Japanese po-debconf translation, courtesy of Hideki Yamane (Closes: Bug#224184) * Uploaded for Frederic by Jaldhar H. Vyas -- Jaldhar H. Vyas Wed, 31 Dec 2003 20:27:25 -0500 w3c-markup-validator (0.6.1-3) unstable; urgency=low * debian/checkink.1: removed, since the man page has been converted to POD format and submitted upstream for inclusion in checklink.pl * debian/dirs: removed etc/apache * debian/control + Now depends on Perl (>= 5.8) for correct handling of UNICODE characters + Perl 5.8 provides libtime-hires-perl and libcgi-pm-perl in sufficient version, so we don't need to depend on them anymore. + Build-depends-indep: debhelper (>= 4.1.16), and removed po-debconf, as suggested by the po-debconf man page + Updated to standards 3.6.1 (nothing to change) + The W3C produces "recommendations", not standards -- changed the description accordingly * debian/po: added dutch po-debconf translation, courtesy of . (Closes: Bug#204927) * debian/README.config: added configuration snippet for Apache2 * debian/rules + Added target debian/po/templates.pot in rules files to make sure that the PO files are always up to date when the debconf template is changed, as suggested by the po-debconf man page + Generate the manpage while building using POD in checklink.pl * htdocs/*: backported small changes from CVS * httpd/cgi-bin/checklink.pl (backported from CVS) + Added POD documentation + Stop if unknown option on the command line (Closes: Bug#187792) + Added option "-?" for help, and clarified help about the --location option (Closes: Bug#189642) + Fix redirect loop detection (Closes: Bug#188372) -- Frederic Schutz Sun, 7 Sep 2003 01:36:01 +1000 w3c-markup-validator (0.6.1-2) unstable; urgency=low * Depends: apache|httpd instead of apache|apache-ssl. If you use another webserver, you'll have to configure it manually, see the new README.config documentation file. Closes: Bug#177965 * Depends: w3c-dtd-xhtml to allow validation of XHTML (1.0, 1.1 and basic) documents. DTDs were previously provided by the sgml-data package. Closes: Bug#178529 * Added TODO file. * Converted the package to po-debconf for the translation of debconf templates, requires debhelper (>= 4.1.13), po-debconf for build. * Debhelper changes: - uses dh_installman instead of the (deprecated) dh_installmanpages - uses debian/compat file instead of DH_COMPAT * Updated to standards 3.5.9.0 (nothing to change) -- Frederic Schutz Tue, 18 Mar 2003 11:56:21 +1100 w3c-markup-validator (0.6.1-1) unstable; urgency=low * New upstream release * First official release for Debian, closes: Bug#166025 * Converted the installation scripts to debconf and wwwconfig-common * Added support for the MathML DTD present in Debian (the package now Recommends: w3-dtd-mathml) -- Frederic Schutz Mon, 16 Dec 2002 22:06:03 +1100 w3c-markup-validator (0.6.0-1) unstable; urgency=low * New upstream release * Added a manpage for checklink(1) -- Frederic Schutz Tue, 26 Nov 2002 22:54:11 +1100 w3c-markup-validator (0.0.20021103-1) unstable; urgency=low * Initial Release, from the upstream CVS -- Frederic Schutz Mon, 4 Nov 2002 22:14:00 +1100 debian/postrm0000644000000000000000000000172112033140320010422 0ustar #! /bin/sh # postrm script for w3c-markup-validator # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `remove' # * `purge' # * `upgrade' # * `failed-upgrade' # * `abort-install' # * `abort-install' # * `abort-upgrade' # * `disappear' overwrit>r> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; purge) rmdir /etc/w3c 2>/dev/null || true ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/compat0000644000000000000000000000000212033140320010350 0ustar 8 debian/README.Debian0000644000000000000000000000625512033140320011223 0ustar Configuration ============= Almost certainly you will want to edit /etc/w3c/validator.conf to allow one to test webpages on the internal network. However this is not enabled by default as a security precaution. Find this line and change the "no" to "yes". Allow Private IPs = no The install scripts will enable the include and rewrite apache modules, however the remove scripts will not disable these modules. This seems this safest way of satisfying the code's dependencies on these modules. Upgrading from older Debian packages ==================================== Although old config files will be preserved at the user's discretion as per normal Debian policy, they are unlikely to work. The general reason is that older packagings in Debian suffered from unnecessary divergence from upstream configuration and several versions have come and gone since then. As such backwards compatibility seems an unlikely goal. The three specific issues that might be faced are: * In the file /etc/w3c/validator.conf file the Paths/SGML section is rather different. * The path to the main executable is now /usr/lib/cgi-bin/w3c-markup-validator/check. * The home page is now http://localhost/w3c-validator/. Suggested post-installation tests ================================= 1.) Run /usr/lib/cgi-bin/w3c-markup-validator/check This should return an HTML page complaining that that type of document is not supported. It should not complain of syntax or configuration errors. 2.) If online run /usr/lib/cgi-bin/w3c-markup-validator/check 'uri=http://www.periapt.co.uk'. This should return an HTML page confirming valid HTML. 3.) Point your browser at http://localhost/w3c-validator/ and run any tests you can think of. Old note about authentication (Needs follow up) ============================= Note from Adam Sjøgren in Bug#298772: [ Note from Nicholas Bamber . I have not had time to check this stuff out. However the patch is now out of date. "w3c-markup-validator" is now "w3c-validator/". ] The Apache-configuration supplied by this package is insufficient for validating pages that require http-authorization. The "check" script attempts to proxy the auth-request (the browser pops up a login/password dialogue), but fails (the dialogue keeps appearing over and over despite correctly entered login/password). The problem is that the script expects the environment variable HTTP_AUTHORIZATION to contain the contents of the Authorization-header (see line 1408 in /usr/lib/cgi-bin/check). It does not by default. By searching a little I've found an easy way to set this using mod_rewrite, as shown in this tiny patch: --- apache.conf.orig 2005-03-09 22:34:20.875157298 +0100 +++ apache.conf 2005-03-09 22:34:47.086559812 +0100 @@ -2,6 +2,10 @@ ScriptAlias /w3c-markup-validator/checklink /usr/lib/cgi-bin/checklink Alias /w3c-markup-validator /usr/share/w3c-markup-validator/html +RewriteEngine On +RewriteCond %{HTTP:Authorization} ^(.*)$ [NC] +RewriteRule /.* - [E=HTTP_AUTHORIZATION:%1] + Options +Includes +MultiViews AddHandler server-parsed .html -- Frederic Schutz Thu, 18 May 2006 19:18:55 +0200 debian/patches/0000755000000000000000000000000012120552257010616 5ustar debian/patches/remove_test_warning.patch0000644000000000000000000000312412033140320015703 0ustar Subject: Remove warning about test instance The warning is quite alarming and looks like an error. We have already customized the logo to be based upon Debian so noone should think this is the original. Author: Nicholas Bamber Forwarded: not-needed Last-Update: 2011-03-14 --- a/htdocs/intro.html +++ b/htdocs/intro.html @@ -15,7 +15,3 @@
-

Important - This instance of the validator is either a development version used for testing purposes, or a local copy of the W3C Markup Validator software used for development and testing purposes.
- The official validation service supported by the W3C is at validator.w3.org. -

--- a/htdocs/style/base.css +++ b/htdocs/style/base.css @@ -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; } debian/patches/permission_override.patch0000644000000000000000000000115412033567677015746 0ustar Author: Nicholas Bamber Subject: Permission override in case access is denied generally Last-Update: 2011-03-17 Bug: http://lists.w3.org/Archives/Public/www-validator/2011Mar/0035.html Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608225 --- a/httpd/conf/httpd.conf +++ b/httpd/conf/httpd.conf @@ -89,6 +89,12 @@ ExpiresByType application/javascript A2592000 ExpiresByType application/ecmascript A2592000 + + # See bug 608225 + # Permission may be denied higher up so override here. + Order allow,deny + allow from all + # Atom news feed debian/patches/dfsg.patch0000644000000000000000000002103512033567724012573 0ustar Author: Nicholas Bamber Subject: Removing references to non-DFSG images Last-Update: 2011-03-17 Forwarded: not needed --- a/htdocs/config/types.conf +++ b/htdocs/config/types.conf @@ -29,8 +29,6 @@ URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue @@ -47,8 +45,6 @@ URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue @@ -65,8 +61,6 @@ URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue @@ -83,8 +77,6 @@ URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue @@ -101,8 +93,6 @@ URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue @@ -122,8 +112,6 @@ URI = http://www.w3.org/Icons/valid-html32 ALT URI = http://www.w3.org/Icons/valid-html32-blue - Local URI = images/valid_icons/valid-html32 - Local ALT URI = images/valid_icons/valid-html32-blue Height = 31 Width = 88 @@ -147,8 +135,6 @@ URI = http://www.w3.org/Icons/valid-html40 ALT URI = http://www.w3.org/Icons/valid-html40-blue - Local URI = images/valid_icons/valid-html40 - Local ALT URI = images/valid_icons/valid-html40-blue Height = 31 Width = 88 Alt = Valid HTML 4.0 Strict @@ -170,8 +156,6 @@ URI = http://www.w3.org/Icons/valid-html40 ALT URI = http://www.w3.org/Icons/valid-html40-blue - Local URI = images/valid_icons/valid-html40 - Local ALT URI = images/valid_icons/valid-html40-blue Height = 31 Width = 88 Alt = Valid HTML 4.0 Transitional @@ -193,8 +177,6 @@ URI = http://www.w3.org/Icons/valid-html40 ALT URI = http://www.w3.org/Icons/valid-html40-blue - Local URI = images/valid_icons/valid-html40 - Local ALT URI = images/valid_icons/valid-html40-blue Height = 31 Width = 88 Alt = Valid HTML 4.0 Frameset @@ -216,8 +198,6 @@ URI = http://www.w3.org/Icons/valid-html401 ALT URI = http://www.w3.org/Icons/valid-html401-blue - Local URI = images/valid_icons/valid-html401 - Local ALT URI = images/valid_icons/valid-html401-blue Height = 31 Width = 88 Alt = Valid HTML 4.01 Strict @@ -239,8 +219,6 @@ URI = http://www.w3.org/Icons/valid-html401 ALT URI = http://www.w3.org/Icons/valid-html401-blue - Local URI = images/valid_icons/valid-html401 - Local ALT URI = images/valid_icons/valid-html401-blue Height = 31 Width = 88 Alt = Valid HTML 4.01 Transitional @@ -262,8 +240,6 @@ URI = http://www.w3.org/Icons/valid-html401 ALT URI = http://www.w3.org/Icons/valid-html401-blue - Local URI = images/valid_icons/valid-html401 - Local ALT URI = images/valid_icons/valid-html401-blue Height = 31 Width = 88 Alt = Valid HTML 4.01 Frameset @@ -324,8 +300,6 @@ URI = http://www.w3.org/Icons/valid-xhtml10 ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue - Local URI = images/valid_icons/valid-xhtml10 - Local ALT URI = images/valid_icons/valid-xhtml10-blue Height = 31 Width = 88 Alt = Valid XHTML 1.0 Strict @@ -350,8 +324,6 @@ URI = http://www.w3.org/Icons/valid-xhtml10 ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue - Local URI = images/valid_icons/valid-xhtml10 - Local ALT URI = images/valid_icons/valid-xhtml10-blue Height = 31 Width = 88 Alt = Valid XHTML 1.0 Transitional @@ -376,8 +348,6 @@ URI = http://www.w3.org/Icons/valid-xhtml10 ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue - Local URI = images/valid_icons/valid-xhtml10 - Local ALT URI = images/valid_icons/valid-xhtml10-blue Height = 31 Width = 88 Alt = Valid XHTML 1.0 Frameset @@ -403,8 +373,6 @@ URI = http://www.w3.org/Icons/valid-xhtmlbasic10 ALT URI = http://www.w3.org/Icons/valid-xhtmlbasic10-blue - Local URI = images/valid_icons/valid-xhtmlbasic10 - Local ALT URI = images/valid_icons/valid-xhtmlbasic10-blue Height = 31 Width = 88 Alt = Valid XHTML Basic 1.0 @@ -495,8 +463,6 @@ URI = http://www.w3.org/Icons/valid-xhtmlprint10 ALT URI = http://www.w3.org/Icons/valid-xhtmlprint10-blue - Local URI = images/valid_icons/valid-xhtmlprint10 - Local ALT URI = images/valid_icons/valid-xhtmlprint10-blue Height = 31 Width = 88 Alt = Valid XHTML-Print 1.0 @@ -520,8 +486,6 @@ URI = http://www.w3.org/Icons/valid-xhtml11 ALT URI = http://www.w3.org/Icons/valid-xhtml11-blue - Local URI = images/valid_icons/valid-xhtml11 - Local ALT URI = images/valid_icons/valid-xhtml11-blue Height = 31 Width = 88 Alt = Valid XHTML 1.1 @@ -554,7 +518,6 @@ URI = http://validator.w3.org/images/v15445 - Local URI = images/v15445 Alt = Valid ISO/IEC 15445:2000 @@ -571,7 +534,6 @@ URI = http://validator.w3.org/images/v15445 - Local URI = images/v15445 Alt = Valid ISO/IEC 15445:2000 @@ -595,8 +557,6 @@ URI = http://www.w3.org/Icons/valid-mathml20 ALT URI = http://www.w3.org/Icons/valid-mathml20-blue - Local URI = images/valid_icons/valid-mathml20 - Local ALT URI = images/valid_icons/valid-mathml20-blue Height = 31 Width = 88 Alt = Valid MathML 2.0 @@ -668,8 +628,6 @@ URI = http://www.w3.org/Icons/valid-xhtml-rdfa ALT URI = http://www.w3.org/Icons/valid-xhtml-rdfa-blue - Local URI = images/valid_icons/valid-xhtml-rdfa - Local ALT URI = images/valid_icons/valid-xhtml-rdfa-blue Height = 31 Width = 88 Alt = Valid XHTML + RDFa @@ -699,8 +657,6 @@ URI = http://www.w3.org/Icons/valid-svg10 ALT URI = http://www.w3.org/Icons/valid-svg10-blue - Local URI = images/valid_icons/valid-svg10 - Local ALT URI = images/valid_icons/valid-svg10-blue Height = 31 Width = 88 Alt = Valid SVG 1.0 @@ -724,8 +680,6 @@ URI = http://www.w3.org/Icons/valid-svg11 ALT URI = http://www.w3.org/Icons/valid-svg11-blue - Local URI = images/valid_icons/valid-svg11 - Local ALT URI = images/valid_icons/valid-svg11-blue Height = 31 Width = 88 Alt = Valid SVG 1.1 @@ -751,8 +705,6 @@ URI = http://www.w3.org/Icons/valid-svgtiny11 ALT URI = http://www.w3.org/Icons/valid-svgtiny11-blue - Local URI = images/valid_icons/valid-svgtiny11 - Local ALT URI = images/valid_icons/valid-svgtiny11-blue Height = 31 Width = 88 Alt = Valid SVG 1.1 Tiny --- a/htdocs/docs/help.html +++ b/htdocs/docs/help.html @@ -343,7 +343,7 @@

"valid" icons

My document is valid, can I use your "valid" icon?

- images/valid_icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /> + Valid XHTML 1.0! Yes. To show readers that one has taken some care to create an interoperable Web page, a "W3C valid" badge may be displayed (here, the "valid XHTML 1.0" badge) on any page debian/patches/makefile.patch0000644000000000000000000000355112120552256013417 0ustar Author: Nicholas Bamber Subject: The Makefile regenerates the compressed files and the error file. - Perl script failing in Makefile rule due to lack of permissions - Don't need to build XML stuff in same source directory (w3c-sgml-lib) - Need to debianize yui-compressor Last-Update: 2013-03-15 Forwarded: no --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ PERLTIDY = perltidy --profile=misc/perltidyrc --backup-and-modify-in-place PERLCRITIC = perlcritic --profile misc/perlcriticrc -YUICOMPRESSOR = java -jar $(wildcard /usr/share/java/yuicompressor*.jar) +YUICOMPRESSOR = java -jar /usr/share/yui-compressor/yui-compressor.jar GZIP = gzip -9n VALIDATOR_URI = http://localhost/w3c-validator/check @@ -20,13 +20,11 @@ # Override the above variables in config.mk if needed. -include config.mk -all: htdocs/docs/errors.html htdocs/sgml-lib/catalog.xml $(GZIP_FILES) +all: htdocs/docs/errors.html $(GZIP_FILES) htdocs/docs/errors.html: misc/docs_errors.pl share/templates/en_US/error_messages.cfg share/templates/en_US/docs_errors.tmpl htdocs/config/validator.conf - env W3C_VALIDATOR_HOME=. W3C_VALIDATOR_CFG=htdocs/config/validator.conf misc/docs_errors.pl > $@ - -htdocs/sgml-lib/catalog.xml: misc/soc2xml.pl htdocs/sgml-lib/xml.soc - misc/soc2xml.pl < htdocs/sgml-lib/xml.soc > $@ + mkdir debian/tmp + env W3C_VALIDATOR_HOME=. W3C_VALIDATOR_CFG=htdocs/config/validator.conf perl -T misc/docs_errors.pl > $@ htdocs/scripts/combined.js: $(JS_SOURCES) rm -f $@ --- a/misc/docs_errors.pl +++ b/misc/docs_errors.pl @@ -54,6 +54,11 @@ included files are readable by the web server user. The error was:\n'$@' EOF } + use Cwd; + my $dir = getcwd; + $CFG->{Paths}->{TidyConf} = "$dir/htdocs/config/tidy.conf"; + $CFG->{Paths}->{Base} = "$dir"; + $CFG->{Paths}->{Templates} = "$dir/share/templates"; } # end of BEGIN block. # debian/patches/debian_logo.patch0000644000000000000000000000235212115703316014101 0ustar Subject: Replace empty logo image with a Debianized one Author: Nicholas Bamber Forwarded: not-needed Last-Update: 2013-03-06 --- a/share/templates/en_US/header.tmpl +++ b/share/templates/en_US/header.tmpl @@ -29,7 +29,7 @@