[SCM] grass branch, master, updated. upstream/6.4.1-67-ge0a0a33

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 7de55098972dbb218a1671add2933aa3f50f5d4a
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Feb 25 22:20:12 2012 +1300

    move jquery.js cleaning to more appropriate place

diff --git a/debian/rules b/debian/rules
index 4ddf4a3..257e6f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,10 +141,6 @@ endif
 		lib/vector/latex \
 		rfc/html \
 		rfc/latex
-	# 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: build
 	dh_testdir
@@ -229,6 +225,10 @@ 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 \

-- 
Geographic Resources Analysis Support System