[SCM] gmt branch, master, updated. upstream/4.5.5-19-gb14a5eb

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit b14a5eb20cc3533e2f40320a00df164d7adb91de
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 13 13:48:10 2012 +0100

    Fixed #619960

diff --git a/debian/README.Debian b/debian/README.Debian
index 7bb2f01..e5a04e2 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,19 +1,12 @@
 Generic Mapping Tools for Debian
 --------------------------------
 
-Note that only low-resolution coastline data are now available in the 
-Debian archive at this time, as a separate package gmt-coast-low. 
-That basic GSHHS coastline is required to have GMT up and running, 
-but you could be interested in downloading higher resolution 
-coastline data files
-
-	GSHHS_high.tar.bz2
-	GSHHS_full.tar.bz2
-
-from ftp://ibis.grdl.noaa.gov/pub/gmt. Untar them at a place you like.  
-Then you will need to edit /etc/gmt/coastline.conf and add the path to  
-the files ending with .cfg that you just extracted. Afterwards, GMT     
-should be fully functional also for high resolution outputs.            
+Note that all resolutions coastline data are available in the 
+Debian archive at this time, as separate packages named 
+gmt-gshhs-{low,high,full}.
+That basic (low) GSHHS coastline is required to have GMT up and running, 
+but you could be interested in using higher/full resolution 
+coastline data files, which are also available.
 
 NOTE: By default, the gmt utilities are not included in $PATH, so you 
 either need to add /usr/lib/gmt/bin to your PATH or use the GMT wrapper, 
@@ -23,6 +16,3 @@ see GMT(1gmt). Therefore, you also need to run do_examples.sh as
 
 if you would use gmt-examples to recreate GMT examples.
 
- -- Torsten Landschoff <torsten at debian.org>  Fri, 26 May 2006 22:56:49 +0200
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 14 Jun 2008 11:48:20 +0200
-
diff --git a/debian/changelog b/debian/changelog
index ca46b5a..b7bde0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 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
@@ -12,8 +13,12 @@ gmt (4.5.7-1) unstable; urgency=low
   * Splitted 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.
+  * Fixed some symlinks.
+    (closes: #343383)
+  * Added a patch kfreebsd to allow working with GNU/kFreeBSD.
+    (closes: #619960)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Mar 2012 12:02:41 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Mar 2012 13:47:12 +0100
 
 gmt (4.5.6-1) unstable; urgency=low
 
diff --git a/debian/patches/kfreebsd b/debian/patches/kfreebsd
new file mode 100644
index 0000000..e84b755
--- /dev/null
+++ b/debian/patches/kfreebsd
@@ -0,0 +1,13 @@
+Index: git/configure
+===================================================================
+--- git.orig/configure	2012-03-07 10:02:52.000000000 +0100
++++ git/configure	2012-03-13 13:46:50.000000000 +0100
+@@ -11390,7 +11390,7 @@
+ 		else				# Solaris
+ 			LD_OPT="-G"
+ 		fi
+-	elif test "$os" = "Linux" ; then	# Need optimization when doing shared
++	elif test "$os" = "Linux" || test "$os" = "GNU/kFreeBSD"; then	# Need optimization when doing shared
+ 		LD='$(CC)'
+ 		SL_VERSION=$SL.$LIB_MAJOR_VERSION
+ 		LD_OPT='-shared -Wl,-soname=$*.'$SL_VERSION
diff --git a/debian/patches/series b/debian/patches/series
index 6b781bc..51cb808 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 # no current patches
+kfreebsd

-- 
Generic Mapping Tools