diff -Nru w3c-markup-validator-1.2+dfsg/Makefile w3c-markup-validator-1.3+dfsg/Makefile
--- w3c-markup-validator-1.2+dfsg/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/Makefile 2012-03-12 15:03:14.000000000 +0000
@@ -0,0 +1,65 @@
+VERSION = $(shell perl -ne '/^\$$VERSION\b.*?([\d.]+)/ && print $$1' httpd/cgi-bin/check)
+
+CSS_FILES = htdocs/style/base.css htdocs/style/results.css
+JS_SOURCES = htdocs/scripts/mootools-1.2.5-core-nc.js \
+ htdocs/scripts/mootools-1.2.5.1-more.js htdocs/scripts/w3c-validator.js
+PERL_FILES = httpd/cgi-bin/check httpd/cgi-bin/sendfeedback.pl \
+ httpd/mod_perl/startup.pl misc/soc2xml.pl misc/spmpp.pl \
+ misc/docs_errors.pl misc/bundle/Makefile.PL \
+ misc/bundle/lib/Bundle/W3C/Validator.pm
+GZIP_FILES = $(addsuffix .gz,$(CSS_FILES)) htdocs/scripts/combined.js.gz
+
+PERLTIDY = perltidy --profile=misc/perltidyrc --backup-and-modify-in-place
+PERLCRITIC = perlcritic --profile misc/perlcriticrc
+
+YUICOMPRESSOR = java -jar $(wildcard /usr/share/java/yuicompressor*.jar)
+GZIP = gzip -9n
+
+VALIDATOR_URI = http://localhost/w3c-validator/check
+
+# Override the above variables in config.mk if needed.
+-include config.mk
+
+all: htdocs/docs/errors.html htdocs/sgml-lib/catalog.xml $(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 > $@
+
+htdocs/scripts/combined.js: $(JS_SOURCES)
+ rm -f $@
+ @for src in $(JS_SOURCES) ; do \
+ echo "$(YUICOMPRESSOR) $$src >> $@" ; \
+ $(YUICOMPRESSOR) $$src >> $@ ; \
+ done
+
+.css.css.gz .js.js.gz:
+ $(GZIP) -c $< > $@ && touch -r $< $@
+
+test:
+ misc/testsuite/harness.py --validator_uri=$(VALIDATOR_URI) run
+
+perlcritic:
+ $(PERLCRITIC) $(PERL_FILES)
+
+perltidy:
+ @for file in $(PERL_FILES) ; do \
+ echo "$(PERLTIDY) $$file" ; \
+ $(PERLTIDY) $$file ; \
+ done
+
+clean:
+ rm -f $(GZIP_FILES)
+
+dist: all
+ @for file in htdocs/footer.html htdocs/whatsnew.html \
+ httpd/cgi-bin/check share/templates/*/footer.tmpl ; do \
+ grep -qF "$(VERSION)" $$file || { \
+ echo "Validator version in $$file seems out of date." ; \
+ exit 1 ; } ; \
+ done
+ misc/mkrelease.sh $(VERSION)
+
+.SUFFIXES: .css .css.gz .js .js.gz
diff -Nru w3c-markup-validator-1.2+dfsg/README.cvs w3c-markup-validator-1.3+dfsg/README.cvs
--- w3c-markup-validator-1.2+dfsg/README.cvs 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/README.cvs 2012-03-12 15:03:14.000000000 +0000
@@ -17,9 +17,9 @@
Note that the latest development code may be broken at any time. If you want a working version,
you should get the latest release version from the tar balls available from the source code availability page at validator.w3.org.
-Alternatively, you can get the latest released version, v1.0, via Mercurial:
+Alternatively, you can get the latest released version, v1.3, via Mercurial:
- bash$ hg clone -b validator-1_0-release https://dvcs.w3.org/hg/markup-validator
+ bash$ hg clone -b validator-1_3-release https://dvcs.w3.org/hg/markup-validator
diff -Nru w3c-markup-validator-1.2+dfsg/debian/changelog w3c-markup-validator-1.3+dfsg/debian/changelog
--- w3c-markup-validator-1.2+dfsg/debian/changelog 2012-04-14 12:17:58.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/changelog 2013-03-17 10:55:01.000000000 +0000
@@ -1,3 +1,18 @@
+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
diff -Nru w3c-markup-validator-1.2+dfsg/debian/clean w3c-markup-validator-1.3+dfsg/debian/clean
--- w3c-markup-validator-1.2+dfsg/debian/clean 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/clean 2013-03-15 08:01:03.000000000 +0000
@@ -1 +1,3 @@
+htdocs/scripts/combined.js
combined.js
+htdocs/docs/errors.html
diff -Nru w3c-markup-validator-1.2+dfsg/debian/control w3c-markup-validator-1.3+dfsg/debian/control
--- w3c-markup-validator-1.2+dfsg/debian/control 2012-03-24 18:14:31.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/control 2013-03-17 09:49:50.000000000 +0000
@@ -4,8 +4,9 @@
Maintainer: Nicholas Bamber
Uploaders: Jaldhar H. Vyas
Build-Depends: debhelper (>= 8)
-Build-Depends-Indep: sharutils, perl, lynx, yui-compressor
-Standards-Version: 3.9.3
+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/
@@ -15,7 +16,7 @@
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.2-2),
+ 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
diff -Nru w3c-markup-validator-1.2+dfsg/debian/copyright w3c-markup-validator-1.3+dfsg/debian/copyright
--- w3c-markup-validator-1.2+dfsg/debian/copyright 2012-03-02 09:22:30.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/copyright 2013-03-11 20:40:28.000000000 +0000
@@ -2,11 +2,18 @@
Upstream-Contact: http://validator.w3.org/feedback.html
Source: http://validator.w3.org/dist/validator.tar.gz
Upstream-Name: W3C Markup Validator
+Comment: Removed the directory htdocs/images/valid_icons/ as the
+ W3C Document license is not DFSG compatible.
+ Also removed htdocs/docs/errors.html and *.gz as they are regenerated.
Files: *
Copyright: 1994-2010, W3C(R) (MIT, ERCIM, KEIO)
License: W3C-Software
+Files: *.py
+Copyright: 2008, W3C
+License: W3C-Software
+
Files: htdocs/dev/tests/long-lines.html
Copyright: 2000-2001, Christian Wolfgang Hujer
License: W3C-Software
@@ -52,8 +59,10 @@
Files: debian/*
Copyright:
- 2010-2012, Nicholas Bamber
+ 2010-2013, Nicholas Bamber
+ 2003, Jaldhar H. Vyas
2002-2010, Frederic Schutz
+ 2008, Christian Perrier
License: Artistic
License: W3C-Software
diff -Nru w3c-markup-validator-1.2+dfsg/debian/license-reconcile.yml w3c-markup-validator-1.3+dfsg/debian/license-reconcile.yml
--- w3c-markup-validator-1.2+dfsg/debian/license-reconcile.yml 1970-01-01 00:00:00.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/license-reconcile.yml 2013-03-09 20:41:33.000000000 +0000
@@ -0,0 +1,9 @@
+Rules:
+ rules:
+ -
+ Glob: misc/*
+ Contains: Licensed under the W3C Software License
+ CopyrightExtract: Copyright\s+\(c\)\s+(\Y+[\w]+)\.\s+Licensed\s+under\s+the\s+W3C\s+Software\s+License
+ License: W3C-Software
+ChangeLog:
+ license: Artistic
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/debian_logo.patch w3c-markup-validator-1.3+dfsg/debian/patches/debian_logo.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/debian_logo.patch 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/debian_logo.patch 2013-03-06 18:11:26.000000000 +0000
@@ -1,26 +1,15 @@
Subject: Replace empty logo image with a Debianized one
Author: Nicholas Bamber
Forwarded: not-needed
-Last-Update: 2011-03-15
---- a/htdocs/no_referer.asis
-+++ b/htdocs/no_referer.asis
-@@ -22,7 +22,7 @@
-
-
-
+Last-Update: 2013-03-06
--- a/share/templates/en_US/header.tmpl
+++ b/share/templates/en_US/header.tmpl
@@ -29,7 +29,7 @@
Check the markup (HTML, XHTML, …) of Web documents
@@ -30,8 +19,8 @@
Check the markup (HTML, XHTML, …) of Web documents
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/dfsg.patch w3c-markup-validator-1.3+dfsg/debian/patches/dfsg.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/dfsg.patch 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/dfsg.patch 2012-10-05 14:33:56.000000000 +0000
@@ -67,7 +67,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.0 Strict
-@@ -169,8 +155,6 @@
+@@ -170,8 +156,6 @@
URI = http://www.w3.org/Icons/valid-html40
ALT URI = http://www.w3.org/Icons/valid-html40-blue
@@ -76,7 +76,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.0 Transitional
-@@ -191,8 +175,6 @@
+@@ -193,8 +177,6 @@
URI = http://www.w3.org/Icons/valid-html40
ALT URI = http://www.w3.org/Icons/valid-html40-blue
@@ -85,7 +85,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.0 Frameset
-@@ -213,8 +195,6 @@
+@@ -216,8 +198,6 @@
URI = http://www.w3.org/Icons/valid-html401
ALT URI = http://www.w3.org/Icons/valid-html401-blue
@@ -94,7 +94,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.01 Strict
-@@ -235,8 +215,6 @@
+@@ -239,8 +219,6 @@
URI = http://www.w3.org/Icons/valid-html401
ALT URI = http://www.w3.org/Icons/valid-html401-blue
@@ -103,7 +103,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.01 Transitional
-@@ -257,8 +235,6 @@
+@@ -262,8 +240,6 @@
URI = http://www.w3.org/Icons/valid-html401
ALT URI = http://www.w3.org/Icons/valid-html401-blue
@@ -112,7 +112,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.01 Frameset
-@@ -295,8 +271,6 @@
+@@ -324,8 +300,6 @@
URI = http://www.w3.org/Icons/valid-xhtml10
ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
@@ -121,7 +121,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Strict
-@@ -320,8 +294,6 @@
+@@ -350,8 +324,6 @@
URI = http://www.w3.org/Icons/valid-xhtml10
ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
@@ -130,7 +130,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Transitional
-@@ -345,8 +317,6 @@
+@@ -376,8 +348,6 @@
URI = http://www.w3.org/Icons/valid-xhtml10
ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
@@ -139,7 +139,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Frameset
-@@ -371,8 +341,6 @@
+@@ -403,8 +373,6 @@
URI = http://www.w3.org/Icons/valid-xhtmlbasic10
ALT URI = http://www.w3.org/Icons/valid-xhtmlbasic10-blue
@@ -148,7 +148,7 @@
Height = 31
Width = 88
Alt = Valid XHTML Basic 1.0
-@@ -463,8 +431,6 @@
+@@ -495,8 +463,6 @@
URI = http://www.w3.org/Icons/valid-xhtmlprint10
ALT URI = http://www.w3.org/Icons/valid-xhtmlprint10-blue
@@ -157,7 +157,7 @@
Height = 31
Width = 88
Alt = Valid XHTML-Print 1.0
-@@ -488,8 +454,6 @@
+@@ -520,8 +486,6 @@
URI = http://www.w3.org/Icons/valid-xhtml11
ALT URI = http://www.w3.org/Icons/valid-xhtml11-blue
@@ -166,7 +166,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.1
-@@ -521,7 +485,6 @@
+@@ -554,7 +518,6 @@
URI = http://validator.w3.org/images/v15445
@@ -174,7 +174,7 @@
Alt = Valid ISO/IEC 15445:2000
-@@ -538,7 +501,6 @@
+@@ -571,7 +534,6 @@
URI = http://validator.w3.org/images/v15445
@@ -182,7 +182,7 @@
Alt = Valid ISO/IEC 15445:2000
-@@ -562,8 +524,6 @@
+@@ -595,8 +557,6 @@
URI = http://www.w3.org/Icons/valid-mathml20
ALT URI = http://www.w3.org/Icons/valid-mathml20-blue
@@ -191,7 +191,7 @@
Height = 31
Width = 88
Alt = Valid MathML 2.0
-@@ -635,8 +595,6 @@
+@@ -668,8 +628,6 @@
URI = http://www.w3.org/Icons/valid-xhtml-rdfa
ALT URI = http://www.w3.org/Icons/valid-xhtml-rdfa-blue
@@ -200,7 +200,7 @@
Height = 31
Width = 88
Alt = Valid XHTML + RDFa
-@@ -665,8 +623,6 @@
+@@ -699,8 +657,6 @@
URI = http://www.w3.org/Icons/valid-svg10
ALT URI = http://www.w3.org/Icons/valid-svg10-blue
@@ -209,7 +209,7 @@
Height = 31
Width = 88
Alt = Valid SVG 1.0
-@@ -693,8 +649,6 @@
+@@ -724,8 +680,6 @@
URI = http://www.w3.org/Icons/valid-svg11
ALT URI = http://www.w3.org/Icons/valid-svg11-blue
@@ -218,7 +218,7 @@
Height = 31
Width = 88
Alt = Valid SVG 1.1
-@@ -720,8 +674,6 @@
+@@ -751,8 +705,6 @@
URI = http://www.w3.org/Icons/valid-svgtiny11
ALT URI = http://www.w3.org/Icons/valid-svgtiny11-blue
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/html-template-ver.patch w3c-markup-validator-1.3+dfsg/debian/patches/html-template-ver.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/html-template-ver.patch 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/html-template-ver.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-Author: Nicholas Bamber
-Bug: http://rt.cpan.org/Ticket/Display.html?id=70190
-Bug-Debian: http://bugs.debian.org/639711
-Subject: HTML::Template has bad version semantics
-Last-Update: 2011-09-29
---- a/httpd/cgi-bin/check
-+++ b/httpd/cgi-bin/check
-@@ -53,7 +53,7 @@
- use HTML::Encoding 0.52 qw();
- use HTML::HeadParser 3.60 qw(); # Needed for HTML5 meta charset workaround
- use HTML::Parser 3.24 qw(); # Need 3.24 for $p->parse($code_ref)
--use HTML::Template 2.6 qw(); # Need 2.6 for path param, other things.
-+use HTML::Template qw(); # Need 2.6 for path param, other things.
- use HTTP::Headers::Util qw();
- use HTTP::Message 1.52 qw(); # Need 1.52 for decoded_content()
- use HTTP::Request qw();
---- a/httpd/cgi-bin/sendfeedback.pl
-+++ b/httpd/cgi-bin/sendfeedback.pl
-@@ -10,7 +10,7 @@
-
- use CGI qw();
- use File::Spec::Functions qw(catfile);
--use HTML::Template 2.6 qw();
-+use HTML::Template qw();
- use Config::General 2.32 qw(); # Need 2.32 for , rt.cpan.org#17852
-
- use vars qw($DEBUG $CFG %RSRC $VERSION);
---- a/misc/docs_errors.pl
-+++ b/misc/docs_errors.pl
-@@ -10,7 +10,7 @@
- ## Modules. See also the BEGIN block further down below.
-
- use File::Spec::Functions qw(catfile);
--use HTML::Template 2.6 qw();
-+use HTML::Template qw();
- use Config::General 2.32 qw(); # Need 2.32 for , rt.cpan.org#17852
-
- use vars qw($DEBUG $CFG $VERSION);
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/httpd_conf_debianize.patch w3c-markup-validator-1.3+dfsg/debian/patches/httpd_conf_debianize.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/httpd_conf_debianize.patch 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/httpd_conf_debianize.patch 2012-10-04 19:05:05.000000000 +0000
@@ -1,10 +1,10 @@
Subject: Cutomization for httpd.conf fragment
Author: Nicholas Bamber
Forwarded: not-needed
-Last-Update: 2010-08-18
+Last-Update: 2012-10-04
--- a/httpd/conf/httpd.conf
+++ b/httpd/conf/httpd.conf
-@@ -1,20 +1,18 @@
+@@ -1,12 +1,10 @@
# -*- apache -*-
-# Example httpd.conf snippet for W3C Markup Validation Service
+# Debianized httpd.conf snippet for W3C Markup Validation Service
@@ -20,17 +20,19 @@
#
# To run the validator without mod_perl 2.x even if it is loaded, comment
# out the "IfDefine MODPERL2" sections below.
+@@ -31,9 +29,9 @@
- # First, tell httpd that check and sendfeedback.pl are CGI scripts.
+ # 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
+-Alias /w3c-validator/check /usr/local/validator/cgi-bin/check
++Alias /w3c-validator/check /usr/lib/cgi-bin/w3c-markup-validator/check
+ AliasMatch ^/+w3c-validator/+feedback(\.html)?$ \
+- /usr/local/validator/cgi-bin/sendfeedback.pl
++ /usr/lib/cgi-bin/w3c-markup-validator/sendfeedback.pl
- # Note: this affects the whole server, not just the validator.
-@@ -40,8 +38,8 @@
+ # Note: this block affects the whole server, not just the validator.
+@@ -60,8 +58,8 @@
# This is the directory where you have the validator's *.html, *.css etc files.
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/makefile.patch w3c-markup-validator-1.3+dfsg/debian/patches/makefile.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/makefile.patch 1970-01-01 00:00:00.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/makefile.patch 2013-03-15 07:58:38.000000000 +0000
@@ -0,0 +1,50 @@
+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.
+
+ #
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/mod_perl.patch w3c-markup-validator-1.3+dfsg/debian/patches/mod_perl.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/mod_perl.patch 1970-01-01 00:00:00.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/mod_perl.patch 2013-03-06 15:43:13.000000000 +0000
@@ -0,0 +1,26 @@
+Subject: Customize mod_perl related stuff
+Forwarded: not-needed
+Author: Nicholas Bamber
+Last-Update: 2013-03-06
+--- a/httpd/conf/httpd.conf
++++ b/httpd/conf/httpd.conf
+@@ -36,7 +36,7 @@
+
+ # Note: this block affects the whole server, not just the validator.
+ PerlSwitches -T
+-PerlPostConfigRequire /usr/local/validator/httpd/mod_perl/startup.pl
++PerlPostConfigRequire /usr/share/w3c-markup-validator/mod_perl/startup.pl
+
+
+
+--- a/httpd/mod_perl/startup.pl
++++ b/httpd/mod_perl/startup.pl
+@@ -8,7 +8,6 @@
+ # /usr/local/validator, be sure to modify this file so that the path to
+ # catalog.xml below is correct for validator's sgml-lib/catalog.xml
+
+-my $home = $ENV{W3C_VALIDATOR_HOME} || "/usr/local/validator";
+-$ENV{XML_CATALOG_FILES} = "$home/htdocs/sgml-lib/catalog.xml";
++$ENV{XML_CATALOG_FILES} = "/usr/share/xml/w3c-sgml-lib/schema/dtd/catalog.xml";
+
+ 1;
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/mod_perl_disable.patch w3c-markup-validator-1.3+dfsg/debian/patches/mod_perl_disable.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/mod_perl_disable.patch 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/mod_perl_disable.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-Author: Nicholas Bamber
-Subject: problems with mod_perl
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618469
-Last-Update: 2011-03-16
---- a/httpd/conf/httpd.conf
-+++ b/httpd/conf/httpd.conf
-@@ -6,27 +6,17 @@
- # 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.
-+# Note: mod_perl has been disabled. See #618469.
-+#
-
- # First, tell httpd that check and sendfeedback.pl are CGI scripts.
-
- 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
-
--
--# Note: this affects the whole server, not just the validator.
--PerlSwitches -T
--
--
-
- Options +ExecCGI
- SetHandler cgi-script
--
-- SetHandler perl-script
-- PerlResponseHandler ModPerl::Registry
-- PerlOptions +ParseHeaders
--
- # Environment settings affecting validator's outside connectivity, see
- # LWP::UserAgent and Net::FTP documentation for details.
- #SetEnv http_proxy http://proxy:3128
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/permission_override.patch w3c-markup-validator-1.3+dfsg/debian/patches/permission_override.patch
--- w3c-markup-validator-1.2+dfsg/debian/patches/permission_override.patch 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/permission_override.patch 2012-10-05 14:33:35.000000000 +0000
@@ -5,7 +5,7 @@
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608225
--- a/httpd/conf/httpd.conf
+++ b/httpd/conf/httpd.conf
-@@ -61,6 +61,12 @@
+@@ -89,6 +89,12 @@
ExpiresByType application/javascript A2592000
ExpiresByType application/ecmascript A2592000
diff -Nru w3c-markup-validator-1.2+dfsg/debian/patches/series w3c-markup-validator-1.3+dfsg/debian/patches/series
--- w3c-markup-validator-1.2+dfsg/debian/patches/series 2012-03-03 14:32:44.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/patches/series 2013-03-06 17:46:12.000000000 +0000
@@ -1,8 +1,8 @@
validator_conf_debianize.patch
httpd_conf_debianize.patch
-debian_logo.patch
+mod_perl.patch
remove_test_warning.patch
-mod_perl_disable.patch
permission_override.patch
dfsg.patch
-html-template-ver.patch
+makefile.patch
+debian_logo.patch
diff -Nru w3c-markup-validator-1.2+dfsg/debian/repack.local w3c-markup-validator-1.3+dfsg/debian/repack.local
--- w3c-markup-validator-1.2+dfsg/debian/repack.local 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/repack.local 2013-03-12 10:32:35.000000000 +0000
@@ -10,3 +10,4 @@
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
diff -Nru w3c-markup-validator-1.2+dfsg/debian/repack.sh w3c-markup-validator-1.3+dfsg/debian/repack.sh
--- w3c-markup-validator-1.2+dfsg/debian/repack.sh 1970-01-01 00:00:00.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/repack.sh 2013-03-11 20:43:26.000000000 +0000
@@ -0,0 +1,161 @@
+#!/bin/sh
+
+# see the repack.stub for how to use
+
+# TODO: provide example watch files and repack.locals
+# TODO: test suite. problems fixed that need to be tested:
+# * globbing
+# * whitespace and then comments in the MANIFEST
+# TODO: does / in weird places work? test suite too.
+# TODO: I actually broke stuff with the MANIFEST change not thinking..
+# TODO: allow for a sepearate (and multiple) MANIFEST files, then
+# de-uglify libsyntax-highlight-engine-kate-perl.
+# TODO: have each mv and rm check that something actually changed, and
+# if not, die
+
+set -e
+set -u
+
+usage() {
+ echo "Usage: repack.sh --upstream-version "
+ exit 1
+}
+
+if [ "$#" != "3" ]; then
+ usage
+fi
+if [ "$1" != "--upstream-version" ]; then
+ usage
+fi
+if [ ! -f "$3" ]; then
+ if [ -n "$3" ]; then
+ echo "$3 doesn't exist"
+ fi
+ usage
+fi
+VER="$2"
+FILE="$3"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+SUFFIX="+dfsg"
+
+echo
+echo "Repackaging $FILE"
+echo
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+DIR=$(readlink -f "$DIR")
+trap "/bin/rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xf "$FILE" -C "$UP_BASE" || unzip "$FILE" -d "$UP_BASE"
+
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+ # Tarball does contain a root directory
+ UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
+
+RM_OPTS="-vrf"
+
+real_rm(){
+ /bin/rm "$@"
+}
+
+real_mv(){
+ /bin/mv "$@"
+}
+
+rm(){
+ set +f
+ MYOLDPWD=$(pwd)
+ cd "$UP_BASE"
+ if [ "$MANIFEST" = "1" ]; then
+ PERM=$(stat --format=%a "MANIFEST")
+ chmod u+w "MANIFEST"
+ fi
+ for i in $@; do
+ if [ "$MANIFEST" = "1" ]; then
+ PATTERN="^$i"
+ if [ -d "$i" ]; then
+ if ! { echo "$PATTERN" | grep -q "/$" ; }; then
+ PATTERN="${PATTERN}/"
+ fi
+ else
+ PATTERN="${PATTERN}\s?"
+ fi
+ grep -Ev "$PATTERN" "MANIFEST" > "$DIR/MANIFEST"
+ real_mv "$DIR/MANIFEST" "MANIFEST"
+ fi
+ real_rm "$RM_OPTS" "$i"
+ done
+ if [ "$MANIFEST" = "1" ]; then
+ chmod $PERM "MANIFEST"
+ fi
+ cd $MYOLDPWD
+ set -f
+}
+
+mv(){
+ set +f
+ OLD=$(pwd)
+ cd $UP_BASE
+ real_mv "$@"
+ cd $OLD
+ if [ "$MANIFEST" = "1" ]; then
+ echo "MANIFEST cannot be manipulated with mv yet, patches welcome"
+ exit 1
+ fi
+ set -f
+}
+
+# bump with incompatible changes
+REPACK_VERSION=3
+
+requires_version(){
+ if [ $REPACK_VERSION -lt $1 ]; then
+ echo "repack.sh is not up to date enough for this package. you need at least version $1, while this script is only version $REPACK_VERSION"
+ exit 1
+ fi
+}
+
+MANIFEST=0
+## Remove stuff
+set -f
+MYORIGPWD=$(pwd)
+cd "$UP_BASE"
+. "$MYORIGPWD/debian/repack.local"
+cd $MYORIGPWD
+set +f
+## End
+
+REPACK_DIR="$PKG-${VER}${SUFFIX}.orig" # DevRef § 6.7.8.2
+DFSG_TAR="$(dirname $FILE)/${PKG}_${VER}${SUFFIX}.orig.tar"
+
+real_mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# .gz or .bz2?
+FILETYPE=$(file --brief --mime-type --dereference "$FILE")
+case "$FILETYPE" in
+ application/x-gzip|application/zip)
+ C_PROGRAM="gzip"
+ C_SUFFIX="gz"
+ ;;
+ application/x-bzip2)
+ C_PROGRAM="bzip2"
+ C_SUFFIX="bz2"
+ ;;
+ *)
+ echo "E: Unknown filetye $FILETYPE"
+ exit 1
+ ;;
+esac
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+$C_PROGRAM -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.$C_SUFFIX"
+
+real_mv "$DIR/repacked.tar.$C_SUFFIX" "$DFSG_TAR.$C_SUFFIX"
+
+echo "*** $DFSG_TAR.$C_SUFFIX ready"
diff -Nru w3c-markup-validator-1.2+dfsg/debian/rules w3c-markup-validator-1.3+dfsg/debian/rules
--- w3c-markup-validator-1.2+dfsg/debian/rules 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/rules 2013-03-15 08:01:28.000000000 +0000
@@ -11,21 +11,18 @@
%:
dh $@
-override_dh_auto_build:
- dh_auto_build
- yui-compressor htdocs/scripts/mootools-1.2.5-core-nc.js > combined.js
- yui-compressor htdocs/scripts/mootools-1.2.5.1-more.js >> combined.js
- yui-compressor htdocs/scripts/w3c-validator.js >> combined.js
+override_dh_auto_test:
+ @echo TESTS REQUIRE A NETWORK
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 httpd/mod_perl/* ${SHARED_DIR}/mod_perl
dh_install htdocs/config/* ${CONFIG_DIR}
dh_install share/templates/en_US/* ${SHARED_DIR}/templates/en_US
dh_install -Xconfig -Xtest htdocs/* ${HTML_DIR}
dh_install debian/logo.png ${IMAGES_DIR}
- dh_install combined.js ${HTML_DIR}/scripts
override_dh_installdocs:
mkdir -p debian/tmp
@@ -34,21 +31,4 @@
lynx -dump -nolist htdocs/about.html | iconv -f latin1 > debian/tmp/README
dh_installdocs
-# The validator supports content negotiation with MultiViews.
-# See http://httpd.apache.org/docs/current/content-negotiation.html
-# and httpd/conf/httpd.conf and these compressed files
-# are required as part of that. In order to facilitate
-# any modifications to the code we have these rules.
-override_dh_compress:
- dh_compress
- gzip -c htdocs/navbar.css > ${TMP}/${HTML_DIR}/navbar.css.gz
- gzip -c htdocs/base.css > ${TMP}/${HTML_DIR}/base.css.gz
- gzip -c htdocs/tips.css > ${TMP}/${HTML_DIR}/tips.css.gz
- gzip -c htdocs/print.css > ${TMP}/${HTML_DIR}/print.css.gz
- gzip -c combined.js > ${TMP}/${HTML_DIR}/scripts/combined.js.gz
- gzip -c htdocs/docs.css > ${TMP}/${HTML_DIR}/docs.css.gz
- gzip -c htdocs/handheld.css > ${TMP}/${HTML_DIR}/handheld.css.gz
- gzip -c htdocs/results.css > ${TMP}/${HTML_DIR}/results.css.gz
- gzip -c htdocs/style/base.css > ${TMP}/${HTML_DIR}/style/base.css.gz
- gzip -c htdocs/style/results.css > ${TMP}/${HTML_DIR}/style/results.css.gz
diff -Nru w3c-markup-validator-1.2+dfsg/debian/watch w3c-markup-validator-1.3+dfsg/debian/watch
--- w3c-markup-validator-1.2+dfsg/debian/watch 2012-02-08 22:56:06.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/debian/watch 2013-03-12 10:34:47.000000000 +0000
@@ -1,3 +1,5 @@
version=3
opts=dversionmangle=s/\+dfsg// \
- http://validator.w3.org/dist/validator-(\d+)_(\d+)\.tar\.gz
+ http://validator.w3.org/dist/validator-(\d+)_(\d+)\.tar\.gz \
+ debian sh debian/repack.sh
+
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/base.css w3c-markup-validator-1.3+dfsg/htdocs/base.css
--- w3c-markup-validator-1.2+dfsg/htdocs/base.css 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/base.css 1970-01-01 00:00:00.000000000 +0000
@@ -1,308 +0,0 @@
-/*!
- Base Style Sheet for the W3C Markup Validation Service.
-
- Copyright 2000-2006 W3C (MIT, INRIA, Keio). All Rights Reserved.
- See http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright
-*/
-
-@import url("results"); /* CSS for validation results. */
-@import url("navbar"); /* CSS for navigation menu. */
-@import url("tips"); /* CSS for Quality Tips. */
-@import url("docs"); /* CSS for the Documentation. */
-@import url("print") print;
-@import url("handheld") handheld;
-
-
-/* Special Notices */
-p#msie { /* msie-bug note for text/plain */
- float: right;
- border: 1px solid black;
- background: white;
- width: 15em;
- padding: 1em;
- text-align: justify;
- font-size: smaller;
-}
-
-
-/*
- General styling
- */
-html {
- background-color: white;
-}
-
-body {
- margin: auto auto;
- padding-left: 6%;
- padding-right: 6%;
- background-color: white;
-/* background-image: url(http://www.w3.org/Icons/logo-WMVS.png);
- background-attachment: fixed;
- background-position: 0 0;
- background-repeat: no-repeat; */
- color: #11111A;
- font-family: Helvetica, "Trebuchet MS", Arial, sans-serif;
- font-size: 1em; /* setting base font to user's prefered size */
- line-height: 130%;
-}
-
-/*
- Main blocks - see also #menu styled in navbar.css
- */
-
-#banner {
- background-color: white;
- background-image: url(images/header.jpg);
- background-repeat: no-repeat;
- background-attachment: scroll;
- background-position: top right;
- padding: 0;
- height: 50px;
- margin-bottom: 0;
-/*
- margin-top: 20px;
- margin-left: 42px;
-*/
- border: 0;
-
-}
-
-#banner h1 {
- height: 50px;
- vertical-align: middle;
- font-size: 1.5em;
- display: inline;
-}
-
-#main {
- border-bottom: 0;
- border-top: 0;
- border-left: 1px solid #dfebf7;
- border-right: 1px solid #dfebf7;
-
-}
-#main, address {
- background-color: white;
- margin: 0;
- /*margin-left: 42px; */
- padding: 15px;
- padding-left: 0;
- padding-right: 0;
-/* border: 1px solid #E8E8FA; */
-}
-
-address {
- background-color: #eee;
- background-image: url(images/footer.jpg);
- background-repeat: no-repeat;
- background-attachment: scroll;
- background-position: right;
- height:45px;
- padding-top: 10px;
- padding-bottom: 0;
- padding-left: 15px;
- clear: right;
-
-}
-
-address img {
- display: inline;
- float: left;
- vertical-align: middle;
- width: 88px;
-}
-
-
-.intro {
- font-style: italic;
- text-align: justify;
-}
-
-/*
- Headers
- */
-
-h1 {
- color: #053188;
- font-family: "Bitstream Vera Sans", Helvetica, Arial, sans-serif;
- font-size-adjust: .53;
- font-weight: bold;
- font-style: normal;
- text-decoration: none;
-}
-
-h2 {
- color: #777742;
- background: white;
- padding: 5px 15px;
- margin-top: 20px;
- margin-bottom: 20px;
- font-size: 1.3em;
- text-align: center;
- text-decoration: none;
- font-family: Georgia, Didot, serif;
-}
-
-h3 {
- /* color: #C65831; */
- color: #fff;
- background-color: #aaaa77;
- font-size: 1.1em;
- padding: 2px 15px;
- border-top: 1px dotted #777742;
- border-bottom: 1px dotted #777742;
- text-decoration: none;
- font-family: Georgia, Didot, serif;
-}
-
-h4 {
- color: #777742;
- font-weight: 600;
- font-style: italic;
- text-decoration: none;
- font-size: 1.0em;
- font-family: Georgia, Didot, serif;
-}
-
-h5,h6 {
- color: #777742;
- background-color: white;
- font-family: Georgia, Didot, serif;
- }
-/*
- General link styling
- */
-
-a:link, a:visited {
- color: #005A9C;
- text-decoration: none;
-
-}
-
-a:hover, a:active {
- color: #005A9C;
- text-decoration: underline;
-}
-
-
-/*
- Other basic styles
- */
-
-/* TODO - add ol, li, td here ? */
-p, dt {
- margin-left: 15px;
- margin-right: 25px;
-}
-
-dd {
- margin-left: 35px;
- margin-right: 25px;
-}
-
-#news dt {
- font-weight: bold;
- margin-top: 1em;
- }
-
-img {
- margin:0;
- padding: 0;
- vertical-align: middle;
- border: 0;
-}
-
-acronym:hover, abbr:hover {
- cursor: help;
-}
-
-abbr[title], acronym[title], span[title], strong[title] {
- border-bottom: thin dotted;
- cursor: help;
-}
-
-pre, code, tt {
- font-family: "Bitstream Vera Sans Mono", Monaco, "Andale Mono", monospace;
- line-height: 100%;
- white-space: pre;
-}
-
-a:link img, a:visited img {
- border-style: none;
-}
-
-a img {color: black} /* The only way to hide the border in NS 4.x */
-
-ul.toc {
- list-style: none;
-}
-
-
-
-
-/*
- Stuff we don't actually want too visible - or not at all
- */
-
-p.copyright {
- margin-top: 20px;
- width: 50%;
- font-size: x-small;
- text-align: justify;
- text-transform: uppercase;
- margin-left: 222px;
- font-family: "Bitstream Vera Sans Mono", monospace;
- color: #888;
- line-height: 120%;
-}
-
-p.copyright a {
- color: #88f;
- text-decoration: none;
-}
-
-
-.hideme { display: none; }
-
-
-/*
- Forms
- */
-
-
-/* Fieldsets */
-fieldset {
- padding: .5em;
- background: white;
- border: 1px dotted #aaaa77;
- margin-left: 20px;
- margin-right: 20px;
- margin-top: .5em;
-}
-
-fieldset legend {
- color: #fff;
- background-color: #aaaa77;
- font-size: smaller;
- padding: .1ex .5ex;
- border-right: 1px solid gray;
- border-bottom: 1px solid gray;
- font-weight: bold;
-}
-
-
-input {
- vertical-align: middle;
-}
-
-input.reset {
- text-align: center;
-}
-
-input.default {
- text-align: center;
- font-weight: bold;
-}
-
-
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/config/tips.cfg w3c-markup-validator-1.3+dfsg/htdocs/config/tips.cfg
--- w3c-markup-validator-1.2+dfsg/htdocs/config/tips.cfg 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/config/tips.cfg 1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#
-# "Tip Of The Day" Configuration.
-#
-# Each key is a URL and the value is the text that should be displayed as
-# the link to it. Will appear in Validation Results pages. To disable
-# just comment out or delete all lines in this file. The URL should be a
-# properly escaped URI (not HTML escaped), and the value is included as-is
-# in the markup.
-#
-
-http://www.w3.org/QA/Tips/good-titles = <title> : the most important element of a quality Web page.
-http://www.w3.org/QA/Tips/noClickHere = Don't use "click here" as link text!
-http://www.w3.org/QA/Tips/Use_h1_for_Title = Use <h1> for top-level heading
-http://www.w3.org/QA/Tips/reback = Use standard redirects: don't break the back button!
-http://www.w3.org/QA/Tips/altAttribute = Use the alt
attribute to describe the function of each visual
-http://www.w3.org/QA/Tips/color = If You Pick One Color Pick Them All
-http://www.w3.org/QA/Tips/font-size = Care With Font Size
-http://www.w3.org/QA/Tips/use-links = Use <link>s in your document
-http://www.w3.org/QA/Tips/iso-date = Use international date format
-http://www.w3.org/QA/Tips/png-gif = GIF or PNG
-http://www.w3.org/QA/Tips/headings = Use headings to structure your document
-http://www.w3.org/QA/Tips/uri-choose = Choose URIs wisely
-http://www.w3.org/QA/Tips/uri-manage = Managing URIs
-http://www.w3.org/QA/Tips/beyond-validation = Beyond Validation
-http://www.w3.org/QA/Tips/goodclassnames = Use class
with semantics in mind
-http://www.w3.org/QA/Tips/unordered-lists = Unordered lists: more than just bullets
-
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/config/types.conf w3c-markup-validator-1.3+dfsg/htdocs/config/types.conf
--- w3c-markup-validator-1.2+dfsg/htdocs/config/types.conf 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/config/types.conf 2012-03-12 15:03:14.000000000 +0000
@@ -8,7 +8,7 @@
# The meaning of the parameters are mostly obvious and all are documented
# in docs/devel.html. Of particular note, the names of each section is
# arbitrary and the "datastructure" is turned inside out in the code so
-# that it is indexed by the PubID. This means you can not have multiple
+# that it is indexed by the PubID. This means you cannot have multiple
# entries with identical PubID!
#
@@ -152,6 +152,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.0 Strict
+ OnClick = onclick
@@ -174,6 +175,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.0 Transitional
+ OnClick = onclick
@@ -196,6 +198,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.0 Frameset
+ OnClick = onclick
@@ -218,6 +221,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.01 Strict
+ OnClick = onclick
@@ -240,6 +244,7 @@
Height = 31
Width = 88
Alt = Valid HTML 4.01 Transitional
+ OnClick = onclick
@@ -262,9 +267,33 @@
Height = 31
Width = 88
Alt = Valid HTML 4.01 Frameset
+ OnClick = onclick
+
+ Name = html
+ Display = HTML 4.01 + RDFa 1.1
+ Info URL = http://www.w3.org/TR/rdfa-syntax
+ PubID = -//W3C//DTD HTML 4.01+RDFa 1.1//EN
+ SysID = http://www.w3.org/MarkUp/DTD/html401-rdfa11-1.dtd
+ Parse Mode = SGML
+
+ Allowed = text/html
+ Preferred = text/html
+
+
+ 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 + RDFa 1.1
+ OnClick = onclick
+
+
+
Name = html
Display = HTML5
@@ -300,6 +329,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Strict
+ OnClick = onclick
@@ -325,6 +355,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Transitional
+ OnClick = onclick
@@ -350,6 +381,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Frameset
+ OnClick = onclick
@@ -493,6 +525,7 @@
Height = 31
Width = 88
Alt = Valid XHTML 1.1
+ OnClick = onclick
@@ -641,6 +674,7 @@
Width = 88
Alt = Valid XHTML + RDFa
RDFa = http://www.w3.org/TR/rdfa-syntax
+ OnClick = onclick
@@ -676,15 +710,12 @@
Name = svg
Display = SVG 1.1
- Info URL = http://www.w3.org/TR/2003/REC-SVG11-20030114/
+ Info URL = http://www.w3.org/TR/2011/REC-SVG11-20110816/
PubID = -//W3C//DTD SVG 1.1//EN
SysID = http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd
Namespace = http://www.w3.org/2000/svg
- # Per
- # http://www.w3.org/TR/2003/REC-SVG11-20030114/struct.html#NewDocumentOverview
- # An xmlns attribute without a namespace prefix *could* be specified on an
- # 'svg' element
- Namespace Required = 0
+ # http://www.w3.org/TR/2011/REC-SVG11-20110816/struct.html#NewDocumentOverview
+ Namespace Required = 1
Parse Mode = XML
Allowed = image/svg+xml
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/config/validator.conf w3c-markup-validator-1.3+dfsg/htdocs/config/validator.conf
--- w3c-markup-validator-1.2+dfsg/htdocs/config/validator.conf 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/config/validator.conf 2012-03-12 15:03:14.000000000 +0000
@@ -116,12 +116,6 @@
application/mathml+xml = XML
-#
-# Source for the "Tip of The Day" blurbs.
-
- Include tips.cfg
-
-
## Enable checking documents via external services.
## The example config below assumes that you have installed the validator.nu
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/colons.html w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/colons.html
--- w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/colons.html 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/colons.html 2012-03-12 15:03:14.000000000 +0000
@@ -4,22 +4,30 @@
XHTML 1.0 Strict with chars in the range 0x80-0x9B
-
+
- Markup Validator
+
+
+
Check the markup (HTML, XHTML, …) of Web documents
+
+
This element uses an undeclared namespace prefix.
This element uses an undeclared namespace prefix on only the end tag.
This element uses an undeclared namespace prefix on only the start tag.
+
+
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/html40-strict.html w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/html40-strict.html
--- w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/html40-strict.html 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/html40-strict.html 2012-03-12 15:03:14.000000000 +0000
@@ -19,7 +19,7 @@
- valid HTML
+ valid HTML
Gerald Oskoboiny
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/index.html w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/index.html
--- w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/index.html 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/index.html 2012-03-12 15:03:14.000000000 +0000
@@ -300,7 +300,7 @@
Valid SVG 1.0 Rec. minimal document
- SVG 1.0 Document Type support test
+ SVG 1.1 Document Type support test
validate -
with v.w.o -
diff -Nru w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/nonSGML-chars.html w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/nonSGML-chars.html
--- w3c-markup-validator-1.2+dfsg/htdocs/dev/tests/nonSGML-chars.html 2011-02-14 15:39:25.000000000 +0000
+++ w3c-markup-validator-1.3+dfsg/htdocs/dev/tests/nonSGML-chars.html 2012-03-12 15:03:14.000000000 +0000
@@ -4,24 +4,32 @@
XHTML 1.0 Strict with chars in the range 0x80-0x9B
-
+
- Markup Validator
+
+
+
Check the markup (HTML, XHTML, …) of Web documents
+
+
Here are some chars in the range 0x80-0x9B:
Foo! Foo!
Bar! Bar!
Baz! Baz!
+
+