[SCM] grass branch, master, updated. upstream/6.4.1-70-g0468652

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 046865238cf4c300b427a60c356455d74a5d003f
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Feb 25 23:40:19 2012 +1300

    install full programmers' manual

diff --git a/debian/TODO b/debian/TODO
index 8b38309..40456c2 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -16,9 +16,6 @@ E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/.../*.pyc
 Lintian:
 W: grass-dev: copyright-without-copyright-notice
 W: grass-dev-doc: copyright-without-copyright-notice
-W: grass-dev-doc: embedded-javascript-library usr/share/doc/grass-dev-doc/programming-manual/html/db/html/jquery.js
-W: grass-dev-doc: embedded-javascript-library usr/share/doc/grass-dev-doc/programming-manual/html/gis/html/jquery.js
-W: grass-dev-doc: embedded-javascript-library usr/share/doc/grass-dev-doc/programming-manual/html/vector/html/jquery.js
 W: grass-core: copyright-without-copyright-notice
 W: grass-doc: copyright-without-copyright-notice
 W: grass: copyright-without-copyright-notice
diff --git a/debian/rules b/debian/rules
index 257e6f9..4d19a53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,26 +121,24 @@ endif
 	rm -f error.log
 	# clean doxygen documentation (programming man)
 	rm -rf doxygenhtml \
-		lib/db/html \
-		lib/db/latex \
-		lib/g3d/html \
-		lib/g3d/latex \
-		lib/gis/html \
-		lib/gis/latex \
-		lib/gmath/html \
-		lib/gmath/latex \
-		lib/ogsf/html \
-		lib/ogsf/latex \
-		lib/proj/html \
-		lib/proj/latex \
-		lib/segment/html \
-		lib/segment/latex \
-		lib/vector/dglib/html \
-		lib/vector/dglib/latex \
-		lib/vector/html \
-		lib/vector/latex \
-		rfc/html \
-		rfc/latex
+		html latex \
+		rfc/html rfc/latex \
+		gui/wxpython/html gui/wxpython/latex
+	for LIBRARY in 
+		db \
+		g3d \
+		gis \
+		gmath \
+		gpde \
+		ogsf \
+		proj \
+		python \
+		segment \
+		vector \
+		vector/dglib ; \
+	    do \
+		rm -rf lib/$$LIBRARY/html lib/$$LIBRARY/latex ; \
+	done
 
 install: build
 	dh_testdir
@@ -225,21 +223,39 @@ install: build
 install-indep: build-indep
 	dh_testdir -i
 	dh_testroot -i
-	# jquery.js provided by a symlink to the libjs-jquery package
-	rm -f debian/tmp/programming-manual/html/db/html/jquery.js
-	rm -f debian/tmp/programming-manual/html/vector/html/jquery.js
-	rm -f debian/tmp/programming-manual/html/gis/html/jquery.js
 	install -m 644  -d debian/tmp
-	install -m 644  -d debian/tmp/programming-manual/vector/html/search \
-			   debian/tmp/programming-manual/db/html/search \
-			   debian/tmp/programming-manual/gis/html/search 
-			   
-	-install -m 644 lib/vector/html/* debian/tmp/programming-manual/vector/html
-	-install -m 644 lib/vector/html/search/* debian/tmp/programming-manual/vector/html/search
-	-install -m 644 lib/db/html/* debian/tmp/programming-manual/db/html
-	-install -m 644 lib/db/html/search/* debian/tmp/programming-manual/db/html/search
-	-install -m 644 lib/gis/html/* debian/tmp/programming-manual/gis/html
-	-install -m 644 lib/gis/html/search/* debian/tmp/programming-manual/gis/html/search
+	for CHAPTER in \
+		db \
+		g3d \
+		gis \
+		gmath \
+		gpde \
+		ogsf \
+		proj \
+		python \
+		segment \
+		vector \
+		vector/dglib ; \
+	     do \
+		install -m 644 -d debian/tmp/programming-manual/$$CHAPTER/html/search ; \
+		-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/* \
+			debian/tmp/programming-manual/$$CHAPTER/html/search ; \
+	done
+	for CHAPTER in \
+		. \
+		rfc \
+		gui/wxpython ; \
+	     do \
+		install -m 644 -d debian/tmp/programming-manual/$$CHAPTER/html/search ; \
+		-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/* \
+			debian/tmp/programming-manual/$$CHAPTER/html/search ; \
+	done
 
 # Build architecture-independent files here.
 binary-indep: install install-indep 

-- 
Geographic Resources Analysis Support System