[proj] 08/18: Refresh patches.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch experimental
in repository proj.

commit 648f22d1275d1e9b1824044c9de0523f0dbe7cce
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 3 17:34:04 2014 +0200

    Refresh patches.
---
 debian/patches/hyphen-used-as-minus-sign.patch | 2 +-
 debian/patches/nad2bin-data.patch              | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/patches/hyphen-used-as-minus-sign.patch b/debian/patches/hyphen-used-as-minus-sign.patch
index 6b11f6e..287e840 100644
--- a/debian/patches/hyphen-used-as-minus-sign.patch
+++ b/debian/patches/hyphen-used-as-minus-sign.patch
@@ -2,7 +2,7 @@ Description: Fix hyphen-used-as-minus-sign lintian issues by escaping minus.
 Author: Bas Couwenberg <sebastic at xs4all.nl>
 --- a/man/man1/cs2cs.1
 +++ b/man/man1/cs2cs.1
-@@ -169,9 +169,9 @@ with trailing, zero-valued minute-second
+@@ -169,9 +169,9 @@ projected (cartesian) coordinates will b
  The following script
  .RS 5
   \f(CWcs2cs +proj=latlong +datum=NAD83 
diff --git a/debian/patches/nad2bin-data.patch b/debian/patches/nad2bin-data.patch
index 9cad589..d8ef443 100644
--- a/debian/patches/nad2bin-data.patch
+++ b/debian/patches/nad2bin-data.patch
@@ -5,14 +5,13 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Bug-Debian: https://bugs.debian.org/747862
 --- a/nad/Makefile.am
 +++ b/nad/Makefile.am
-@@ -32,10 +32,10 @@ process-nad2bin:
- 	fi 
+@@ -32,9 +32,9 @@ process-nad2bin:
+ 	fi
  
  install-data-local: process-nad2bin
 -	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 +	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkglibdir)
- 	@if [ -f conus.lla ] ; then \
- 	  for x in *.lla ; do \
+ 	@for x in *.lla ; do \
 -	    DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \
 +	    DEST=$(DESTDIR)$(pkglibdir)/`basename $$x .lla`; \
  	    echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \

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