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

Francesco Paolo Lovergine frankie at debian.org
Wed Jun 26 09:17:57 UTC 2013


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

    Merge branch 'fix'
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 5228c05,2ba810a..157d76e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,25 +1,42 @@@
 +gmt (4.5.7-2~exp1) experimental; urgency=low
 +
 +  * Added Octave support and an ad-hoc new package for that.
 +  * Added octave-gmt package for supporting grid files in GNU octave.
 +  * Revised build-deps.
 +  * Debhelper level set to 9.
 +  * Lintian-based cleanups:
-     - Fixed debian/changelog for a couple of silly warnings.
-     - Added ${misc:Depends} to all pkgs.
++      - Fixed debian/changelog for a couple of silly warnings.
++      - Added ${misc:Depends} to all pkgs.
 +  * Revised for Suggestions.
 +  * Fixed previous changelog for layout and contents.
 +
-  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 16 Mar 2012 11:38:26 +0100
++ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 16 Mar 2012 14:33:15 +0100
++
+ 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.
      (closes: #663099)
    * Policy bumped to 3.9.3, no changes required.
 -  * Now use in embedded mode quilt and all tar/unpack/patch target have been dropped.
 -  * Get-orig-source and all other special target dropped due to semplification
 +  * Now use in embedded mode quilt and all tar/unpack/patch target have been 
 +    dropped.
 +  * Get-orig-source and all other special target dropped due to simplification
      of the distribution.
    * Added a build-dep on autotools-dev and provided usual snippets to override
      config.{sub,guess} files before configuring.
    * Moved to copyright format version 1.0. Note that in 4.5.6 GMT team added
      compatibility with any later version for GPL-2.
 -  * Splitted links helper in different files for each package to avoid 
 +  * Split links helper in different files for each package to avoid 
      unresolved links.
 -  * This package requires GSHHS >= 2.2, as provided by a new separate package.
 +  * This package is compatible with GSHHS >= 2.2, as provided by a new separate 
 +    package. Note that upstream no more distributes old datasets, so any 
 +    previous package cannot use anymore high/full resolutions.
    * Fixed some symlinks.
      (closes: #343383)
    * Added a patch kfreebsd to allow working with GNU/kFreeBSD.
@@@ -37,7 -27,7 +44,7 @@@
    * Fixed bashism in psbbox.sh with patch bashism.
      (closes: #581103)
  
 - -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Mar 2012 14:24:33 +0100
 + -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Mar 2012 16:40:33 +0100
  
  gmt (4.5.6-1) unstable; urgency=low
  
diff --combined debian/control
index e0c42b2,8a3d872..83f81b7
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,8 +3,9 @@@ Section: scienc
  Priority: extra
  Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
  Uploaders: Torsten Landschoff <torsten at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
 -Build-Depends: libnetcdf-dev, debhelper (>= 8), bzip2, libxmu-headers, libxaw7-dev, autotools-dev
 -Build-Depends-Indep: debhelper (>= 8), quilt, bzip2
 +Build-Depends: libnetcdf-dev, debhelper (>= 8), bzip2, libxmu-headers,
 + libxaw7-dev, autotools-dev, octave-pkg-dev (>= 1.0.0)
 +Build-Depends-Indep: debhelper (>= 9)
  Standards-Version: 3.9.3
  Homepage: http://gmt.soest.hawaii.edu/
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/gmt.git
@@@ -61,7 -60,6 +61,7 @@@ Package: gmt-doc-pd
  Architecture: all
  Section: doc
  Suggests: pdf-viewer
 +Depends: ${misc:Depends}
  Description: PDF docs for GMT, the Generic Mapping Tools
   GMT is a collection of tools that allow users to manipulate
   (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@@ -78,7 -76,6 +78,7 @@@ Package: gmt-tutorial-pd
  Architecture: all
  Section: doc
  Suggests: pdf-viewer
 +Depends: ${misc:Depends}
  Description: Tutorial for GMT, the Generic Mapping Tools (PDF)
   GMT is a collection of tools that allow users to manipulate
   (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@@ -95,7 -92,7 +95,8 @@@ Package: gmt-do
  Architecture: all
  Section: doc
  Suggests: www-browser
 +Depends: ${misc:Depends}
+ 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,
@@@ -117,7 -114,6 +118,7 @@@ Package: gmt-example
  Architecture: all
  Section: doc
  Suggests: gmt
 +Depends: ${misc:Depends}
  Description: Example scripts illustrating the use of GMT
   GMT is a collection of tools that allow users to manipulate
   (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@@ -129,19 -125,3 +130,19 @@@
   GMT supports many common map projections plus linear, log, and power scaling,
   and comes with support data such as coastlines, rivers, and political
   boundaries. 
 +
 +Package: octave-gmt
 +Architecture: any
 +Section: math
 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${octave:Depends}
 +Suggests: gmt
 +Description: Support of GMT grid files for Octave
 + GMT is a collection of tools that allow users to manipulate
 + (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
 + projecting, etc.) and produce Encapsulated PostScript File (EPS) illustrations
 + ranging from simple x-y plots through contour maps to artificially illuminated
 + surfaces and 3-D perspective views in black and white, gray tone, hachure
 + patterns, and 24-bit color. 
 + .
 + This package provides an interface for GNU Octave to query and read/write 
 + GMT grid files.

-- 
Generic Mapping Tools



More information about the Pkg-grass-devel mailing list