[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-15-gbcf86e8

[David Paleino]

The following commit has been merged in the master branch:
commit bcf86e82151a8cbb0bc00d401716ac4049b04219
Author: David Paleino <dapal at debian.org>
Date:   Thu Apr 1 00:23:57 2010 +0200

    debian/osmosis.1 statically generated, so to remove unneeded Build-Dependencies

diff --git a/debian/changelog b/debian/changelog
index d05ea81..36167f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,12 +14,14 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
   * debian/patches/:
     - 00-fix_build.patch added, fixes FTBFS because of missing file
       in upstream tarball
+  * debian/osmosis.1 statically generated, so to remove unneeded
+    Build-Dependencies
 
   [ Giovanni Mascellani ]
   * debian/*: updated my email address
   * debian/watch: updated to new upstream distribution location
 
- -- David Paleino <dapal at debian.org>  Thu, 01 Apr 2010 00:12:04 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 01 Apr 2010 00:23:36 +0200
 
 osmosis (0.31.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ea1daae..3c63d1b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,6 @@ Build-Depends: ant,
  ant-optional,
  cdbs,
  debhelper (>= 7),
- docbook-xsl,
- docbook-xml,
  libcommons-codec-java,
  libcommons-compress-java,
  libcommons-dbcp-java,
@@ -22,8 +20,7 @@ Build-Depends: ant,
  libspring-jdbc-2.5-java,
  libspring-tx-2.5-java,
  libwoodstox-java,
- openjdk-6-jdk,
- xsltproc
+ openjdk-6-jdk
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/pkg-grass/osmosis.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/osmosis.git
diff --git a/debian/osmosis.1 b/debian/osmosis.1
new file mode 100644
index 0000000..fc3a86b
--- /dev/null
+++ b/debian/osmosis.1
@@ -0,0 +1,123 @@
+'\" t
+.\"     Title: OSMOSIS
+.\"    Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/01/2010
+.\"    Manual: Osmosis User Manual
+.\"    Source: osmosis
+.\"  Language: English
+.\"
+.TH "OSMOSIS" "1" "04/01/2010" "osmosis" "Osmosis User Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+osmosis \- command line OpenStreetMap data processor
+.SH "SYNOPSIS"
+.HP \w'\fBosmosis\fR\ 'u
+\fBosmosis\fR [\fB\-\-command\ \fR\fBcommand\ parameters\ \&.\&.\&.\fR] \&.\&.\&.
+    
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBosmosis\fR
+command\&.
+.PP
+This manual page was written for the Debian distribution because the original program does not have a manual page\&.
+.PP
+\fBosmosis\fR
+is a command\-line Java program that processes OpenStreetMap data\&. It consistes of a series of component which can be chained together in order to perform operations on OpenStreetMap databases or XML files\&.
+.PP
+Such options include:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Generate and load dumps from and to a database\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Produce changesets comparing databases and files and applying them to other databases and files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Sort data contained in a file\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Extract data contained in a bounding box or in a polygon\&.
+.RE
+.SH "OPTIONS"
+.PP
+The commands and arguments accepted by
+\fBosmosis\fR
+are described in details and shown in examples in the page
+\m[blue]\fB\%http://wiki.openstreetmap.org/wiki/Osmosis\fR\m[]
+and its subpages\&.
+.SH "BUGS"
+.PP
+The upstreams
+BTS
+can be found at
+\m[blue]\fB\%http://trac.openstreetmap.org/\fR\m[]\&. Bugs are also discussed on upstream mailing list, at
+\m[blue]\fB\%http://lists.openstreetmap.org/listinfo/dev\fR\m[]\&.
+.SH "AUTHOR"
+.PP
+\fBGiovanni Mascellani\fR <\&mascellani at poisson\&.phc\&.unipi\&.it\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2009 Giovanni Mascellani
+.br
+.PP
+This manual page was written for the Debian system (and may be used by others)\&.
+.PP
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or (at your option) any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in
+/usr/share/common\-licenses/GPL\&.
+.sp
diff --git a/debian/rules b/debian/rules
index d6ee370..25dd363 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,11 +38,6 @@ CURVER  := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2 | cut -d-
 debian/osmosis.1: debian/osmosis.xml
 	$(XP) -o $@ $(DB2MAN) $<
 
-build/osmosis:: debian/osmosis.1
-
-clean::
-	rm -f debian/osmosis.1
-
 get-orig-source:
 	dh_testdir
 #	test -d ../tarballs/. || mkdir -p ../tarballs

-- 
Osmosis, an OSM data processor