[SCM] osmctools branch, master, updated. upstream/0.1-18-g5904def
The following commit has been merged in the master branch: commit 850b688878768fc73954e266caf7b6c4c005e3d3 Author: Pierre Blanc pierreblan...@gmail.com Date: Tue Jan 21 21:12:02 2014 +0100 git: Ignore .pc directory diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. upstream/0.1-18-g5904def
The following commit has been merged in the master branch: commit e5fd64fb2ac4946abbe31dd4e75ae7094ac53aa3 Author: Pierre Blanc pierreblan...@gmail.com Date: Tue Jan 21 21:28:20 2014 +0100 Bump standards to 3.8.5. diff --git a/debian/control b/debian/control index 5bc2a52..a6597cb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: extra Maintainer: Pierre Blanc pierreblan...@gmail.com Build-Depends: debhelper (= 9.0.0), dh-autoreconf, zlib1g-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://gitorious.org/osm-c-tools/ Vcs-Git: git://anonscm.debian.org/pkg-grass/osmctools.git Vcs-Browser: http://anonscm.debian.org/?p=pkg-grass/osmctools.git;a=summary -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. upstream/0.1-18-g5904def
The following commit has been merged in the master branch: commit 5904def4702f84bdc4447b6648472d5f8a69c3aa Author: Pierre Blanc pierreblan...@gmail.com Date: Tue Jan 21 22:12:36 2014 +0100 Update changelog file diff --git a/debian/changelog b/debian/changelog index e67d9ee..ca7b85f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +osmctools (0.1-2) unstable; urgency=medium + + * Fix FTBFS, LDADD against LDFLAGS + * Update watch file + * Bump standards to 3.8.5. + + -- Pierre Blanc pierreblan...@gmail.com Tue, 21 Jan 2014 21:31:43 +0100 + osmctools (0.1-1) unstable; urgency=low * Initial release (Closes: #722429) -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. upstream/0.1-18-g5904def
The following commit has been merged in the master branch: commit 2f5bdd799c97f94d9699242ee4597c53b2a7cad0 Author: Pierre Blanc pierreblan...@gmail.com Date: Tue Jan 21 21:29:36 2014 +0100 Update debian watch file diff --git a/debian/watch b/debian/watch index ebfbb97..9e20395 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ -# uscan(1) configuration file. version=3 - -# uscan can't work with gitorious.org +opts=filenamemangle=s/\S*download=//g \ +http://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=gitorious/osm-c-tools/osmctools \ +.*=osmctools(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. upstream/0.1-18-g5904def
The following commit has been merged in the master branch: commit 65e0700aaac50fb12bbe65d9ae75b5c116d89b1d Author: Pierre Blanc pierreblan...@gmail.com Date: Tue Jan 21 21:13:55 2014 +0100 Fix FTBTS for LDFLAGS Don't use osmconvert_LDFLAGS to specify libraries to link with, use osmconvert_LDADD instead (fixes FTBFS). diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch new file mode 100644 index 000..541f923 --- /dev/null +++ b/debian/patches/ld-as-needed.patch @@ -0,0 +1,16 @@ +From: Michael Bienia +Date: Thu, 21 Jan 2014 21:00:08 +0200 +Subject: Don't use osmconvert_LDFLAGS to specify libraries to +link with, use osmconvert_LDADD instead (fixes FTBFS). + +--- a/src/Makefile.am b/src/Makefile.am +@@ -6,7 +6,7 @@ + + if ENABLE_OSMCONVERT + osmconvert_SOURCES = osmconvert.c +-osmconvert_LDFLAGS = -lz ++osmconvert_LDADD = -lz + endif + + osmfilter_SOURCES = osmfilter.c diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..abff4f8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +ld-as-needed.patch -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. upstream/0.1-12-g063e44d
The following commit has been merged in the master branch: commit 063e44d5f63dcaed96f7a34bbf827a60bdb1b5c4 Author: Pierre Blanc pierreblan...@gmail.com Date: Sun Nov 3 20:43:31 2013 +0100 Add full AGPL license on copyright file diff --git a/debian/copyright b/debian/copyright index 1ed42a0..25f1293 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,17 +5,622 @@ Source: http://gitorious.org/osm-c-tools/ Files: * Copyright: 2011, 2012, 2013 Markus Weber License: AGPL-3 - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Affero General Public License - version 3 as published by the Free Software Foundation. + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/ + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. + Preamble + . + The GNU Affero General Public License is a free, copyleft license for + software and other kinds of works, specifically designed to ensure + cooperation with the community in the case of network server software. + . + The licenses for most software and other practical works are designed + to take away your freedom to share and change the works. By contrast, + our General Public Licenses are intended to guarantee your freedom to + share and change all versions of a program--to make sure it remains free + software for all its users. + . + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + them if you wish), that you receive source code or can get it if you + want it, that you can change the software or use pieces of it in new + free programs, and that you know you can do these things. + . + Developers that use our General Public Licenses protect your rights + with two steps: (1) assert copyright on the software, and (2) offer + you this License which gives you legal permission to copy, distribute + and/or modify the software. + . + A secondary benefit of defending all users' freedom is that + improvements made in alternate versions of the program, if they + receive widespread use, become available for other developers to + incorporate. Many developers of free software are heartened and + encouraged by the resulting cooperation. However, in the case of + software used on network servers, this result may fail to come about. + The GNU General Public License permits making a modified version and + letting the public access it on a server without ever releasing its + source code to the public. + . + The GNU Affero General Public License is designed specifically to + ensure that, in such cases, the modified source code becomes available + to the community. It requires the operator of a network server to + provide the source code of the modified version running there to the + users of that server. Therefore, public use of a modified version, on + a publicly accessible server, gives the public access to the source + code of the modified version. . - You should have received a copy of this license along - with this program; if not, see http://www.gnu.org/licenses/. + An older license, called the Affero General Public License and + published by Affero, was designed to accomplish similar goals. This is + a different license, not a version of the Affero GPL, but Affero has + released a new version of the Affero GPL which permits relicensing under + this license. + . + The precise terms and conditions for copying, distribution and + modification follow. + + TERMS AND CONDITIONS + . + 0. Definitions. + . + This License refers to version 3 of the GNU Affero General Public License. + . + Copyright also means copyright-like laws that apply to other kinds of + works, such as semiconductor masks. + . + The Program refers to any copyrightable work licensed under this + License. Each licensee is addressed as you. Licensees and + recipients may be individuals or organizations. + . + To modify a work means to copy from or adapt all or part of the work + in a fashion requiring copyright permission, other than the making of an + exact copy. The resulting work is called a modified version of the + earlier work or a work based on the earlier work. + . + A covered work means either the unmodified Program or a work based + on the Program. + . + To propagate a work means to do anything with it that, without + permission, would make you directly or secondarily liable for + infringement under applicable copyright law, except executing it on a + computer or modifying a private copy
[SCM] osmctools branch, master, updated. upstream/0.1-13-gd595294
The following commit has been merged in the master branch: commit d5952945c940ca31a595665ebda4b13fe7ddbc6c Author: Pierre Blanc pierreblan...@gmail.com Date: Sun Nov 3 20:48:04 2013 +0100 fix a continuation line outside a paragraph diff --git a/debian/copyright b/debian/copyright index 25f1293..7081627 100644 --- a/debian/copyright +++ b/debian/copyright @@ -61,7 +61,7 @@ License: AGPL-3 . The precise terms and conditions for copying, distribution and modification follow. - + . TERMS AND CONDITIONS . 0. Definitions. -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools annotated tag, debian/0.1-1, deleted. upstream/0.1-1-g9e89a73
The annotated tag, debian/0.1-1 has been deleted was 9d95ad1c07e2b03c3600c0cdaa3825f0ccd494ca --- tag debian/0.1-1 Debian release 0.1-1 9e89a736bf794b461a7a49931bc41a4ccec6a514 Imported Debian patch 0.1-1 --- -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools tag, debian/0.1-2, deleted. debian/0.1-1-4-gc8e47e6
The tag, debian/0.1-2 has been deleted was c8e47e6ce60f2294414c76b880fe3aa5142093c5 --- c8e47e6ce60f2294414c76b880fe3aa5142093c5 Docs: fix man-pages mistakes. --- -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-10-g9796af4
The following commit has been merged in the master branch: commit 9796af483e6f5db3c25e6a2cdf5404480dc1eff7 Author: Pierre Blanc pierreblan...@gmail.com Date: Wed Oct 16 13:37:21 2013 +0200 Add empty watch file diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..ebfbb97 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +# uscan(1) configuration file. +version=3 + +# uscan can't work with gitorious.org -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-10-g9796af4
The following commit has been merged in the master branch: commit fdd9a6cf457e10e13d262e285d11d7f2a55da0a9 Author: Pierre Blanc pierreblan...@gmail.com Date: Wed Oct 16 11:44:50 2013 +0200 Add get-orig-source rule diff --git a/debian/rules b/debian/rules index 41d4697..5d281f0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,38 @@ #export DH_VERBOSE=1 export DEB_BUILD_HARDENING=1 -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + +PKD = $(abspath $(dir $(MAKEFILE_LIST))) +PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) %: dh $@ --with autoreconf + +## http://wiki.debian.org/onlyjob/get-orig-source +VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};') +.PHONY: get-orig-source +get-orig-source: $(PKG)_$(VER).orig.tar.xz + @ + +UURL = git://gitorious.org/osm-c-tools/osmctools.git +$(PKG)_$(VER).orig.tar.xz: + $(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..)) + @echo # Downloading... + git clone $(UURL) $(PKG)-$(VER) \ +|| $(RM) -r $(PKG)-$(VER) + cd $(PKG)-$(VER) \ + git checkout v$(VER) \ + echo # Setting times... \ + for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d $$(git log -1 --format=%ai -- $$F) $$F; done \ + [ -s ChangeLog ] || ( echo # Generating ChangeLog... \ + ; git log --pretty=format:%ad %aN %aE%n%n%x09* %s%n --date=short ChangeLog \ + ; touch -d $$(git log -1 --format='%ci') ChangeLog) \ + $(RM) -r .git .git* + @echo # Packing... + find -L $(PKG)-$(VER) -xdev -type f -print | sort \ +| XZ_OPT=-6v tar -caf $(PKG)_$(VER).orig.tar.xz -T- --owner=root --group=root --mode=a+rX \ + $(RM) -r $(PKG)-$(VER) -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-8-g191a422
The following commit has been merged in the master branch: commit e970a256ea06f83e5cea3c0302c1055137d7ea1b Author: Pierre Blanc pierreblan...@gmail.com Date: Mon Oct 14 16:47:47 2013 +0200 Changelog: remove release 2 and merge commit messages diff --git a/debian/changelog b/debian/changelog index f23dedf..e67d9ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,9 @@ -osmctools (0.1-2) unstable; urgency=low +osmctools (0.1-1) unstable; urgency=low + * Initial release (Closes: #722429) * Add VCS-* fields * Use --with autoreconf * debian/control Give a better description * Docs: fix man-pages mistakes. -- Pierre Blanc pierreblan...@gmail.com Sun, 15 Sep 2013 10:31:01 +0200 - -osmctools (0.1-1) unstable; urgency=low - - * Initial release (Closes: #722429) - - -- Pierre Blanc pierreblan...@gmail.com Wed, 12 Sep 2013 15:43:58 +0200 -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-8-g191a422
The following commit has been merged in the master branch: commit 191a4224455b1e9530f5384799cba05b05d9867a Author: Pierre Blanc pierreblan...@gmail.com Date: Mon Oct 14 16:59:35 2013 +0200 remove useless comments on rules file diff --git a/debian/rules b/debian/rules index 19553e0..41d4697 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,5 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-8-g191a422
The following commit has been merged in the master branch: commit d61efefd2cd18c9f03bef5e44d82cc721e13927b Author: Pierre Blanc pierreblan...@gmail.com Date: Mon Oct 14 15:57:50 2013 +0200 override lintian: no upstream changelog diff --git a/debian/osmctools.lintian-overrides b/debian/osmctools.lintian-overrides new file mode 100644 index 000..26c8d9b --- /dev/null +++ b/debian/osmctools.lintian-overrides @@ -0,0 +1,3 @@ +#No upstream changelog, see upstream repository +osmctools: no-upstream-changelog + -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-4-gc8e47e6
The following commit has been merged in the master branch: commit c8e47e6ce60f2294414c76b880fe3aa5142093c5 Author: Pierre Blanc pierreblan...@gmail.com Date: Sun Sep 15 10:13:33 2013 +0200 Docs: fix man-pages mistakes. diff --git a/debian/docs/osmconvert.1 b/debian/docs/osmconvert.1 index d0d83ac..c1ec169 100644 --- a/debian/docs/osmconvert.1 +++ b/debian/docs/osmconvert.1 @@ -2,15 +2,14 @@ .SH NAME osmconvert \- Converter of OSM files .SH SYNOPSIS -\\fBosmconvert\fR \fIoptions\fR [\fIinput file\fR] +\\fBosmconvert\fR \fIoptions\fR [\fIinput file\fR] .SH DESCRIPTION .PP This program reads different file formats of the OpenStreetMap project and converts the data to the selected output file format. .SS These formats can be read: .TP -\.osm -\.osc .osc.gz .osh .o5m .o5c .pbf +\.osm .osc .osc.gz .osh .o5m .o5c .pbf .SS These formats can be written: .TP \.osm (default) .osc .osh .o5m .o5c .pbf @@ -313,26 +312,6 @@ diagnosis data will be displayed. If \fB\-v\fR resp. \fB\-\-verbose\fR is the first parameter in the line, osmconvert will display all input parameters. .PP -.SH EXAMPLES -.PP -\tosmconvert europe.pbf \fB\-\-drop\-author\fR europe.osm -.br -\tosmconvert europe.pbf |gzip europe.osm.gz -.br -\tbzcat europe.osm.bz2 |./osmconvert \fB\-\-out\-pbf\fR europe.pbf -.br -\tosmconvert europe.pbf \fB\-B\fR=\fIch\fR.poly switzerland.osm -.br -\tosmconvert switzerland.osm \fB\-\-out\-o5m\fR switzerland.o5m -.br -\tosmconvert june_july.osc \fB\-\-out\-o5c\fR june_july.o5c -.br -\tosmconvert june.o5m june_july.o5c.gz \fB\-\-out\-o5m\fR july.o5m -.br -\tosmconvert sep.osm sep_oct.osc oct_nov.osc nov.osm -.br -\tosmconvert northamerica.osm southamerica.osm americas.osm -.PP .SH TUNING .PP To speed\-up the process, the program uses some main memory for a @@ -400,12 +379,33 @@ osmconvert will display an error message if this sequence is broken. .PP If a polygon file for borders is supplied, the maximum number of polygon points is about 40,000. +.SH NOTES .PP This program is for experimental use. Expect malfunctions and data loss. Do not use the program in productive or commercial systems. .PP There is NO WARRANTY, to the extent permitted by law. Please send any bug reports to markus.we...@gmx.com +.PP +.SH EXAMPLE +.PP +\tosmconvert europe.pbf \fB\-\-drop\-author\fR europe.osm +.br +\tosmconvert europe.pbf |gzip europe.osm.gz +.br +\tbzcat europe.osm.bz2 |./osmconvert \fB\-\-out\-pbf\fR europe.pbf +.br +\tosmconvert europe.pbf \fB\-B\fR=\fIch\fR.poly switzerland.osm +.br +\tosmconvert switzerland.osm \fB\-\-out\-o5m\fR switzerland.o5m +.br +\tosmconvert june_july.osc \fB\-\-out\-o5c\fR june_july.o5c +.br +\tosmconvert june.o5m june_july.o5c.gz \fB\-\-out\-o5m\fR july.o5m +.br +\tosmconvert sep.osm sep_oct.osc oct_nov.osc nov.osm +.br +\tosmconvert northamerica.osm southamerica.osm americas.osm .SH SEE ALSO osmfilter(1), osmupdate(1) .SH AUTHORS diff --git a/debian/docs/osmfilter.1 b/debian/docs/osmfilter.1 index 6bc90f4..bb42d02 100644 --- a/debian/docs/osmfilter.1 +++ b/debian/docs/osmfilter.1 @@ -2,7 +2,7 @@ .SH NAME osmfilter \- The experimental OSM filters data .SH SYNOPSIS -\\fBosmfilter\fR \fIoptions\fR [\fIinput file\fR] +\\fBosmfilter\fR \fIoptions\fR [\fIinput file\fR] .SH DESCRIPTION .PP THIS PROGRAM IS FOR EXPERIMENTAL USE ONLY. @@ -292,14 +292,6 @@ deleted, nor the remaining tags. If you want to drop every tag which is not mentioned in a list, use this example: .br all highway= amenity= name= -.SH EXAMPLES -osmfilter europe.o5m \-\-keep=amenity=bar \-o=new.o5m -.br -osmfilter a.osm \-\-keep\-nodes=lit=yes \-\-drop\-ways \-o=light.osm -.br -osmfilter a.osm \-\-keep=place=city or ( place=town and population=1 ) \-o=b.osm -.br -osmfilter region.o5m \-\-keep=bridge=yes and layer=2 \-o=r.o5m .SH TUNING To speed\-up the process, the program uses some main memory for a hash table. By default, it uses 480 MB for storing a flag for every @@ -344,9 +336,21 @@ will display an error message if this sequence is broken. .PP The number of key/val pairs in each filter parameter is limited to 1000, the length of each key or val is limited to 100. +.SH NOTES +.PP +This program is for experimental use. Expect malfunctions and data +loss. Do not use the program in productive or commercial systems. .PP There is NO WARRANTY, to the extent permitted by law. Please send any bug reports to markus.we...@gmx.com +.SH EXAMPLE +osmfilter europe.o5m \-\-keep=amenity=bar \-o=new.o5m +.br +osmfilter a.osm \-\-keep\-nodes=lit=yes \-\-drop\-ways \-o=light.osm +.br +osmfilter a.osm \-\-keep=place=city or ( place=town and population=1 ) \-o=b.osm +.br +osmfilter region.o5m \-\-keep=bridge=yes and layer=2 \-o=r.o5m .SH SEE ALSO osmconvert(1), osmupdate(1) .SH AUTHORS diff --git a/debian/docs/osmupdate.1 b/debian/docs/osmupdate.1 index a8144e7..b6e043a 100644 --- a/debian/docs/osmupdate.1 +++ b/debian/docs/osmupdate.1 @@ -122,7 +122,7 @@ loss. Do not use the program
[SCM] osmctools tag, debian/0.1-2, created. debian/0.1-1-4-gc8e47e6
The tag, debian/0.1-2 has been created at c8e47e6ce60f2294414c76b880fe3aa5142093c5 (commit) - Shortlog commit c8e47e6ce60f2294414c76b880fe3aa5142093c5 Author: Pierre Blanc pierreblan...@gmail.com Date: Sun Sep 15 10:13:33 2013 +0200 Docs: fix man-pages mistakes. --- -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-5-g2265ac1
The following commit has been merged in the master branch: commit 2265ac1a328f36000c5f53463ce987224dc2c69a Author: Pierre Blanc pierreblan...@gmail.com Date: Sun Sep 15 10:39:15 2013 +0200 Changelog: New release diff --git a/debian/changelog b/debian/changelog index 2184779..f23dedf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmctools (0.1-2) unstable; urgency=low + + * Add VCS-* fields + * Use --with autoreconf + * debian/control Give a better description + * Docs: fix man-pages mistakes. + + -- Pierre Blanc pierreblan...@gmail.com Sun, 15 Sep 2013 10:31:01 +0200 + osmctools (0.1-1) unstable; urgency=low * Initial release (Closes: #722429) -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osmctools branch, master, updated. debian/0.1-1-3-g44e2211
The following commit has been merged in the master branch: commit 44e22119297ffb9c227513e6c084945f8c1276dc Author: Pierre Blanc pierreblan...@gmail.com Date: Fri Sep 13 10:17:55 2013 +0200 debian/control Give a better description diff --git a/debian/control b/debian/control index 1ee5bb8..5bc2a52 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Description: Some tools to manipulate OpenStreetMap files Small collection of basic OpenStreetMap tools, include converter, filter and updater files. - It masters fewer functions than the commonly-used Osmosis: for - example, there is no way to access a database with osmconvert. - However, the program runs faster and offers a few special functions - (--all-to-nodes, --complex-ways and --out-statistics). - + . + Programs include: + osmconvert - Converter of OSM files + osmfilter - The experimental OSM filters data + osmupdate - Update OSM files. -- Some tools to manipulate OpenStreetMap files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel