[xml/sgml-commit] r1849 - in /packages/w3c-markup-validator/trunk/debian: changelog rules w3c-markup-validator.examples
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Wed Mar 16 11:38:49 UTC 2011
Author: periapt-guest
Date: Wed Mar 16 11:38:48 2011
New Revision: 1849
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1849
Log:
* Simplified rules and compressed files as required by upstream
to support content negotiation (Closes: #618469)
* Moved test files to the examples directory
Added:
packages/w3c-markup-validator/trunk/debian/w3c-markup-validator.examples
Modified:
packages/w3c-markup-validator/trunk/debian/changelog
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=1849&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/changelog (original)
+++ packages/w3c-markup-validator/trunk/debian/changelog Wed Mar 16 11:38:48 2011
@@ -2,11 +2,13 @@
TODO: mod_perl incompatibility: confirm, forward upstream and try
turning off block in config
- - logo issues [check]
- consider permissions block #608225
* 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
-- Nicholas Bamber <nicholas at periapt.co.uk> Mon, 14 Mar 2011 10:30:01 +0000
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=1849&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/rules (original)
+++ packages/w3c-markup-validator/trunk/debian/rules Wed Mar 16 11:38:48 2011
@@ -1,18 +1,11 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
PACKAGE = $(shell dh_listpackages)
+TMP = ${CURDIR}/debian/${PACKAGE}/
CONFIG_DIR = etc/w3c
CGIBIN_DIR = usr/lib/cgi-bin/$(PACKAGE)
SHARED_DIR = usr/share/$(PACKAGE)
+HTML_DIR = usr/share/$(PACKAGE)/html
IMAGES_DIR = $(SHARED_DIR)/html/images
%:
@@ -23,18 +16,8 @@
dh_install httpd/cgi-bin/sendfeedback.pl ${CGIBIN_DIR}
dh_install htdocs/config/* ${CONFIG_DIR}
dh_install share/templates/en_US/* ${SHARED_DIR}/templates/en_US
- dh_install httpd/conf/httpd.conf ${CONFIG_DIR}
- dh_install htdocs/*.html ${SHARED_DIR}/html
- dh_install htdocs/*.css ${SHARED_DIR}/html
- dh_install htdocs/style/*.css ${SHARED_DIR}/html/style
- dh_install htdocs/dev/tests/* ${SHARED_DIR}/html/dev/tests
- dh_install htdocs/docs/* ${SHARED_DIR}/html/docs
- dh_install htdocs/source/* ${SHARED_DIR}/html/source
+ dh_install -Xconf -X.gz -Xtest htdocs/* ${HTML_DIR}
dh_install debian/logo.png ${IMAGES_DIR}
- dh_install htdocs/images/info_icons/*.* ${IMAGES_DIR}/info_icons
- dh_install htdocs/images/valid_icons/*.* ${IMAGES_DIR}/valid_icons
- dh_install htdocs/images/*.* ${IMAGES_DIR}/
- dh_install htdocs/scripts/*.js ${SHARED_DIR}/html/scripts
override_dh_installdocs:
mkdir -p debian/tmp
@@ -43,4 +26,20 @@
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:
+ 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 htdocs/scripts/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
Added: packages/w3c-markup-validator/trunk/debian/w3c-markup-validator.examples
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/w3c-markup-validator.examples?rev=1849&op=file
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/w3c-markup-validator.examples (added)
+++ packages/w3c-markup-validator/trunk/debian/w3c-markup-validator.examples Wed Mar 16 11:38:48 2011
@@ -1,0 +1,1 @@
+htdocs/dev/*
More information about the debian-xml-sgml-commit
mailing list