[DebianGIS-dev] r2945 - packages/grass/branches/tcl85/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-10-14 15:08:10 +0000 (Thu, 14 Oct 2010)
New Revision: 2945

Added:
   packages/grass/branches/tcl85/debian/grass.docs
Modified:
   packages/grass/branches/tcl85/debian/changelog
   packages/grass/branches/tcl85/debian/rules
Log:
Merging fix of #594492


Modified: packages/grass/branches/tcl85/debian/changelog
===================================================================
--- packages/grass/branches/tcl85/debian/changelog	2010-10-14 14:23:53 UTC (rev 2944)
+++ packages/grass/branches/tcl85/debian/changelog	2010-10-14 15:08:10 UTC (rev 2945)
@@ -8,6 +8,12 @@
   * Policy bumped to 3.9.1. No changes required.
   * Added libgdal1-dev dep to grass-dev list of dependencies.
     (closes: #598706)
+  * Merged from 6.4.0~rc6+42329-3:
+         Added missing docs used by GUIs: AUTHORS, contributors CSV files,
+         COPYING and a symlink to GPL-2 license in /usr/share/common-licenses.
+         Those files need to be symlinked in GISBASE to be found at run-time.
+         Thanks AlanB and Hamish for pointing the problem.
+         (closes: #594492)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 14 Oct 2010 16:08:06 +0200
 

Added: packages/grass/branches/tcl85/debian/grass.docs
===================================================================
--- packages/grass/branches/tcl85/debian/grass.docs	                        (rev 0)
+++ packages/grass/branches/tcl85/debian/grass.docs	2010-10-14 15:08:10 UTC (rev 2945)
@@ -0,0 +1,11 @@
+README
+AUTHORS
+COPYING
+SUBMITTING
+SUBMITTING_DOCS
+SUBMITTING_PYTHON
+SUBMITTING_SCRIPTS
+SUBMITTING_TCLTK
+contributors.csv
+contributors_extra.csv
+translators.csv

Modified: packages/grass/branches/tcl85/debian/rules
===================================================================
--- packages/grass/branches/tcl85/debian/rules	2010-10-14 14:23:53 UTC (rev 2944)
+++ packages/grass/branches/tcl85/debian/rules	2010-10-14 15:08:10 UTC (rev 2945)
@@ -218,6 +218,9 @@
 	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 \
+		    usr/share/common-licenses/GPL-2 usr/lib/$(BASE_NAME)/GPL.TXT
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a