[SCM] grass branch, master, updated. upstream/6.4.1-116-g73d6803

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 73d6803711429f66e48f2c760f6a0ba098e36a94
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Mon Jul 29 16:34:03 2013 +1200

    escape minus signs which are command line options (not hyphens) to make lintian happy

diff --git a/debian/rules b/debian/rules
index 965f021..7e4f5e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -187,7 +187,18 @@ install: build
 	for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; do \
 		n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/$(BASE_NAME)/man/man1/$$n.1grass; done
 	for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \
-		sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done
+		sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' "$$m"; done
+
+	# escape minus signs which are command line options not hyphens
+	for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \
+		sed -i -e 's/\([ ([]\)-\([a-z]\)/\1\\-\2/g' \
+			-e 's/\([ []\)--\([a-z]\)/\1\\-\\-\2/g' \
+			-e 's/\[-\\fB/[\\-\\fB/' \
+			-e 's/\[--\\fB/[\\-\\-\\fB/g' \
+			-e 's/"\\fB-\([a-zA-Z0-9]\)/"\\fB\\-\1/' \
+			-e 's/"\\fB--\([a-zA-Z0-9]\)/"\\fB\\-\\-\1/' \
+			-e 's/\\fI-\([a-zA-Z0-9]\)/\\fI\-\1/g' \
+			"$$m"; done
 
 	# adjust from build-server build dir to end-user's install dir
 	sed -i -e "s+^\(GRASS_HOME[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+" \

-- 
Geographic Resources Analysis Support System