[pkg-lighttpd] r551 - lighttpd/trunk/debian

Mon Jul 4 15:49:59 UTC 2011

Author: atoell-guest
Date: 2011-07-04 15:49:59 +0000 (Mon, 04 Jul 2011)
New Revision: 551

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/control
   lighttpd/trunk/debian/lighttpd.postinst
   lighttpd/trunk/debian/lighttpd.postrm
   lighttpd/trunk/debian/lighttpd.preinst
Log:
set -e in maintainer scripts (?\194?\167 10.4), rework synopsis line (dev-ref 6.2.2) and fix stylistic issues in debian/control

Modified: lighttpd/trunk/debian/changelog
===================================================================

--- lighttpd/trunk/debian/changelog	2011-07-04 14:46:53 UTC (rev 550)
+++ lighttpd/trunk/debian/changelog	2011-07-04 15:49:59 UTC (rev 551)
@@ -8,9 +8,10 @@
     + patches/ssl-fix.patch - applied upstream
   * Add `debian/source/options' to make dpkg-source ignore glitches done by
     upstream's Makefile in `src/mod_ssi_exprparser.c' and `src/configparser.c'
+  * Run maintainer scripts with `set -e'
 
 
- -- Arno Töll <debian at toell.net>  Mon, 04 Jul 2011 15:11:01 +0200
+ -- Arno Töll <debian at toell.net>  Mon, 04 Jul 2011 17:30:11 +0200
 
 lighttpd (1.4.28-5) unstable; urgency=low
 

Modified: lighttpd/trunk/debian/control
===================================================================
--- lighttpd/trunk/debian/control	2011-07-04 14:46:53 UTC (rev 550)
+++ lighttpd/trunk/debian/control	2011-07-04 15:49:59 UTC (rev 551)
@@ -2,7 +2,7 @@
 Section: httpd
 Priority: optional
 Maintainer: Debian lighttpd maintainers <pkg-lighttpd-maintainers at lists.alioth.debian.org>
-Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>, 
+Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
  Olaf van der Spek <olafvdspek at gmail.com>,
  Arno Töll <debian at toell.net>
 Homepage: http://lighttpd.net/
@@ -17,11 +17,12 @@
 
 Package: lighttpd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, lsb-base (>= 3.2-14), mime-support, libterm-readline-perl-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
+ lsb-base (>= 3.2-14), mime-support, libterm-readline-perl-perl
 Provides: httpd, httpd-cgi
 Suggests: openssl, rrdtool, apache2-utils
 Recommends: spawn-fcgi
-Description:  Fast webserver with minimal memory footprint
+Description: fast webserver with minimal memory footprint
  lighttpd is a small webserver and fast webserver developed with
  security in mind and a lot of features.
  It has support for
@@ -38,7 +39,7 @@
 Section: doc
 Depends: ${misc:Depends}
 Suggests: lighttpd
-Description: Documentation for lighttpd
+Description: documentation for lighttpd
  This package contains all documentation files for lighttpd.
 
 Package: lighttpd-mod-mysql-vhost
@@ -55,7 +56,7 @@
 Depends: lighttpd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: lighttpd (<< 1.4.10-5)
 Recommends: memcached
-Description: Anti-deep-linking module for lighttpd
+Description: anti-deep-linking module for lighttpd
  The trigger-b4-dl module for lighttpd can prevent deep linking
  from other sites by requiring users to visit a trigger URL to
  be able to download certain files.
@@ -64,28 +65,28 @@
 Architecture: any
 Depends: lighttpd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: memcached
-Description: Cache meta language module for lighttpd
+Description: cache meta language module for lighttpd
  With the cache meta language, it is possible to describe to the
- dependencies of a cached file to its source files/scripts. For the 
+ dependencies of a cached file to its source files/scripts. For the
  cache files, the scripting language LUA is used.
  .
- THIS MODULE IS OBSOLETED AND WILL BE REMOVED IN LIGHTTPD 1.5.
+ THIS MODULE IS OBSOLETED AND WILL BE REMOVED IN LIGHTTPD 2.0.
  USE mod_magnet INSTEAD.
 
 Package: lighttpd-mod-magnet
 Architecture: any
 Depends: lighttpd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Control the request handling module for lighttpd
+Description: control the request handling module for lighttpd
  mod_magnet can attract a request in several stages in the request-handling.
  either at the same level as mod_rewrite, before any parsing of the URL is done
- or at a later stage, when the doc-root is known and the physical-path is 
+ or at a later stage, when the doc-root is known and the physical-path is
  already setup
 
 Package: lighttpd-mod-webdav
 Architecture: any
 Depends: lighttpd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: WebDAV module for lighttpd
- The WebDAV module is a very minimalistic implementation of RFC 2518. 
+ The WebDAV module is a very minimalistic implementation of RFC 2518.
  Minimalistic means that not all operations are implemented yet.
  .
  Currently supports:

Modified: lighttpd/trunk/debian/lighttpd.postinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.postinst	2011-07-04 14:46:53 UTC (rev 550)
+++ lighttpd/trunk/debian/lighttpd.postinst	2011-07-04 15:49:59 UTC (rev 551)
@@ -1,6 +1,8 @@
 #! /bin/sh -e
 # postinst script for lighttpd
 
+set -e
+
 if [ "$1" = "configure" ]; then
    	if [ ! -r /var/www/index.lighttpd.html ];
    	then
@@ -8,9 +10,11 @@
 	fi
 fi
 
-start_failed() 
+# dh_installinit will call this function upon failure of rc.d invocation
+# Fixes: #383425
+start_failed()
 {
-	echo "Failed to start Lighttpd. Is another webserver running already?"
+	echo "Failed to start Lighttpd. Maybe another webserver is already listening on port 80?"
 	exit 0
 }
 

Modified: lighttpd/trunk/debian/lighttpd.postrm
===================================================================
--- lighttpd/trunk/debian/lighttpd.postrm	2011-07-04 14:46:53 UTC (rev 550)
+++ lighttpd/trunk/debian/lighttpd.postrm	2011-07-04 15:49:59 UTC (rev 551)
@@ -1,6 +1,8 @@
 #!/bin/sh -e
 # postrm script for lighttpd
 
+set -e
+
 if [ "$1" = "purge" ]; then
     rm -rf /var/log/lighttpd /var/run/lighttpd /var/cache/lighttpd
 fi

Modified: lighttpd/trunk/debian/lighttpd.preinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.preinst	2011-07-04 14:46:53 UTC (rev 550)
+++ lighttpd/trunk/debian/lighttpd.preinst	2011-07-04 15:49:59 UTC (rev 551)
@@ -19,9 +19,9 @@
 
 	upgrade)
 
-	if [ "x$2" != "x" ]; then	
+	if [ "x$2" != "x" ]; then
 		# We upgrade from Squeeze or older, remove alternative as spawn-fcgi is not provided anymore.
-		# This should have been done since 1.4.26-1 but was accidentally forgotten		
+		# This should have been done since 1.4.26-1 but was accidentally forgotten
 		if dpkg --compare-versions "$2" lt 1.4.28-4
 		then
 			update-alternatives --remove spawn-fcgi /usr/bin/spawn-fcgi.lighttpd || true
@@ -33,7 +33,7 @@
 
 	abort-upgrade)
 	;;
-	
+
 	*)
 	echo "preinst called with unknown argument \`$1'" >&2
 	exit 1


