[shapelib] 07/12: Refresh patches.

Bas Couwenberg sebastic at xs4all.nl
Tue Oct 14 23:24:01 UTC 2014 

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

sebastic-guest pushed a commit to branch master
in repository shapelib.

commit bcacbaab0669942d51ce86b91b92f8b51d8be8b6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Oct 14 21:29:50 2014 +0200

    Refresh patches.
---
 debian/patches/0001-Add-manpages.patch             | 28 ----------------------
 debian/patches/0003-Properly-use-libtool.patch     |  4 +---
 ...namically-link-the-shp-binaries-to-libshp.patch |  2 --
 ...setting-CFLAGS-and-PREFIX-in-the-Makefile.patch |  2 --
 ...ildflags-in-contrib-fixes-hardening-warni.patch |  2 --
 5 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/patches/0001-Add-manpages.patch b/debian/patches/0001-Add-manpages.patch
index 352beb4..0fa85ee 100644
--- a/debian/patches/0001-Add-manpages.patch
+++ b/debian/patches/0001-Add-manpages.patch
@@ -24,9 +24,6 @@ Debian-bug: http://bugs.debian.org/148037
  create mode 100644 man/shprewind.1
  create mode 100644 man/shptest.1
 
-diff --git a/man/Makefile b/man/Makefile
-new file mode 100644
-index 0000000..1bf4918
 --- /dev/null
 +++ b/man/Makefile
 @@ -0,0 +1,16 @@
@@ -46,9 +43,6 @@ index 0000000..1bf4918
 +
 +clean:
 +	$(RM) *.1.cat *.1.ps *.1.html *~ 
-diff --git a/man/dbfadd.1 b/man/dbfadd.1
-new file mode 100644
-index 0000000..fea9a8a
 --- /dev/null
 +++ b/man/dbfadd.1
 @@ -0,0 +1,61 @@
@@ -113,9 +107,6 @@ index 0000000..fea9a8a
 +.BR shpcreate (1),
 +.BR shpdump (1),
 +.BR shprewind (1)
-diff --git a/man/dbfcreate.1 b/man/dbfcreate.1
-new file mode 100644
-index 0000000..58436e5
 --- /dev/null
 +++ b/man/dbfcreate.1
 @@ -0,0 +1,88 @@
@@ -207,9 +198,6 @@ index 0000000..58436e5
 +.BR shpcreate (1),
 +.BR shpdump (1),
 +.BR shprewind (1)
-diff --git a/man/dbfdump.1 b/man/dbfdump.1
-new file mode 100644
-index 0000000..e7a8574
 --- /dev/null
 +++ b/man/dbfdump.1
 @@ -0,0 +1,111 @@
@@ -324,9 +312,6 @@ index 0000000..e7a8574
 +.BR shpcreate (1),
 +.BR shpdump (1),
 +.BR shprewind (1)
-diff --git a/man/shpadd.1 b/man/shpadd.1
-new file mode 100644
-index 0000000..f57576a
 --- /dev/null
 +++ b/man/shpadd.1
 @@ -0,0 +1,85 @@
@@ -415,9 +400,6 @@ index 0000000..f57576a
 +.BR shpcreate (1),
 +.BR shpdump (1),
 +.BR shprewind (1)
-diff --git a/man/shpcreate.1 b/man/shpcreate.1
-new file mode 100644
-index 0000000..4fa69a8
 --- /dev/null
 +++ b/man/shpcreate.1
 @@ -0,0 +1,68 @@
@@ -489,9 +471,6 @@ index 0000000..4fa69a8
 +.BR shpadd (1),
 +.BR shpdump (1),
 +.BR shprewind (1)
-diff --git a/man/shpdump.1 b/man/shpdump.1
-new file mode 100644
-index 0000000..455d702
 --- /dev/null
 +++ b/man/shpdump.1
 @@ -0,0 +1,316 @@
@@ -811,9 +790,6 @@ index 0000000..455d702
 +.BR shpadd (1),
 +.BR shpcreate (1),
 +.BR shprewind (1)
-diff --git a/man/shprewind.1 b/man/shprewind.1
-new file mode 100644
-index 0000000..00200f0
 --- /dev/null
 +++ b/man/shprewind.1
 @@ -0,0 +1,88 @@
@@ -905,9 +881,6 @@ index 0000000..00200f0
 +.BR shpadd (1),
 +.BR shpcreate (1),
 +.BR shpdump (1)
-diff --git a/man/shptest.1 b/man/shptest.1
-new file mode 100644
-index 0000000..7ab016e
 --- /dev/null
 +++ b/man/shptest.1
 @@ -0,0 +1,89 @@
@@ -1000,4 +973,3 @@ index 0000000..7ab016e
 +.BR shpcreate (1),
 +.BR shpdump (1),
 +.BR shprewind (1)
--- 
diff --git a/debian/patches/0003-Properly-use-libtool.patch b/debian/patches/0003-Properly-use-libtool.patch
index afb737a..f8e90af 100644
--- a/debian/patches/0003-Properly-use-libtool.patch
+++ b/debian/patches/0003-Properly-use-libtool.patch
@@ -10,8 +10,6 @@ Bug-Debian: http://bugs.debian.org/497160
  Makefile |   42 ++++++++++++++++++++++++++++++++----------
  1 file changed, 32 insertions(+), 10 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 0c41d8a..2b8cefb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -21,7 +21,7 @@ shptree.o:	shptree.c shapefil.h
@@ -23,7 +21,7 @@ index 0c41d8a..2b8cefb 100644
  	$(CC) $(CFLAGS) -c safileio.c
  
  shpcreate:	shpcreate.c shpopen.o safileio.o 
-@@ -57,6 +57,7 @@ shptreedump:	shptreedump.c shptree.o shpopen.o safileio.o
+@@ -57,6 +57,7 @@ shptreedump:	shptreedump.c shptree.o shp
  
  clean:
  	rm -f *.o shptest $(SHPBIN) libshp.a 
diff --git a/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch b/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch
index 0ef30e8..6bbba4c 100644
--- a/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch
+++ b/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch
@@ -7,8 +7,6 @@ Also use CPPFLAGS and LDFLAGS, necessary for hardening flags.
  Makefile |   42 +++++++++++++++++++++---------------------
  1 file changed, 21 insertions(+), 21 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 8073f9c..6eb74a1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -24,36 +24,36 @@ dbfopen.o:	dbfopen.c shapefil.h
diff --git a/debian/patches/0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch b/debian/patches/0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch
index e0559f6..8d34ce7 100644
--- a/debian/patches/0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch
+++ b/debian/patches/0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch
@@ -6,8 +6,6 @@ Subject: Stop setting CFLAGS and PREFIX in the Makefile
  Makefile |    6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 6eb74a1..a74331d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,12 +1,14 @@
diff --git a/debian/patches/0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch b/debian/patches/0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch
index 9645815..1041f7c 100644
--- a/debian/patches/0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch
+++ b/debian/patches/0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch
@@ -6,8 +6,6 @@ Subject: Use dpkg-buildflags in contrib (fixes hardening warnings)
  contrib/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/contrib/Makefile b/contrib/Makefile
-index 6d88faf..abb8402 100644
 --- a/contrib/Makefile
 +++ b/contrib/Makefile
 @@ -1,11 +1,12 @@

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

More information about the Pkg-grass-devel mailing list