[SCM] routino branch, master, updated. c0f4168522465fed6013782e82d2fd86e4b1d06e

[Uwe Steinmann]

The following commit has been merged in the master branch:
commit 58c4a38ed7cdd9023870fed915bd1d869643df93
Author: Uwe Steinmann <steinm at debian.org>
Date:   Fri Nov 18 17:35:12 2011 +0100

    - fixed lintian warnings and errors

diff --git a/debian/README.Debian b/debian/README.Debian
index 71c2ffc..c6cf81d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,13 +4,13 @@ routino for Debian
 routino is a set of applications for finding a route based on topographical
 information from OpenStreetMap and creating the underlying database files.
 The router application itself has been renamed from 'router' to
-'routino-router'. The other programms (planetsplitter, filedumpeŗ and
+'routino-router'. The other programs (planetsplitter, filedumpeŗ and
 tagmodifier) has remained its name.
 
 routino has been split into two packages:
 
 routino:
-  containing the command line programms
+  containing the command line programs
 routino-www:
   containing the web interface
 
diff --git a/debian/copyright b/debian/copyright
index 0cb7f48..bc489a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ It was downloaded from:
 
     <http://www.routino.org/download/>
 
-Upstream Author(s):
+Upstream Author:
 
     Andrew M. Bishop  <amb at gedanken.demon.co.uk>
 
diff --git a/debian/routino-www.postinst b/debian/routino-www.postinst
index 3eda835..a2e9ef0 100644
--- a/debian/routino-www.postinst
+++ b/debian/routino-www.postinst
@@ -1,6 +1,7 @@
 #! /bin/sh
 # postinst script for routino-www
 #
+set -e
 
 if [ "$DPKG_DEBUG" = "developer" ]; then
 	set -x
@@ -14,7 +15,7 @@ case "$1" in
 		if [ ! -d "/var/lib/routino/results" ] ; then
 			mkdir -p /var/lib/routino/results
 		fi
-		chown -R www-data.www-data /var/lib/routino/results
+		chown -R www-data:www-data /var/lib/routino/results
 
 	;;
 
diff --git a/debian/routino-www.postrm b/debian/routino-www.postrm
index 73e94f7..9b279b6 100644
--- a/debian/routino-www.postrm
+++ b/debian/routino-www.postrm
@@ -1,6 +1,7 @@
 #! /bin/sh
 # postrm script for routino-www
 #
+set -e
 
 if [ "$DPKG_DEBUG" = "developer" ]; then
   set -x
diff --git a/debian/rules b/debian/rules
index 62736a3..cdaebc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,5 +17,5 @@ override_dh_auto_install:
 	install -d $(CURDIR)/debian/tmp/usr/share/routino/www
 	cp -r web/www/routino/* $(CURDIR)/debian/tmp/usr/share/routino/www
 	install -d $(CURDIR)/debian/tmp/etc/apache2/conf.d/
-	install debian/apache.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d/routino.conf
+	install -m 644 debian/apache.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d/routino.conf
 

-- 
Packaging for routino