[netcdf-fortran] 03/08: Refresh patches & drop patch applied upstream

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository netcdf-fortran.

commit d85eb6d2bd22c5575fa50f4605c99f7ab74583c2
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Fri Feb 13 23:02:40 2015 +0100

    Refresh patches & drop patch applied upstream
---
 debian/patches/hyphen-used-as-minus-sign.patch | 20 --------------------
 debian/patches/privacy-breach-logo.patch       |  4 ++--
 debian/patches/series                          |  1 -
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/patches/hyphen-used-as-minus-sign.patch b/debian/patches/hyphen-used-as-minus-sign.patch
deleted file mode 100644
index 00ff57b..0000000
--- a/debian/patches/hyphen-used-as-minus-sign.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix hyphen-used-as-minus-sign lintian issue by escaping minus signs.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: https://github.com/Unidata/netcdf-fortran/pull/24
-Applied-Upstream: https://github.com/Unidata/netcdf-fortran/commit/e466e1aea95040f825d1f54f60f7ec644d16b732
-
---- a/docs/netcdf_fortran.3
-+++ b/docs/netcdf_fortran.3
-@@ -11,10 +11,10 @@ netcdf \- Unidata's Network Common Data
- include netcdf.inc
- .sp
- .SS Most Systems:
--f77 ...  -lnetcdf -lhdf5_hl -lhdf5 -lz -lm
-+f77 ...  \-lnetcdf \-lhdf5_hl \-lhdf5 \-lz \-lm
- .sp
- .SS CRAY PVP Systems:
--f90 -dp -i64 ... -lnetcdf
-+f90 \-dp \-i64 ... \-lnetcdf
- 
- .ad
- .hy
diff --git a/debian/patches/privacy-breach-logo.patch b/debian/patches/privacy-breach-logo.patch
index b6382c0..8a855b7 100644
--- a/debian/patches/privacy-breach-logo.patch
+++ b/debian/patches/privacy-breach-logo.patch
@@ -1,8 +1,8 @@
 Description: Use local logo image to fix privacy-breach-logo lintian error.
 Author: Bas Couwenberg <sebastic at xs4all.nl>
 
---- a/docs/footer.html
-+++ b/docs/footer.html
+--- netcdf-fortran.orig/docs/footer.html
++++ netcdf-fortran/docs/footer.html
 @@ -4,7 +4,7 @@
  <hr size="2"/>
  <address style="text-align: center;">
diff --git a/debian/patches/series b/debian/patches/series
index e736aaa..91d163f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 privacy-breach-logo.patch
-hyphen-used-as-minus-sign.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf-fortran.git