[shapelib] 01/01: Fix previous commit (some rebasing errors)

[Johan Van de Wauw]

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

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

commit 599252d73826d7f36b7ab8be7136e3123b32ca4a
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Wed Oct 15 18:07:48 2014 +0200

    Fix previous commit (some rebasing errors)
---
 debian/control           |  1 -
 debian/man/dbfcat.1      | 40 ----------------------------------------
 debian/rules             |  4 ++--
 debian/shapelib.manpages |  2 +-
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/debian/control b/debian/control
index 17090d6..89b7e57 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                libtool,
                libtool-bin,
-               libproj-dev
                libproj-dev,
                libtool-bin,
                ruby-ronn
diff --git a/debian/man/dbfcat.1 b/debian/man/dbfcat.1
deleted file mode 100644
index 61a7c58..0000000
--- a/debian/man/dbfcat.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "DBFCAT" "1" "October 2014" "" ""
-.
-.SH "NAME"
-\fBdbfcat\fR \- : appends the records of a source xBase file
-.
-.SH "SYNOPSIS"
-\fBdbfcat\fR [\fI\-v\fR] [\fI\-f\fR] from_DBFfile to_DBFfile
-.
-.SH "DESCRIPTION"
-Appends the records of a source xBase file into a destiny xBase file\. Both files must have the same number of fields\.
-.
-.SH "OPTIONS"
-.
-.TP
-\fI\-v\fR
-verbose mode\.
-.
-.TP
-\fI\-f\fR
-forces data convertion if data field types is not the same at both files or if is there any null value into from_DBFfile\.
-.
-.TP
-from_DBFfile
-source xBase file\.
-.
-.TP
-to_DBFfile
-destiny xBase file\.
-.
-.SH "EXAMPLE"
-\fBdbfadd\fR testbase\.dbf REGION1 25\.656 150\.22
-.
-.P
-Assuming that testbase\.dbf has 3 fields( NAME, AREA and VALUE), this command line will insert a new record into testbase\.dbf with the value "REGION1" for NAME, \'25\.656\' for AREA and \'150\.22\' for VALUE field\.
-.
-.SH "AUTHOR"
-\fBdbfcreate\fR is part of shapelib, maintained by Frank Warmerdam\. This guide was created by Eduardo Patoo Kanegae and converted to manpage by Johan Van de Wauw\.
diff --git a/debian/rules b/debian/rules
index c5480e8..b07d764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,13 @@ override_dh_auto_test:
 override_dh_auto_build:
 	dh_auto_build
 	make -C $(CURDIR)/contrib 
-        ronn -r --manual=shplib debian/man/*.md
+	ronn -r --manual=shplib debian/man/*.md
 
 override_dh_auto_clean:
 	dh_auto_clean
 	make -C $(CURDIR)/contrib clean
 	rm -f contrib/Shape_PointInPoly contrib/shpsort
-        rm -f debian/man/*.1
+	rm -f debian/man/*.1
 
 override_dh_auto_install:
 	mkdir -p debian/tmp/usr/bin/
diff --git a/debian/shapelib.manpages b/debian/shapelib.manpages
index 81c662c..92198a5 100644
--- a/debian/shapelib.manpages
+++ b/debian/shapelib.manpages
@@ -1,2 +1,2 @@
-man/*.1
+debian/man/*.1
 

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