[xml/sgml-commit] r1743 - in /packages/w3c-markup-validator/trunk/debian: changelog control copyright logo.png patches/debian_logo.patch patches/full_path_for_form_actions.patch patches/mootools.patch patches/series rules
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Wed Aug 18 22:10:37 UTC 2010
Author: periapt-guest
Date: Wed Aug 18 22:10:33 2010
New Revision: 1743
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1743
Log:
working on logo and copyright
Added:
packages/w3c-markup-validator/trunk/debian/logo.png (with props)
packages/w3c-markup-validator/trunk/debian/patches/debian_logo.patch
Removed:
packages/w3c-markup-validator/trunk/debian/patches/full_path_for_form_actions.patch
packages/w3c-markup-validator/trunk/debian/patches/mootools.patch
Modified:
packages/w3c-markup-validator/trunk/debian/changelog
packages/w3c-markup-validator/trunk/debian/control
packages/w3c-markup-validator/trunk/debian/copyright
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=1743&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/changelog (original)
+++ packages/w3c-markup-validator/trunk/debian/changelog Wed Aug 18 22:10:33 2010
@@ -1,20 +1,20 @@
w3c-markup-validator (1.1-1) UNRELEASED; urgency=low
TODO:
+ fix logo
+ mootools issue
make sure there is at least some backward compatibility with w3c-dtd-xhtml
- 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)
* Restricting dependency to apache2 until someone volunteers to do
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.
+ * Setting version dependency on libwww-perl after investigating taint issues
+ * Replacing W3C placeholder logo with customized Debian logo.
-- Nicholas Bamber <nicholas at periapt.co.uk> Fri, 30 Jul 2010 22:41:09 +0100
Modified: packages/w3c-markup-validator/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/control?rev=1743&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/control (original)
+++ packages/w3c-markup-validator/trunk/debian/control Wed Aug 18 22:10:33 2010
@@ -12,7 +12,12 @@
Package: w3c-markup-validator
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, apache2, libwww-perl, liburi-perl, libhtml-template-perl (>= 2.6), libhtml-parser-perl (>= 3.60), libtext-iconv-perl, libset-intspan-perl, libnet-ip-perl, libconfig-general-perl (>= 2.32), w3c-sgml-lib, libencode-hanextra-perl, libhtml-encoding-perl, libjson-perl (>= 2.00), libxml-libxml-perl (>= 1.70), libsgml-parser-opensp-perl, libjs-mootools
+Depends: ${perl:Depends}, ${misc:Depends}, apache2, libwww-perl (>= 5.836),
+ liburi-perl, libhtml-template-perl (>= 2.6), libhtml-parser-perl (>= 3.60),
+ libtext-iconv-perl, libset-intspan-perl, libnet-ip-perl,
+ libconfig-general-perl (>= 2.32), w3c-sgml-lib, libencode-hanextra-perl,
+ libhtml-encoding-perl, libjson-perl (>= 2.00), libxml-libxml-perl (>= 1.70),
+ libsgml-parser-opensp-perl, libjs-mootools
Recommends: libhtml-tidy-perl
Description: W3C Markup Validator
This is a CGI script which lets you enter the URL of a web page which will
Modified: packages/w3c-markup-validator/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/copyright?rev=1743&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/copyright (original)
+++ packages/w3c-markup-validator/trunk/debian/copyright Wed Aug 18 22:10:33 2010
@@ -8,8 +8,15 @@
License: W3C-Software
Files: htdocs/images/valid_icons/*
-Copyright 1994-2010, W3C(R) (MIT, ERCIM, KEIO)
-License: W3C-Software
+Copyright 1994-2010, World Wide Web Consortium, (Massachusetts
+ Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University)
+License: W3C-Documents
+
+Files: debian/logo.png
+Copyright: 1999, Software in the Public Interest
+ 2010, Nicholas Bamber <nicholas at periapt.co.uk>
+License: Debian Open Use Logo License
Files: debian/*
Copyright:
@@ -18,57 +25,58 @@
License: Artistic
License: W3C-Software
+ By obtaining, using and/or copying this work, you (the licensee) agree
+ that you have read, understood, and will comply with the following
+ terms and conditions.
+ .
Permission to copy, modify, and distribute this software and its
- documentation, with or without modification, for any purpose and without
- fee or royalty is hereby granted, provided that you include the following on
- ALL copies of the software and documentation or portions thereof, including
- modifications:
- .
- * The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
- * Any pre-existing intellectual property disclaimers, notices, or terms
- and conditions. If none exist, the W3C Software Short Notice
- (http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html)
- should be included (hypertext is preferred, text is permitted)
- within the body of any redistributed or derivative code.
- * Notice of any changes or modifications to the files, including the date
- changes were made. (We recommend you provide URIs to the location from
- which the code is derived.)
+ documentation, with or without modification, for any purpose and
+ without fee or royalty is hereby granted, provided that you include the
+ following on ALL copies of the software and documentation or portions
+ thereof, including modifications:
+ * The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ * Any pre-existing intellectual property disclaimers, notices, or
+ terms and conditions. If none exist, the W3C Software Short Notice
+ should be included (hypertext is preferred, text is permitted)
+ within the body of any redistributed or derivative code.
+ * Notice of any changes or modifications to the files, including the
+ date changes were made. (We recommend you provide URIs to the
+ location from which the code is derived.)
.
Disclaimers
.
- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
- MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
- LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
- PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
- ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+ HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+ DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ TRADEMARKS OR OTHER RIGHTS.
.
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
- CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+ OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
DOCUMENTATION.
.
The name and trademarks of copyright holders may NOT be used in
- advertising or publicity pertaining to the software without specific, written
- prior permission. Title to copyright in this software and any associated
- documentation will at all times remain with copyright holders.
+ advertising or publicity pertaining to the software without specific,
+ written prior permission. Title to copyright in this software and any
+ associated documentation will at all times remain with copyright
+ holders.
.
Notes
.
- This version: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ This version:
+ http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
.
- This formulation of W3C's notice and license became active on December 31
- 2002. This version removes the copyright ownership notice such that this
- license can be used with materials other than those owned by the W3C,
- reflects that ERCIM is now a host of the W3C, includes references to this
- specific dated version of the license, and removes the ambiguous grant of
- "use". Otherwise, this version is the same as the
- (http://www.w3.org/Consortium/Legal/copyright-software-19980720) previous
- version and is written so as to preserve the
- (http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses) Free
- Software Foundation's assessment of GPL compatibility and
- (http://www.opensource.org/licenses/W3C.php) OSI's certification
- under the (http://www.opensource.org/docs/definition.php) Open Source
- Definition.
+ This formulation of W3C's notice and license became active on December
+ 31 2002. This version removes the copyright ownership notice such that
+ this license can be used with materials other than those owned by the
+ W3C, reflects that ERCIM is now a host of the W3C, includes references
+ to this specific dated version of the license, and removes the
+ ambiguous grant of "use". Otherwise, this version is the same as the
+ previous version and is written so as to preserve the Free Software
+ Foundation's assessment of GPL compatibility and OSI's certification
+ under the Open Source Definition.
License: Artistic
This program is free software; you can redistribute it and/or modify
@@ -82,72 +90,96 @@
terms and conditions.
License: W3C-Documents
- By using and/or copying this document, or the
- W3C document from which this statement is linked, you (the licensee) agree
- that you have read, understood, and will comply with the following terms and
- conditions:
+ By using and/or copying this document, or the W3C document from which
+ this statement is linked, you (the licensee) agree that you have read,
+ understood, and will comply with the following terms and conditions:
.
- Permission to copy, and distribute the contents of this document, or the
- W3C document from which this statement is linked, in any medium for any
- purpose and without fee or royalty is hereby granted, provided that you
- include the following on <i>ALL</i> copies of the document, or portions
+ Permission to copy, and distribute the contents of this document, or
+ the W3C document from which this statement is linked, in any medium for
+ any purpose and without fee or royalty is hereby granted, provided that
+ you include the following on ALL copies of the document, or portions
thereof, that you use:
- * A link or URL to the original W3C document.
- * The pre-existing copyright notice of the original author, or if it
- doesn't exist, a notice (hypertext is preferred, but a textual
- representation is permitted) of the form: "Copyright ©
- [$date-of-document] <a href="http://www.w3.org/">World Wide Web
- Consortium</a>, (<a href="http://www.csail.mit.edu/">Massachusetts
- Institute of Technology</a>, <a href="http://www.ercim.org/">European
- Research Consortium for Informatics and Mathematics</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
- <a href="http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</a>"</li><li>
- <em>If it exists</em>, the STATUS of the W3C document.</li></ul>
+ * A link or URL to the original W3C document.
+ * The pre-existing copyright notice of the original author, or if it
+ doesn't exist, a notice (hypertext is preferred, but a textual
+ representation is permitted) of the form: "Copyright ©
+ [$date-of-document] World Wide Web Consortium, (Massachusetts
+ Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/2002/copyright-documents-2002123
+ 1"
+ * If it exists, the STATUS of the W3C document.
+ .
+ When space permits, inclusion of the full text of this NOTICE should be
+ provided. We request that authorship attribution be provided in any
+ software, documents, or other items or products that you create
+ pursuant to the implementation of the contents of this document, or any
+ portion thereof.
+ .
+ No right to create modifications or derivatives of W3C documents is
+ granted pursuant to this license. However, if additional requirements
+ (documented in the Copyright FAQ) are satisfied, the right to create
+ modifications or derivatives is sometimes granted by the W3C to
+ individuals complying with those requirements.
+ .
+ Disclaimers
+ .
+ THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
+ REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
+ LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT
+ ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH
+ CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ TRADEMARKS OR OTHER RIGHTS.
+ .
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+ OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
+ PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.
+ .
+ The name and trademarks of copyright holders may NOT be used in
+ advertising or publicity pertaining to this document or its contents
+ without specific, written prior permission. Title to copyright in this
+ document will at all times remain with copyright holders.
+ .
+ Notes
+ .
+ This version:
+ http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+ .
+ This formulation of W3C's notice and license became active on December
+ 31 2002. This version removes the copyright ownership notice such that
+ this license can be used with materials other than those owned by the
+ W3C, moves information on style sheets, DTDs, and schemas to the
+ Copyright FAQ, reflects that ERCIM is now a host of the W3C, includes
+ references to this specific dated version of the license, and removes
+ the ambiguous grant of "use". See the older formulation for the policy
+ prior to this date. Please see our Copyright FAQ for common questions
+ about using materials from our site, such as the translating or
+ annotating specifications.
- <p>When space permits, inclusion of the full text of this <b>NOTICE</b>
-should be provided. We request that authorship attribution be provided in any
-software, documents, or other items or products that you create pursuant to
-the implementation of the contents of this document, or any portion
-thereof.</p>
- <p>No right to create modifications or derivatives of W3C documents is
-granted pursuant to this license. However, if additional requirements
-(documented in the <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</a>) are
-satisfied, the right to create modifications or derivatives is sometimes
-granted by the W3C to individuals complying with those requirements.</p>
-
- <h2>Disclaimers</h2>
- <p>THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
-TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
-FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
-INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
-
- <p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
-PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.</p>
-
- <p>The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to this document or its contents without
-specific, written prior permission. Title to copyright in this document will
-at all times remain with copyright holders.</p>
-
- <h2>Notes</h2>
-
- <p>This version: http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</p>
-
- <p>This formulation of W3C's notice and license became active on December 31
-2002. This version removes the copyright ownership notice such that this
-license can be used with materials other than those owned by the W3C, moves
-information on style sheets, DTDs, and schemas to the <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</a>, reflects
-that ERCIM is now a host of the W3C, includes references to this specific
-dated version of the license, and removes the ambiguous grant of "use". See
-the <a href="http://www.w3.org/Consortium/Legal/copyright-documents-19990405">older
-formulation</a> for the policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</a> for
-common questions about using materials from our site, such as the translating
-or annotating specifications. </p>
-
- </div>
- </div>
- </div>
- </div>
+License: Debian Open Use Logo License
+ The logo without "Debian" is released under the following common free
+ software license.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Note: we would appreciate that you make the image a link to
+ http://www.debian.org/ if you use it on a web page.
Added: packages/w3c-markup-validator/trunk/debian/logo.png
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/logo.png?rev=1743&op=file
==============================================================================
Binary file - no diff available.
Propchange: packages/w3c-markup-validator/trunk/debian/logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: packages/w3c-markup-validator/trunk/debian/patches/debian_logo.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/patches/debian_logo.patch?rev=1743&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/debian_logo.patch (added)
+++ packages/w3c-markup-validator/trunk/debian/patches/debian_logo.patch Wed Aug 18 22:10:33 2010
@@ -1,0 +1,37 @@
+Subject: Replace empty logo image with a Debianized one
+Author: Nicholas Bamber
+Forwarded: not-needed
+Last-Update: 2010-08-18
+--- a/htdocs/no_referer.asis
++++ b/htdocs/no_referer.asis
+@@ -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.w3.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>
+--- a/htdocs/header.html
++++ b/htdocs/header.html
+@@ -27,7 +27,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/no_w3c.png" /></a>
++ <a href="http://www.w3.org/"><img alt="W3C on Debian" width="110" height="61" id="logo" src="<!--#echo var="relroot" -->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>
+--- a/share/templates/en_US/header.tmpl
++++ b/share/templates/en_US/header.tmpl
+@@ -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/no_w3c.png" /></a>
++ <a href="http://www.w3.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>
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=1743&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/patches/series (original)
+++ packages/w3c-markup-validator/trunk/debian/patches/series Wed Aug 18 22:10:33 2010
@@ -1,2 +1,3 @@
validator_conf_debianize.patch
httpd_conf_debianize.patch
+debian_logo.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=1743&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/rules (original)
+++ packages/w3c-markup-validator/trunk/debian/rules Wed Aug 18 22:10:33 2010
@@ -29,8 +29,9 @@
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 debian/logo.png ${SHARED_DIR}/html
dh_install htdocs/images ${SHARED_DIR}/html
- dh_install htdocs/scripts/*.js ${SHARED_DIR}/html/scripts
+ dh_install htdocs/scripts/*.js ${SHARED_DIR}/html/scripts
override_dh_installdocs:
mkdir -p debian/tmp
More information about the debian-xml-sgml-commit
mailing list