[SCM] gmt branch, master, updated. upstream/4.5.5-33-g22e8a31

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit c90a8590caa089d2967f3f7b355320c4f900d6a1
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Mar 16 14:15:26 2012 +0100

    Fixed conflicts between gmt-doc and old gmt.

diff --git a/debian/changelog b/debian/changelog
index f8aa7fd..2ba810a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gmt (4.5.7-2) unstable; urgency=low
+
+  * A link moved from gmt to gmt-doc, so conflicting current gmt-doc with
+    old gmt.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 16 Mar 2012 14:14:25 +0100
+
 gmt (4.5.7-1) unstable; urgency=low
 
   * New upstream version with a new compact distribution.
diff --git a/debian/control b/debian/control
index 57e95e6..8a3d872 100644
--- a/debian/control
+++ b/debian/control
@@ -92,6 +92,7 @@ Package: gmt-doc
 Architecture: all
 Section: doc
 Suggests: www-browser
+Conflicts: gmt (<< 4.5.7-1~)
 Description: HTML documentation for GMT, the Generic Mapping Tools
  GMT is a collection of UNIX tools that allow users to manipulate
  (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,

-- 
Generic Mapping Tools