[xml/sgml-commit] r1858 - in /packages/w3c-markup-validator/trunk/debian: changelog clean control rules

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Thu Mar 17 11:33:25 2011
New Revision: 1858

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1858
Log:
* Add apache config ensuring directory access (Closes: #608225)
* Change rules to rebuild htdocs/scripts/combined.js

Added:
    packages/w3c-markup-validator/trunk/debian/clean
Modified:
    packages/w3c-markup-validator/trunk/debian/changelog
    packages/w3c-markup-validator/trunk/debian/control
    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=1858&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/changelog (original)
+++ packages/w3c-markup-validator/trunk/debian/changelog Thu Mar 17 11:33:25 2011
@@ -3,7 +3,6 @@
   TODO: 
   - consider SOAP
   - dfsg
-  - yui compressor
 
   * New upstream release
   * Reviewed and refreshed patches
@@ -14,7 +13,8 @@
   * Disabled mod_perl support (cf. #618416)
   * Refreshed copyright
   * Refreshed lintian overrides
-  * Add rules ensuring directory access (Closes: #608225)
+  * Add apache config ensuring directory access (Closes: #608225)
+  * Change rules to rebuild htdocs/scripts/combined.js
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Mon, 14 Mar 2011 10:30:01 +0000
 

Added: packages/w3c-markup-validator/trunk/debian/clean
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/clean?rev=1858&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/clean (added)
+++ packages/w3c-markup-validator/trunk/debian/clean Thu Mar 17 11:33:25 2011
@@ -1,0 +1,1 @@
+combined.js

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=1858&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/control (original)
+++ packages/w3c-markup-validator/trunk/debian/control Thu Mar 17 11:33:25 2011
@@ -4,7 +4,7 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Nicholas Bamber <nicholas at periapt.co.uk>, Jaldhar H. Vyas <jaldhar at debian.org>
 Build-Depends: debhelper (>= 7.5.0)
-Build-Depends-Indep: sharutils, perl, lynx, libc-bin
+Build-Depends-Indep: sharutils, perl, lynx, libc-bin, yui-compressor
 Standards-Version: 3.9.1
 Homepage: http://validator.w3.org/about.html
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator

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=1858&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/rules (original)
+++ packages/w3c-markup-validator/trunk/debian/rules Thu Mar 17 11:33:25 2011
@@ -11,14 +11,21 @@
 %:
 	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_install:
 	dh_install httpd/cgi-bin/check            ${CGIBIN_DIR}
 	dh_install httpd/cgi-bin/sendfeedback.pl  ${CGIBIN_DIR}
 	dh_install httpd/conf/*                   ${CONFIG_DIR}
 	dh_install htdocs/config/*                ${CONFIG_DIR}
 	dh_install share/templates/en_US/*        ${SHARED_DIR}/templates/en_US
-	dh_install -XLICENSE -Xconfig -X.gz -Xtest htdocs/*   ${HTML_DIR}
+	dh_install -Xcombined.js -XLICENSE -Xconfig -X.gz -Xtest htdocs/*   ${HTML_DIR}
 	dh_install debian/logo.png                ${IMAGES_DIR}
+	dh_install combined.js                    ${HTML_DIR}/scripts/combined.js
 
 override_dh_installdocs:
 	mkdir -p debian/tmp
@@ -38,7 +45,7 @@
 	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 htdocs/scripts/combined.js > ${TMP}/${HTML_DIR}/scripts/combined.js.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