[SCM] gmt branch, master, updated. upstream/4.5.5-21-gac0eb00

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit ac0eb00efe76434ecec7e42b9914c4095676e84c
Author: Francesco Paolo Lovergine 
Date:   Tue Mar 13 14:25:42 2012 +0100

Fixed #581103

diff --git a/debian/changelog b/debian/changelog
index b7bde0f..f8aa7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,10 @@ gmt (4.5.7-1) unstable; urgency=low
 (closes: #343383)
   * Added a patch kfreebsd to allow working with GNU/kFreeBSD.
 (closes: #619960)
+  * Fixed bashism in psbbox.sh with patch bashism.
+(closes: #581103)
 
- -- Francesco Paolo Lovergine   Tue, 13 Mar 2012 13:47:12 
+0100
+ -- Francesco Paolo Lovergine   Tue, 13 Mar 2012 14:24:33 
+0100
 
 gmt (4.5.6-1) unstable; urgency=low
 
diff --git a/debian/patches/bashism b/debian/patches/bashism
new file mode 100644
index 000..f3a2b1c
--- /dev/null
+++ b/debian/patches/bashism
@@ -0,0 +1,13 @@
+Index: git/src/psbbox.sh
+===
+--- git.orig/src/psbbox.sh 2012-03-07 10:02:54.0 +0100
 git/src/psbbox.sh  2012-03-13 14:22:45.0 +0100
+@@ -25,7 +25,7 @@
+ for file in $*
+ do
+bbox=`gs -q -dNOPAUSE -dBATCH -r720 -sDEVICE=bbox $file 2>&1 | grep 
'%%BoundingBox'`
+-   if [ $? == 0 ] ; then
++   if [ $? -eq 0 ] ; then
+   tmpfile=`mktemp /tmp/psbbox.XX`
+   cp -f $file $tmpfile
+   sed 's/%%BoundingBox: .*$/'"$bbox/" $tmpfile > $file
diff --git a/debian/patches/series b/debian/patches/series
index 51cb808..86009cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 # no current patches
 kfreebsd
+bashism

-- 
Generic Mapping Tools

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] gmt branch, master, updated. upstream/4.5.5-21-gac0eb00

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 7ee004bdc0dfaf8b00bd61dd8ddeae5ed7571809
Author: Francesco Paolo Lovergine 
Date:   Tue Mar 13 14:10:32 2012 +0100

Added a brief note about triangle.* dropping.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..f8de466
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,11 @@
+GMT for Debian
+--
+
+This package drops the optional non-free well-known triangle.* source for
+triangularization in both the orig tarball and Debian source.
+
+Just remember to do the same at every new upstream release, at least
+until Paul and others still will distribute it.
+
+ -- Francesco Paolo Lovergine   Tue, 13 Mar 2012 13:47:12 
+0100
+

-- 
Generic Mapping Tools

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel