[SCM] grass branch, master, updated. upstream/6.4.0-7-gb56179c

Francesco Paolo Lovergine frankie at debian.org
Wed Feb 16 16:59:16 UTC 2011


The following commit has been merged in the master branch:
commit b56179c16f2f79968a0ac8d8bce5698c8d254221
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Feb 16 17:04:59 2011 +0100

    Better comments in changelog for merging sid+exp.

diff --git a/debian/changelog b/debian/changelog
index 692dd0d..aa27c7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,34 @@
 grass (6.4.0-2) unstable; urgency=low
 
-  * Merged from 6.4.0-1 in experimental.
-    (closes: #594492)
+  * Ready for unstable.
   * Removed pre-release patches inserted in the squeeze latest upload.
-  * New upstream final release 6.4.0.
-  * Note that now default interface is the wx one, so (wx)python related suggestions
-    have been promoted to proper dependencies. For the same reason I would
-    consider cut/paste problems of the past Tk interface obsolete.
-    (closes: #305249)
-  * 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-1 in experimental:
+      - 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)
+      - New upstream final release 6.4.0.
+      - Note that now default interface is the wx one, so (wx)python related suggestions
+        have been promoted to proper dependencies. For the same reason I would
+        consider cut/paste problems of the past Tk interface obsolete.
+        (closes: #305249)
+      - 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:
-  * Now builds against Tcl/Tk >= 8.5.
-    (closes: #582595)
-  * Removed obsolete grass-doc conflicts/replaces.
+      - Now builds against Tcl/Tk >= 8.5.
+        (closes: #582595)
+      - Removed obsolete grass-doc conflicts/replaces.
+
   * Moved to source format 3.0 and quilt patch support.
   * Moved from svn to git and updated Vcs-* fields in debian/control* as due.
   * Merged experimental changelogs.
   * Now saves and restores upstream config.{sub|guess} to avoid annoying warnings.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 16 Feb 2011 16:34:50 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 16 Feb 2011 17:04:43 +0100
 
 grass (6.4.0-1) experimental; urgency=low
 

-- 
Geographic Resources Analysis Support System



More information about the Pkg-grass-devel mailing list