[SCM] grass branch, master, updated. upstream/6.4.1-56-ge2e4ceb

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit e2e4ceb9ce968f64a1f62adbb27440f5222baa5b
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Feb 25 17:46:57 2012 +1300

    reflect changed pkg name in rules, ignore a hybrid tcl script warning

diff --git a/debian/TODO b/debian/TODO
index 25d7a65..8b38309 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -14,7 +14,6 @@ E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/.../*.pyc
 
 
 Lintian:
-E: grass-gui: shell-script-fails-syntax-check usr/lib/grass64/etc/gm/animate.tcl
 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
diff --git a/debian/rules b/debian/rules
index f5aab1a..12e74bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -276,8 +276,8 @@ binary-arch: install
 	dh_installmenu -a
 	dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
 	dh_link -a
-	dh_link usr/share/doc/grass/AUTHORS usr/lib/$(BASE_NAME)/AUTHORS \
-		    usr/share/doc/grass/COPYING usr/lib/$(BASE_NAME)/COPYING \
+	dh_link usr/share/doc/grass-core/AUTHORS usr/lib/$(BASE_NAME)/AUTHORS \
+		    usr/share/doc/grass-core/COPYING usr/lib/$(BASE_NAME)/COPYING \
 		    usr/share/common-licenses/GPL-2 usr/lib/$(BASE_NAME)/GPL.TXT
 	dh_pysupport -p$(PKG_NAME) /usr/lib/grass64/etc
 	dh_strip -a

-- 
Geographic Resources Analysis Support System