[SCM] grass branch, master, updated. upstream/6.4.1-72-gaf67862

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit af67862aba01d4fb97b25f5e441a88aba2e31757
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sun Feb 26 01:01:25 2012 +1300

    more programmers manual install updates

diff --git a/debian/grass-dev-doc.install b/debian/grass-dev-doc.install
index dc31101..db7a5e1 100644
--- a/debian/grass-dev-doc.install
+++ b/debian/grass-dev-doc.install
@@ -1,3 +1,13 @@
 programming-manual/db usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/g3d usr/share/doc/grass-dev-doc/programming-manual/html
 programming-manual/gis usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/gmath usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/gpde usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/gui usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/html usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/ogsf usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/proj usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/python usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/rfc usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/segment usr/share/doc/grass-dev-doc/programming-manual/html
 programming-manual/vector usr/share/doc/grass-dev-doc/programming-manual/html
diff --git a/debian/grass-dev-doc.links b/debian/grass-dev-doc.links
index 39b8f7a..0752159 100644
--- a/debian/grass-dev-doc.links
+++ b/debian/grass-dev-doc.links
@@ -1,3 +1,14 @@
 usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/db/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/g3d/html/jquery.js
 usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gis/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gmath/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gpde/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gui/wxpython/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/ogsf/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/proj/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/python/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/rfc/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/segment/html/jquery.js
 usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/vector/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/vector/dglib/html/jquery.js
diff --git a/debian/rules b/debian/rules
index 78adbed..9c5ca2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,6 +94,7 @@ build-stamp:
 build-indep: configure build-indep-stamp
 build-indep-stamp: 
 	dh_testdir
+	# generate the Programmers' manual (in HTML)
 	$(MAKE) htmldocs
 	touch $@
 
@@ -238,10 +239,10 @@ install-indep: build-indep
 		vector/dglib ; \
 	     do \
 		install -m 644 -d debian/tmp/programming-manual/$$CHAPTER/html/search ; \
-		-install -m 644 lib/$$CHAPTER/html/* \
+		install -m 644 lib/$$CHAPTER/html/* \
 			debian/tmp/programming-manual/$$CHAPTER/html ; \
 		rm -f debian/tmp/programming-manual/$$CHAPTER/html/jquery.js ; \
-		-install -m 644 lib/$$CHAPTER/html/search/* \
+		install -m 644 lib/$$CHAPTER/html/search/* \
 			debian/tmp/programming-manual/$$CHAPTER/html/search ; \
 	done
 	for CHAPTER in \
@@ -250,10 +251,10 @@ install-indep: build-indep
 		gui/wxpython ; \
 	     do \
 		install -m 644 -d debian/tmp/programming-manual/$$CHAPTER/html/search ; \
-		-install -m 644 $$CHAPTER/html/* \
+		install -m 644 $$CHAPTER/html/* \
 			debian/tmp/programming-manual/$$CHAPTER/html ; \
 		rm -f debian/tmp/programming-manual/$$CHAPTER/html/jquery.js ; \
-		-install -m 644 $$CHAPTER/html/search/* \
+		install -m 644 $$CHAPTER/html/search/* \
 			debian/tmp/programming-manual/$$CHAPTER/html/search ; \
 	done
 

-- 
Geographic Resources Analysis Support System