[SCM] grass branch, master, updated. upstream/6.4.1-62-gcd842ed

[M. Hamish Bowman]

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

    use system's copy of jquery.js

diff --git a/debian/control b/debian/control
index 6a95a63..6f7a722 100644
--- a/debian/control
+++ b/debian/control
@@ -136,7 +136,7 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Suggests: grass
 Description: GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
diff --git a/debian/grass-dev-doc.links b/debian/grass-dev-doc.links
new file mode 100644
index 0000000..39b8f7a
--- /dev/null
+++ b/debian/grass-dev-doc.links
@@ -0,0 +1,3 @@
+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/gis/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/vector/html/jquery.js
diff --git a/debian/rules b/debian/rules
index 567e37d..4ddf4a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,6 +141,10 @@ 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

-- 
Geographic Resources Analysis Support System