[xml/sgml-commit] r1758 - in /packages/w3c-markup-validator/trunk/debian: changelog control postinst prerm
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Thu Aug 19 22:39:57 UTC 2010
Author: periapt-guest
Date: Thu Aug 19 22:39:34 2010
New Revision: 1758
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1758
Log:
* 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 (Closes: #551185).
Modified:
packages/w3c-markup-validator/trunk/debian/changelog
packages/w3c-markup-validator/trunk/debian/control
packages/w3c-markup-validator/trunk/debian/postinst
packages/w3c-markup-validator/trunk/debian/prerm
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=1758&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/changelog (original)
+++ packages/w3c-markup-validator/trunk/debian/changelog Thu Aug 19 22:39:34 2010
@@ -1,8 +1,4 @@
w3c-markup-validator (1.1-1) UNRELEASED; urgency=low
-
- TODO:
- Old install scripts need to be reintegrated
- As many bugs as possible need to be closed
* New maintainer rebuilt package from first principles (Closes: #573497)
* Upgraded to upstream version 1.1 (Closes: #461021 and Closes: #437795)
@@ -17,6 +13,14 @@
* Restricting support to http. This is a holding operation for #445265.
* Reviewing 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 (Closes: #551185).
-- 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=1758&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/control (original)
+++ packages/w3c-markup-validator/trunk/debian/control Thu Aug 19 22:39:34 2010
@@ -14,7 +14,7 @@
Architecture: all
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, wwwconfig-common,
+ 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
Modified: packages/w3c-markup-validator/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/postinst?rev=1758&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/postinst (original)
+++ packages/w3c-markup-validator/trunk/debian/postinst Thu Aug 19 22:39:34 2010
@@ -4,8 +4,6 @@
# see: dh_installdeb(1)
set -e
-
-. /usr/share/debconf/confmodule
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
@@ -28,28 +26,44 @@
case "$1" in
configure|reconfigure)
- servers="apache2"
+ server="apache2"
- for server in $servers; do
- test -d /etc/$server/conf.d || continue
-
- if [ ! -s /etc/$server/conf.d/w3c-markup-validator.conf ]; then
- ln -s /etc/w3c/httpd.conf /etc/$server/conf.d/w3c-markup-validator.conf
+ # Old versions stored config files here
+ # We won't delete the old config file in case there are
+ # customizations. However we must delete the link pointing to it
+ # so that the upgrade can proceed.
+ for old in apache2 apache apache-ssl apache-perl; do
+ if [ -s /etc/$old/w3c-markup-validator.conf ]; then
+ rm /etc/$old/w3c-markup-validator.conf
+ fi
+ done
+
+ if [ ! -s /etc/$server/conf.d/w3c-markup-validator.conf ]; then
+ ln -s /etc/w3c/httpd.conf \
+ /etc/$server/conf.d/w3c-markup-validator.conf
fi
+ done
- if [ $server = "apache2" ]; then
+ if [ $server = "apache2" ]; then
+
+ if [ ! -s /etc/$server/conf.d/mods-enabled/include ]; then
a2enmod include
+ fi
+
+ if [ ! -s /etc/$server/conf.d/mods-enabled/rewrite ]; then
a2enmod rewrite
fi
done
- restart=$servers
- . /usr/share/wwwconfig-common/restart.sh
-
- if [ ! "$error" = "" ] ; then
- echo "$error"
+ if [ -x "/etc/init.d/$server" ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d $server stop || true
+ else
+ /etc/init.d/$server stop || true
+ fi
fi
+ sleep 2
;;
Modified: packages/w3c-markup-validator/trunk/debian/prerm
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/w3c-markup-validator/trunk/debian/prerm?rev=1758&op=diff
==============================================================================
--- packages/w3c-markup-validator/trunk/debian/prerm (original)
+++ packages/w3c-markup-validator/trunk/debian/prerm Thu Aug 19 22:39:34 2010
@@ -4,8 +4,6 @@
# see: dh_installdeb(1)
set -e
-
-. /usr/share/debconf/confmodule
# summary of how this script can be called:
# * <prerm> `remove'
@@ -24,23 +22,22 @@
;;
remove|deconfigure)
- servers="apache2"
+ server="apache2"
- for server in $servers; do
- test -d /etc/$server || continue
-
- if [ -s /etc/$server/conf.d/w3c-markup-validator.conf ]; then
- rm /etc/$server/conf.d/w3c-markup-validator.conf
+ if [ -s /etc/$server/conf.d/w3c-markup-validator.conf ]; then
+ rm /etc/$server/conf.d/w3c-markup-validator.conf
- fi
+ fi
done
- restart=$servers
- /usr/share/wwwconfig-common/restart.sh
-
- if [ ! "$error" = "" ] ; then
- echo "$error"
- fi
+ if [ -x "/etc/init.d/$server" ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d $server stop || true
+ else
+ /etc/init.d/$server stop || true
+ fi
+ fi
+ sleep 2
;;
failed-upgrade)
More information about the debian-xml-sgml-commit
mailing list