[node-osmium] 03/05: pristine-tar data for node-osmium_0.1.2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository node-osmium. commit cc669181f6ac534e18b73cfc217ed511ceb50765 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:35 2015 +0100 pristine-tar data for node-osmium_0.1.2.orig.tar.gz --- node-osmium_0.1.2.orig.tar.gz.delta | Bin 0 - 1858 bytes node-osmium_0.1.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/node-osmium_0.1.2.orig.tar.gz.delta b/node-osmium_0.1.2.orig.tar.gz.delta new file mode 100644 index 000..67f1a0f Binary files /dev/null and b/node-osmium_0.1.2.orig.tar.gz.delta differ diff --git a/node-osmium_0.1.2.orig.tar.gz.id b/node-osmium_0.1.2.orig.tar.gz.id new file mode 100644 index 000..d18e2fe --- /dev/null +++ b/node-osmium_0.1.2.orig.tar.gz.id @@ -0,0 +1 @@ +58bcd265a1cf174c1cfb75f503045ec959c6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] 04/05: pristine-tar data for node-osmium_0.2.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository node-osmium. commit 7e6c974f9cd213f23ad89f2ec022c8fab6914aaa Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:40 2015 +0100 pristine-tar data for node-osmium_0.2.0.orig.tar.gz --- node-osmium_0.2.0.orig.tar.gz.delta | Bin 0 - 2974 bytes node-osmium_0.2.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/node-osmium_0.2.0.orig.tar.gz.delta b/node-osmium_0.2.0.orig.tar.gz.delta new file mode 100644 index 000..af8a32c Binary files /dev/null and b/node-osmium_0.2.0.orig.tar.gz.delta differ diff --git a/node-osmium_0.2.0.orig.tar.gz.id b/node-osmium_0.2.0.orig.tar.gz.id new file mode 100644 index 000..c5acf3a --- /dev/null +++ b/node-osmium_0.2.0.orig.tar.gz.id @@ -0,0 +1 @@ +1bcf21b6e88bd22ddf05ec5c6e041ceb92c02745 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] 10/10: Merge tag 'upstream/0.3.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository node-osmium. commit d71748fb7d3b74380db94e298c2f88f1c51e8a87 Merge: 3bc0a87 38391db Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:44 2015 +0100 Merge tag 'upstream/0.3.0' Upstream version 0.3.0 .npmignore | 10 + Makefile | 1 + binding.gyp| 3 + demo/converter/README.md | 14 + demo/converter/index.js| 117 + demo/converter/package.json| 7 + demo/converter/roads-from-buffer.js| 94 +++ demo/converter/roads.js| 92 +++ demo/count/README.md | 8 + demo/count/index.js| 35 +++ demo/count/package.json| 6 + demo/histstat/README.md| 13 + demo/histstat/index.js | 46 demo/histstat/package.json | 6 + demo/multipolygon/README.md| 12 + demo/multipolygon/index.js | 41 +++ demo/multipolygon/package.json | 7 + doc/tutorial.md| 111 lib/osmium.js | 291 + package.json | 2 +- src/apply.cpp | 13 +- src/apply.hpp | 8 +- src/buffer_wrap.cpp| 71 +++-- src/buffer_wrap.hpp| 29 +- src/file_wrap.cpp | 9 +- src/file_wrap.hpp | 19 +- src/handler.cpp| 27 +- src/handler.hpp| 12 +- src/{apply.hpp = include_v8.hpp} | 13 +- src/location_handler_wrap.cpp | 6 +- src/location_handler_wrap.hpp | 18 +- src/multipolygon_collector_wrap.cpp| 97 +++ src/multipolygon_collector_wrap.hpp| 46 src/multipolygon_handler_wrap.cpp | 33 +++ src/multipolygon_handler_wrap.hpp | 42 +++ src/node_osmium.cpp| 75 +- src/node_osmium.hpp| 45 src/osm_area_wrap.cpp | 71 + src/osm_area_wrap.hpp | 52 src/osm_changeset_wrap.cpp | 15 +- src/osm_changeset_wrap.hpp | 17 +- src/osm_entity_wrap.cpp| 6 +- src/osm_entity_wrap.hpp| 14 +- src/osm_node_wrap.cpp | 29 +- src/osm_node_wrap.hpp | 16 +- src/osm_object_wrap.cpp| 14 +- src/osm_object_wrap.hpp| 12 +- src/osm_relation_wrap.cpp | 24 +- src/osm_relation_wrap.hpp | 18 +- src/osm_way_wrap.cpp | 21 +- src/osm_way_wrap.hpp | 16 +- src/reader_wrap.cpp| 50 ++-- src/reader_wrap.hpp| 25 +- src/utils.cpp | 5 +- src/utils.hpp | 20 +- test/changesets.test.js| 1 + test/data/coordinates-problems.osm | 6 + ...reation.test.js = osm-object-creation.test.js} | 0 test/osm-objects.test.js | 27 ++ test/reader.test.js| 18 ++ 60 files changed, 1713 insertions(+), 243 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] 08/10: Merge tag 'upstream/0.2.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository node-osmium. commit 3bc0a870813d2e5a2020088260da3412fc4b2dd0 Merge: bac0234 c7d49bd Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:40 2015 +0100 Merge tag 'upstream/0.2.0' Upstream version 0.2.0 .gitignore | 11 +- .travis.yml| 84 +++-- Makefile | 119 +- README.md | 103 +++--- binding.gyp| 28 +- common.gypi| 6 +- demo/README.md | 4 +- demo/csv-output/README.md | 12 + demo/csv-output/index.js | 43 +++ demo/{geojson-stream = csv-output}/package.json | 3 +- demo/geojson-stream/README.md | 7 +- demo/geojson-stream/index.js | 7 +- demo/geojson-stream/package.json | 2 +- demo/public-transport/README.md| 16 + demo/public-transport/index.js | 88 + .../package.json | 1 - demo/relation-tree/README.md | 14 + demo/relation-tree/index.js| 68 .../{geojson-stream = relation-tree}/package.json | 3 +- demo/spatialite-output/README.md | 14 + demo/spatialite-output/index.js| 78 .../package.json | 3 +- doc/tutorial.md| 378 +++ lib/osmium.js | 57 ++- package.json | 19 +- scripts/locally_package.sh | 19 + scripts/shared_build.sh| 21 ++ scripts/static_build.sh| 17 + scripts/validate_tag.sh| 24 ++ src/apply.cpp | 195 ++ src/apply.hpp | 17 + src/buffer_wrap.cpp| 79 src/buffer_wrap.hpp| 55 +++ src/file_wrap.cpp | 73 ++-- src/file_wrap.hpp | 32 +- src/handler.cpp| 403 - src/handler.hpp| 93 +++-- src/location_handler_wrap.cpp | 56 ++- src/location_handler_wrap.hpp | 93 +++-- src/node_osmium.cpp| 35 +- src/osm_changeset_wrap.cpp | 89 + src/osm_changeset_wrap.hpp | 54 +++ src/osm_entity_wrap.cpp| 26 ++ src/osm_entity_wrap.hpp| 78 src/osm_node_wrap.cpp | 119 +++--- src/osm_node_wrap.hpp | 57 +-- src/osm_object_wrap.cpp| 91 +++-- src/osm_object_wrap.hpp| 59 ++- src/osm_relation_wrap.cpp | 117 +++--- src/osm_relation_wrap.hpp | 57 +-- src/osm_way_wrap.cpp | 171 + src/osm_way_wrap.hpp | 55 +-- src/reader_wrap.cpp| 247 - src/reader_wrap.hpp| 42 +-- src/utils.cpp | 33 ++ src/utils.hpp | 30 ++ test/apply.test.js | 34 ++ test/buffer.test.js| 97 + test/changesets.test.js| 70 test/coordinates.test.js | 44 +++ test/data/changesets.osm | 14 + test/data/missing-node.osm | 8 + test/data/winthrop.osm.ser | Bin 0 - 144088 bytes test/file.test.js | 38 ++ test/geojson.test.js | 43 +++ test/handler.test.js | 256 + test/location_handler.test.js | 83 + test/osm-objects.test.js | 177 + test/osm_object_creation.test.js | 59 +++ test/osmium.test.js| 150 test/reader.test.js| 69 71 files changed, 3656 insertions(+), 1191 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git
[node-osmium] branch upstream created (now 38391db)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository node-osmium. at 38391db Imported Upstream version 0.3.0 This branch includes the following new commits: new 289b58a Imported Upstream version 0.1.0 new 80ef48b Imported Upstream version 0.1.1 new 9a9a819 Imported Upstream version 0.1.2 new c7d49bd Imported Upstream version 0.2.0 new 38391db Imported Upstream version 0.3.0 The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] branch master created (now fdc0e87)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository libosmium. at fdc0e87 Initial Debian packaging. This branch includes the following new commits: new 1e50084 Imported Upstream version 0.0~20150303-f074d94 new fdc0e87 Initial Debian packaging. The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] 01/01: pristine-tar data for libosmium_0.0~20150303-f074d94.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libosmium. commit 6fc68996a01ab0ee226384a3fb846fc0faf335d3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 13:50:07 2015 +0100 pristine-tar data for libosmium_0.0~20150303-f074d94.orig.tar.gz --- libosmium_0.0~20150303-f074d94.orig.tar.gz.delta | Bin 0 - 10287 bytes libosmium_0.0~20150303-f074d94.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libosmium_0.0~20150303-f074d94.orig.tar.gz.delta b/libosmium_0.0~20150303-f074d94.orig.tar.gz.delta new file mode 100644 index 000..f428465 Binary files /dev/null and b/libosmium_0.0~20150303-f074d94.orig.tar.gz.delta differ diff --git a/libosmium_0.0~20150303-f074d94.orig.tar.gz.id b/libosmium_0.0~20150303-f074d94.orig.tar.gz.id new file mode 100644 index 000..5c04fb7 --- /dev/null +++ b/libosmium_0.0~20150303-f074d94.orig.tar.gz.id @@ -0,0 +1 @@ +1255abdd847317414b97bcac362417fe0cc8a872 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] branch upstream created (now 1e50084)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository libosmium. at 1e50084 Imported Upstream version 0.0~20150303-f074d94 This branch includes the following new commits: new 1e50084 Imported Upstream version 0.0~20150303-f074d94 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] branch pristine-tar created (now 6fc6899)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository libosmium. at 6fc6899 pristine-tar data for libosmium_0.0~20150303-f074d94.orig.tar.gz This branch includes the following new commits: new 6fc6899 pristine-tar data for libosmium_0.0~20150303-f074d94.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] 03/10: Imported Upstream version 0.1.1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository node-osmium. commit 80ef48b13d5f2b35469efc5a28b3dd7c42e25b32 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:29 2015 +0100 Imported Upstream version 0.1.1 --- .travis.yml | 12 +- Makefile| 8 +- README.md | 98 +++-- binding.gyp | 9 +- configure | 3 - demo/geojson-stream/index.js| 9 +- package.json| 15 +- src/buffer.hpp | 9 +- src/{file.hpp = file_wrap.cpp} | 63 ++--- src/file_wrap.hpp | 59 src/handler.cpp | 170 ++ src/handler.hpp | 274 ++-- src/node_osmium.cpp | 25 +++- src/osm_node_wrap.cpp | 78 ++ src/osm_node_wrap.hpp | 55 src/osm_object_wrap.cpp | 28 src/osm_object_wrap.hpp | 42 ++ src/osm_relation_wrap.cpp | 88 src/osm_relation_wrap.hpp | 56 src/osm_way_wrap.cpp| 108 ++ src/osm_way_wrap.hpp| 55 src/{reader.hpp = reader_wrap.cpp} | 140 +++--- src/reader_wrap.hpp | 68 + test/osmium.test.js | 27 +++- 24 files changed, 1017 insertions(+), 482 deletions(-) diff --git a/.travis.yml b/.travis.yml index 999579c..0f23dda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,14 @@ language: node_js node_js: - 0.10 - - 0.8 before_install: + # first test install of binary + - npm install --verbose + - make test + +install: + # next test source compile, so get dependencies - sudo apt-add-repository --yes ppa:mapnik/boost - sudo apt-add-repository --yes ppa:ubuntu-toolchain-r/test - sudo apt-get -y update -qq @@ -14,12 +19,9 @@ before_install: - make sudo make install - cd ../../ -install: - - npm install mocha - before_script: - git clone https://github.com/osmcode/libosmium.git ../libosmium - - CXX=g++-4.7 npm install --verbose + - CXX=g++-4.7 npm install script: - make test diff --git a/Makefile b/Makefile index 32df7b4..bca59f3 100755 --- a/Makefile +++ b/Makefile @@ -1,15 +1,17 @@ all: osmium.node -osmium.node: +./build: + `npm explore npm -g -- pwd`/bin/node-gyp-bin/node-gyp configure + +osmium.node: binding.gyp Makefile ./build `npm explore npm -g -- pwd`/bin/node-gyp-bin/node-gyp --verbose build clean: - @rm -rf ./build + rm -rf ./build rm -f lib/osmium.node rebuild: @make clean - @./configure @make test/data/berlin-latest.osm.pbf: diff --git a/README.md b/README.md index 042ad4c..a69b503 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,67 @@ # node-osmium -Node.js bindings to [libosmium](https://github.com/osmcode/libosmium). +Fast and flexible Javascript library for working with OpenStreetMap data. + +Provides a bindings to the [libosmium](https://github.com/osmcode/libosmium) C++ library. [![Build Status](https://secure.travis-ci.org/osmcode/node-osmium.png)](http://travis-ci.org/osmcode/node-osmium) # Depends - - Compiler that supports `-std=c++11` (= clang++ 3.2 || = g++ 4.8) - Node.js v0.10.x + +# Installing + +By default, binaries are provided and no external depedencies and no compile is needed. + +Just do: + +npm install osmium + +We currently provide binaries for 64 bit OS X and 64 bit Linux. Running `npm install` on other +platforms will fall back to a source compile (see `Developing` below for build details). + +# Usage + +## Get the bounds of an `.osm` file + +```js +var osmium = require('osmium'); +var file = new osmium.File(test/data/winthrop.osm); +var reader = new osmium.Reader(file); +console.log(reader.header()) +{ generator: 'CGImap 0.2.0', + bounds: [ -120.2024, 48.4636, -120.1569, 48.4869 ] } +``` + +## Parse a `.pbf` file and create a node handler callback to count total nodes + +```js +var osmium = require('osmium'); +var file = new osmium.File(test/data/winthrop.osm); +var reader = new osmium.Reader(file); +var handler = new osmium.Handler(); +var nodes = 0; +handler.on('node',function(node) { +++nodes; +}); +reader.apply(handler); +console.log(nodes); +1525 +``` + +# Developing + +If you wish to develop on `node-osmium` you can check out the code and then build like: + +git clone https://github.com/osmcode/node-osmium.git +cd node-osmium +make +make test + +## Source build dependencies + + - Compiler that supports `-std=c++11` (= clang++ 3.2 || = g++ 4.8) - Boost = 1.49 with development headers - OSM-Binary - Protocol buffers @@ -42,43 +96,3 @@ Set depedencies up on OS X like:
[node-osmium] 04/10: Merge tag 'upstream/0.1.1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository node-osmium. commit 40ee3e5209cd0e08cfec78acdb823c789074aad3 Merge: f43eaf7 80ef48b Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:29 2015 +0100 Merge tag 'upstream/0.1.1' Upstream version 0.1.1 .travis.yml | 12 +- Makefile| 8 +- README.md | 98 +++-- binding.gyp | 9 +- configure | 3 - demo/geojson-stream/index.js| 9 +- package.json| 15 +- src/buffer.hpp | 9 +- src/{file.hpp = file_wrap.cpp} | 63 ++--- src/file_wrap.hpp | 59 src/handler.cpp | 170 ++ src/handler.hpp | 274 ++-- src/node_osmium.cpp | 25 +++- src/osm_node_wrap.cpp | 78 ++ src/osm_node_wrap.hpp | 55 src/osm_object_wrap.cpp | 28 src/osm_object_wrap.hpp | 42 ++ src/osm_relation_wrap.cpp | 88 src/osm_relation_wrap.hpp | 56 src/osm_way_wrap.cpp| 108 ++ src/osm_way_wrap.hpp| 55 src/{reader.hpp = reader_wrap.cpp} | 140 +++--- src/reader_wrap.hpp | 68 + test/osmium.test.js | 27 +++- 24 files changed, 1017 insertions(+), 482 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] 02/02: Initial Debian packaging.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit fdc0e872443cf83be6cb64bfa3427c728d30677b Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 14:35:52 2015 +0100 Initial Debian packaging. --- debian/changelog | 5 debian/compat| 1 + debian/control | 32 debian/copyright | 63 debian/gbp.conf | 16 debian/get-orig-source | 19 +++ debian/rules | 10 debian/source/format | 1 + debian/upstream/metadata | 7 ++ 9 files changed, 154 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..52ddcdc --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +libosmium (0.0~20150303-f074d94-1) UNRELEASED; urgency=medium + + * Initial release (Closes: #779923) + + -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 13:50:11 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 000..ae23f28 --- /dev/null +++ b/debian/control @@ -0,0 +1,32 @@ +Source: libosmium +Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org +Uploaders: Bas Couwenberg sebas...@debian.org +Section: science +Priority: optional +Build-Depends: debhelper (= 9) +Standards-Version: 3.9.6 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libosmium.git/ +Vcs-Git: git://anonscm.debian.org/pkg-grass/libosmium.git +Homepage: http://osmcode.org/libosmium/ + +Package: libosmium-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends} +Suggests: osmium, + osmium-contrib, + node-osmium, + pyosmium +Description: Fast and flexible C++ library for working with OpenStreetMap data + The Osmium library has extensive support for all types of OSM entities: nodes, + ways, relations, and changesets. It allows reading from and writing to OSM + files in XML and PBF formats, including change files and full history files. + Osmium can store OSM data in memory and on disk in various formats and using + various indexes. Its easy to use handler interface allows you to quickly write + data filtering and conversion functions. Osmium can create WKT, WKB, OGR, GEOS + and GeoJSON geometries for easy conversion into many GIS formats and it can + assemble multipolygons from ways and relations. + . + Osmium is a header-only library, so there is nothing to compile to build it. + Just include the header files you need. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000..f741462 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,63 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libosmium +Upstream-Contact: Osmium Developers d...@openstreetmap.org +Source: https://github.com/osmcode/libosmium + +Files: * +Copyright: 2013-2015, Jochen Topf joc...@topf.org +2012, Two Blue Cubes Ltd. +2004, John Maddock +License: BSL-1.0 + +Files: examples/osmium_convert.cpp +Copyright: disclaimed +License: public-domain + The code in this example file is released into the Public Domain. + +Files: debian/* +Copyright: © 2015, Bas Couwenberg sebas...@debian.org +License: GPL-2+ + +License: BSL-1.0 + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the Software) to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify +
[node-osmium] 06/10: Merge tag 'upstream/0.1.2'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository node-osmium. commit bac02343aa5e7b1399cf47704359d1ff58adac9f Merge: 40ee3e5 9a9a819 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:35 2015 +0100 Merge tag 'upstream/0.1.2' Upstream version 0.1.2 .gitignore| 2 +- .travis.yml | 13 +-- CHANGELOG.md | 7 ++ Makefile | 17 ++-- binding.gyp | 1 + common.gypi | 1 + lib/osmium.js | 6 +- package.json | 11 ++- src/buffer.hpp| 88 --- src/file_wrap.cpp | 11 +-- src/file_wrap.hpp | 20 ++--- src/handler.cpp | 191 +- src/handler.hpp | 54 ++-- src/location_handler_wrap.cpp | 38 + src/location_handler_wrap.hpp | 75 + src/node_osmium.cpp | 4 +- src/osm_node_wrap.cpp | 41 + src/osm_node_wrap.hpp | 13 ++- src/osm_object_wrap.cpp | 35 src/osm_object_wrap.hpp | 21 - src/osm_relation_wrap.cpp | 20 ++--- src/osm_relation_wrap.hpp | 11 +-- src/osm_way_wrap.cpp | 26 +++--- src/osm_way_wrap.hpp | 11 +-- src/reader_wrap.cpp | 170 ++--- src/reader_wrap.hpp | 38 - test/osmium.test.js | 104 ++- 27 files changed, 714 insertions(+), 315 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] 02/05: pristine-tar data for node-osmium_0.1.1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository node-osmium. commit 2708e8ce16994c4afc90c3f3955a93a288632576 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:29 2015 +0100 pristine-tar data for node-osmium_0.1.1.orig.tar.gz --- node-osmium_0.1.1.orig.tar.gz.delta | Bin 0 - 1790 bytes node-osmium_0.1.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/node-osmium_0.1.1.orig.tar.gz.delta b/node-osmium_0.1.1.orig.tar.gz.delta new file mode 100644 index 000..33b1da4 Binary files /dev/null and b/node-osmium_0.1.1.orig.tar.gz.delta differ diff --git a/node-osmium_0.1.1.orig.tar.gz.id b/node-osmium_0.1.1.orig.tar.gz.id new file mode 100644 index 000..88f0d29 --- /dev/null +++ b/node-osmium_0.1.1.orig.tar.gz.id @@ -0,0 +1 @@ +e9efdd3ee588bb1a5db427c6e77d87f195e68511 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] 05/05: pristine-tar data for node-osmium_0.3.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository node-osmium. commit 89753931da08872e897453f73dfec472312f259b Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:16:44 2015 +0100 pristine-tar data for node-osmium_0.3.0.orig.tar.gz --- node-osmium_0.3.0.orig.tar.gz.delta | Bin 0 - 4310 bytes node-osmium_0.3.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/node-osmium_0.3.0.orig.tar.gz.delta b/node-osmium_0.3.0.orig.tar.gz.delta new file mode 100644 index 000..d3e5974 Binary files /dev/null and b/node-osmium_0.3.0.orig.tar.gz.delta differ diff --git a/node-osmium_0.3.0.orig.tar.gz.id b/node-osmium_0.3.0.orig.tar.gz.id new file mode 100644 index 000..8fd64b3 --- /dev/null +++ b/node-osmium_0.3.0.orig.tar.gz.id @@ -0,0 +1 @@ +a78c8856a85fec555b9a109d172f3a581c7e1ab3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] 01/05: pristine-tar data for node-osmium_0.1.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository node-osmium. commit c280157b0badd6f7f8c270b0db76efd50594a590 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 14:56:23 2015 +0100 pristine-tar data for node-osmium_0.1.0.orig.tar.gz --- node-osmium_0.1.0.orig.tar.gz.delta | Bin 0 - 1509 bytes node-osmium_0.1.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/node-osmium_0.1.0.orig.tar.gz.delta b/node-osmium_0.1.0.orig.tar.gz.delta new file mode 100644 index 000..3e45fcc Binary files /dev/null and b/node-osmium_0.1.0.orig.tar.gz.delta differ diff --git a/node-osmium_0.1.0.orig.tar.gz.id b/node-osmium_0.1.0.orig.tar.gz.id new file mode 100644 index 000..543902c --- /dev/null +++ b/node-osmium_0.1.0.orig.tar.gz.id @@ -0,0 +1 @@ +7aa3d5b09e06b72d5b498ddc8d1e879df70060d4 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[node-osmium] annotated tag upstream/0.1.1 created (now 06ee035)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.1.1 in repository node-osmium. at 06ee035 (tag) tagging 80ef48b13d5f2b35469efc5a28b3dd7c42e25b32 (commit) replaces upstream/0.1.0 tagged by Bas Couwenberg on Fri Mar 6 15:16:29 2015 +0100 - Log - Upstream version 0.1.1 Bas Couwenberg (1): Imported Upstream version 0.1.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/node-osmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#779974: josm: invalid certificate
On 03/08/2015 07:01 PM, Salvo Tomaselli wrote: tried with the experimental version as well and it has the same problem. On the GUI it will ask me to check for proxy settings and in the selector to decide which area I want to edit, all the images will be missing. OK, let's find out which servers you're using. What do the tile server URLs resolve to on your end? $ for f in {a,b,c}.tile.openstreetmap.org; do host $f echo; done a.tile.openstreetmap.org is an alias for tile.geo.openstreetmap.org. tile.geo.openstreetmap.org is an alias for nl.tile.openstreetmap.org. nl.tile.openstreetmap.org is an alias for amsterdam.tile.openstreetmap.org. amsterdam.tile.openstreetmap.org has address 134.90.146.26 b.tile.openstreetmap.org is an alias for tile.geo.openstreetmap.org. tile.geo.openstreetmap.org is an alias for nl.tile.openstreetmap.org. nl.tile.openstreetmap.org is an alias for amsterdam.tile.openstreetmap.org. amsterdam.tile.openstreetmap.org has address 134.90.146.26 c.tile.openstreetmap.org is an alias for tile.geo.openstreetmap.org. tile.geo.openstreetmap.org is an alias for nl.tile.openstreetmap.org. nl.tile.openstreetmap.org is an alias for amsterdam.tile.openstreetmap.org. amsterdam.tile.openstreetmap.org has address 134.90.146.26 So I'm using the trogdor caching tile server hosting in Amsterdam, since there is no server in Italy I'm no sure which one you get. Can you send the output for the host loop above? Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#779974: josm: invalid certificate
Control: tags -1 unreproducible Hi Salvo, Thanks for reporting this issue. On 03/07/2015 10:45 AM, Salvo Tomaselli wrote: Package: josm Version: 0.0.svn7643+dfsg1-1 It may be worthwhile to upgrade to JOSM 8109 available in experimental. apparently there is an expired certificate. Failed loading https://c.tile.openstreetmap.org/10/555/396.png: sun.security.validator.ValidatorException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target and josm is completely useless as a result. The certificate for the tile you mentioned is valid until 10/19/2017 when I checked it just now. Can you try again? Maybe the OSM admins have changed the certificates in the mean time. Or the problem could be limited to a subset of the geographically distributed tile servers. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] branch master updated (277cb8e - b0ab18b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository qmapshack. from 277cb8e Revert releasing package qmapshack version 0.12.0-1~exp1 new e893da1 Enable verbose makefiles. new 99e1101 Remove unused variables in rules file. new 367351c Add upstream metadata. new 99a98f2 Imported Upstream version 1.0.0 new d640926 Merge tag 'upstream/1.0.0' new d0136c6 New upstream release. new fb82fe2 Repack upstream tarball to exclude .hg directory. new 86ffa99 Imported Upstream version 1.0.0+ds new 2cd707e Merge tag 'upstream/1.0.0+ds' new f28a3ca New repacked upstream release. new 56577b4 Imported Upstream version 1.0.0+ds1 new 1925c28 Merge tag 'upstream/1.0.0+ds1' new 683f7fa New repacked upstream release, restore erroniously excluded files. new 897207d Update my email to @debian.org address. new 9f74025 Remove patches applied upstream. new 3863779 Restructure copyright file. new d493c5c Fix local modification of CPackConfig.cmake. new b0ab18b Set distribution to experimental. The 18 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: CMakeLists.txt |4 +- CMakeLists.txt.user| 73 +- CMakeLists.txt.user = CMakeLists.txt.user.18 |2 +- CPackConfig.cmake |2 +- changelog.txt | 16 + debian/changelog | 12 + debian/control |2 +- debian/copyright | 118 +- debian/patches/01-desktop.patch| 15 - debian/patches/series |1 - debian/rules | 10 +- debian/upstream/metadata |6 + debian/watch |7 +- features.txt | 38 + qmapshack.desktop |4 +- src/CMainWindow.cpp| 1251 + src/CMainWindow.h |5 + src/CMakeLists.txt |8 +- src/GeoMath.cpp| 89 +- src/IMainWindow.ui | 13 + src/canvas/CCanvas.cpp | 23 +- src/canvas/CCanvas.h |2 +- src/canvas/IDrawObject.cpp | 18 - src/canvas/IDrawObject.h | 67 - src/dem/CDemPathSetup.cpp |4 +- src/dem/CDemVRT.cpp|7 +- src/dem/IDemList.ui| 10 +- src/dem/IDemPropSetup.ui |3 + src/device/CDeviceGarmin.cpp | 167 +- src/device/CDeviceGarmin.h | 11 +- src/device/CDeviceTwoNav.cpp | 87 + src/device/CDeviceTwoNav.h |5 + src/device/CDeviceWatcherWindows.cpp | 113 +- src/device/CDeviceWatcherWindows.h | 32 +- src/device/IDevice.cpp | 31 +- src/device/IDevice.h | 29 +- src/gis/CGisListDB.cpp |3 +- src/gis/CGisListWks.cpp| 153 +- src/gis/CGisListWks.h | 13 +- src/gis/CGisWidget.cpp |3 +- src/gis/IGisItem.cpp | 30 +- src/gis/IGisItem.h |4 +- src/gis/IGisWidget.ui |2 +- src/gis/db/CDBProject.cpp |7 +- src/gis/db/CLostFoundProject.cpp |2 +- src/gis/db/CSetupDatabase.cpp | 11 +- src/gis/db/IDB.cpp | 40 +- src/gis/gpx/CGpxProject.cpp| 55 +- src/gis/gpx/CGpxProject.h |2 +- src/gis/gpx/serialization.cpp |3 + src/gis/ovl/CDetailsOvlArea.cpp|4 +- src/gis/ovl/CGisItemOvlArea.cpp|4 +- src/gis/ovl/CGisItemOvlArea.h |2 +- src/gis/prj/CDetailsPrj.cpp| 10 +- src/gis/prj/IGisProject.cpp| 55 +- src/gis/prj/IGisProject.h |7 +- src/gis/qms/CQmsProject.cpp
[netcdf] branch upstream updated (620eaff - 2085df9)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository netcdf. from 620eaff Imported Upstream version 4.3.3.1 new 2085df9 Imported Upstream version 4.3.3.1+ds The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: autom4te.cache/output.0 | 20434 -- autom4te.cache/output.1 | 20434 -- autom4te.cache/output.2 | 20434 -- autom4te.cache/requests | 576 -- autom4te.cache/traces.0 | 3688 autom4te.cache/traces.1 | 1676 autom4te.cache/traces.2 | 3688 docs/building-with-cmake.md | 106 + 8 files changed, 106 insertions(+), 70930 deletions(-) delete mode 100644 autom4te.cache/output.0 delete mode 100644 autom4te.cache/output.1 delete mode 100644 autom4te.cache/output.2 delete mode 100644 autom4te.cache/requests delete mode 100644 autom4te.cache/traces.0 delete mode 100644 autom4te.cache/traces.1 delete mode 100644 autom4te.cache/traces.2 create mode 100644 docs/building-with-cmake.md -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 12/18: Merge tag 'upstream/1.0.0+ds1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 1925c28a7558849ac972ea40060b595e494773b9 Merge: f28a3ca 56577b4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:38:18 2015 +0100 Merge tag 'upstream/1.0.0+ds1' Upstream version 1.0.0+ds1 CMakeLists.txt | 102 + GpxExamples/COPYRIGHT | 19 + GpxExamples/qlandkarte.gpx | Bin 3185 - 3185 bytes 3 files changed, 121 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 15/18: Remove patches applied upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 9f7402519e85597a3124730729a61c75853bae8b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:41:21 2015 +0100 Remove patches applied upstream. --- debian/changelog| 1 + debian/patches/01-desktop.patch | 15 --- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4efe967..c39f4ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ qmapshack (1.0.0+ds1-1) UNRELEASED; urgency=medium * Add upstream metadata. * Repack upstream tarball to exclude .hg directory. * Update my email to @debian.org address. + * Remove patches applied upstream. -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:39:01 +0100 diff --git a/debian/patches/01-desktop.patch b/debian/patches/01-desktop.patch deleted file mode 100644 index e5b5282..000 --- a/debian/patches/01-desktop.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Provide code for Exec key -Author: Jaromír Mikeš mira.mi...@seznam.cz -Forwarded: no - a/qmapshack.desktop -+++ b/qmapshack.desktop -@@ -1,7 +1,7 @@ - [Desktop Entry] - Version=1.0 - Name=QMapShack --Exec=qmapshack -+Exec=qmapshack %U - Icon=QMapShack - Terminal=false - Type=Application diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 60365d9..000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-desktop.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 09/18: Merge tag 'upstream/1.0.0+ds'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 2cd707ebb17f40705945dbee29d28faf03145959 Merge: fb82fe2 86ffa99 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:33:27 2015 +0100 Merge tag 'upstream/1.0.0+ds' Upstream version 1.0.0+ds .hg/00changelog.i | Bin 57 - 0 bytes .../2014-08-10_14-17-09_parent_rev_212_41i_1d.bak | 60 - .../2014-08-10_14-17-09_parent_rev_212_5C3Eit.bak | 124 -- .../2014-08-10_14-17-09_parent_rev_212_5yS1bt.bak | 329 .../2014-08-10_14-17-09_parent_rev_212_63JmLB.bak | 86 - .../2014-08-10_14-17-09_parent_rev_212_6f2vC4.bak |0 .../2014-08-10_14-17-09_parent_rev_212_8xXTxE.bak | 93 -- .../2014-08-10_14-17-09_parent_rev_212_E5WdFy.bak |0 .../2014-08-10_14-17-09_parent_rev_212_EUeX2W.bak | 63 - .../2014-08-10_14-17-09_parent_rev_212_H2s6va.bak | 350 .../2014-08-10_14-17-09_parent_rev_212_HGPpdo.bak | 77 - .../2014-08-10_14-17-09_parent_rev_212_IPn_yT.bak | 239 --- .../2014-08-10_14-17-09_parent_rev_212_KAC_3x.bak | 122 -- .../2014-08-10_14-17-09_parent_rev_212_M_J4ty.bak | 100 -- .../2014-08-10_14-17-09_parent_rev_212_Mwh9Qb.bak | 156 -- .../2014-08-10_14-17-09_parent_rev_212_Nvr8BO.bak | 362 .../2014-08-10_14-17-09_parent_rev_212_O2w2no.bak | 27 - .../2014-08-10_14-17-09_parent_rev_212_Ozaask.bak | 186 --- .../2014-08-10_14-17-09_parent_rev_212_PVfnen.bak | 109 -- .../2014-08-10_14-17-09_parent_rev_212_Q80F4i.bak | 115 -- .../2014-08-10_14-17-09_parent_rev_212_QYFq9x.bak | 198 --- .../2014-08-10_14-17-09_parent_rev_212_QhKuka.bak | 69 - .../2014-08-10_14-17-09_parent_rev_212_RHnNae.bak | 219 --- .../2014-08-10_14-17-09_parent_rev_212_TbVumX.bak | 175 -- .../2014-08-10_14-17-09_parent_rev_212_TlaYCc.bak | 55 - .../2014-08-10_14-17-09_parent_rev_212_V50HTU.bak | 512 -- .../2014-08-10_14-17-09_parent_rev_212_WQ5EF6.bak | 220 --- .../2014-08-10_14-17-09_parent_rev_212_Wvm2XK.bak | 348 .../2014-08-10_14-17-09_parent_rev_212_XyikZV.bak | 88 - .../2014-08-10_14-17-09_parent_rev_212_XzwqFK.bak | 74 - .../2014-08-10_14-17-09_parent_rev_212_ZQmjwC.bak | 145 -- .../2014-08-10_14-17-09_parent_rev_212__FyHdw.bak | 227 --- .../2014-08-10_14-17-09_parent_rev_212__oamrT.bak | 250 --- .../2014-08-10_14-17-09_parent_rev_212__xosYF.bak | 173 -- .../2014-08-10_14-17-09_parent_rev_212_aFBa4m.bak | 533 -- .../2014-08-10_14-17-09_parent_rev_212_c8KLTi.bak | 31 - .../2014-08-10_14-17-09_parent_rev_212_cFEYOV.bak | 113 -- .../2014-08-10_14-17-09_parent_rev_212_dQbVnU.bak | 127 -- .../2014-08-10_14-17-09_parent_rev_212_dXCOib.bak | 140 -- .../2014-08-10_14-17-09_parent_rev_212_gPbjzI.bak | 360 .../2014-08-10_14-17-09_parent_rev_212_irk_tW.bak | 406 - .../2014-08-10_14-17-09_parent_rev_212_jkEjw8.bak | 15 - .../2014-08-10_14-17-09_parent_rev_212_pZMY9I.bak | 466 -- .../2014-08-10_14-17-09_parent_rev_212_s1NHwd.bak |0 .../2014-08-10_14-17-09_parent_rev_212_uCwhiy.bak | 317 .../2014-08-10_14-17-09_parent_rev_212_ygOGzc.bak | 374 - .../2015-02-22_12-03-51_parent_rev_750_8rXOP9.bak | 14 - .../2015-02-22_12-03-51_parent_rev_750_BKqvxh.bak | 30 - .../2015-02-22_12-03-51_parent_rev_750_Yt2BGo.bak | 11 - .../2015-02-22_12-03-51_parent_rev_750_oX1H7k.bak |0 .../2015-02-22_12-03-51_parent_rev_750_q0CIcf.bak |0 .../2015-02-22_12-03-51_parent_rev_750_urUEGg.bak | 14 - .hg/Trashcan/CDetailsTrk_6SCvxa.cpp.bak| 373 - .hg/Trashcan/CDetailsTrk_8daxWy.cpp.bak| 371 - .hg/Trashcan/CDetailsWpt_JkBB6Z.h.bak | 44 - .hg/Trashcan/CDetailsWpt_KUyyGh.cpp.bak| 178 -- .hg/Trashcan/CDetailsWpt_VqnTW1.cpp.bak| 153 -- .hg/Trashcan/CDetailsWpt_wgDUq1.h.bak | 46 - .hg/Trashcan/CDiskCache_ZGaMAX.cpp.bak | 156 -- .hg/Trashcan/CDiskCache_ceXfpe.cpp.bak | 157 -- .hg/Trashcan/CGisItemTrk_RakRPD.cpp.bak| 1729 .hg/Trashcan/CGisItemTrk_jYp8hv.h.bak | 619 --- .hg/Trashcan/CGisItemWpt_dhk314.cpp.bak| 458 -- .hg/Trashcan/CGisItemWpt_lZD09f.h.bak | 117 -- .hg/Trashcan/CGisItemWpt_qCGlIQ.cpp.bak| 476 -- .hg/Trashcan/CGisItemWpt_v6zJBd.h.bak | 119 -- .hg/Trashcan/CGisListWks_3x8ATJ.cpp.bak| 1110 - .hg/Trashcan/CGisListWks_HrzlcL.cpp.bak| 159 -- .hg/Trashcan/CGisListWks_N1Po8J.cpp.bak| 1122 - .hg/Trashcan/CGisListWks_w3G0J5.cpp.bak| 164 -- .hg/Trashcan/CGisWidget_0r6eN4.cpp.bak | 215 --- .hg/Trashcan/CGisWidget_1Gl0ex.cpp.bak | 217 --- .hg/Trashcan/CMakeLists_OYf8I5.txt.bak | 102 --
[qmapshack] 03/18: Add upstream metadata.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 367351c1d63be7d3247107c24083c79db216e8e4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Feb 16 16:47:32 2015 +0100 Add upstream metadata. --- debian/changelog | 1 + debian/upstream/metadata | 6 ++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2342782..c2e7a14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ qmapshack (0.12.0-1~exp2) UNRELEASED; urgency=medium * Enable verbose makefiles. * Remove unused variables in rules file. + * Add upstream metadata. -- Bas Couwenberg sebas...@xs4all.nl Mon, 16 Feb 2015 16:37:45 +0100 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 000..8f142ad --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +--- +Bug-Database: https://bitbucket.org/maproom/qmapshack/issues +Contact: Oliver Eichler oliver.eich...@gmx.de +Name: QMapShack +Repository: https://bitbucket.org/maproom/qmapshack +Repository-Browse: https://bitbucket.org/maproom/qmapshack/src -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 05/18: Merge tag 'upstream/1.0.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit d6409268040e60212c1d8422be0e7b984143aa51 Merge: 367351c 99a98f2 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:20:33 2015 +0100 Merge tag 'upstream/1.0.0' Upstream version 1.0.0 .hg/00changelog.i | Bin 0 - 57 bytes .../2014-08-10_14-17-09_parent_rev_212_41i_1d.bak | 60 + .../2014-08-10_14-17-09_parent_rev_212_5C3Eit.bak | 124 + .../2014-08-10_14-17-09_parent_rev_212_5yS1bt.bak | 329 +++ .../2014-08-10_14-17-09_parent_rev_212_63JmLB.bak | 86 + .../2014-08-10_14-17-09_parent_rev_212_6f2vC4.bak |0 .../2014-08-10_14-17-09_parent_rev_212_8xXTxE.bak | 93 + .../2014-08-10_14-17-09_parent_rev_212_E5WdFy.bak |0 .../2014-08-10_14-17-09_parent_rev_212_EUeX2W.bak | 63 + .../2014-08-10_14-17-09_parent_rev_212_H2s6va.bak | 350 +++ .../2014-08-10_14-17-09_parent_rev_212_HGPpdo.bak | 77 + .../2014-08-10_14-17-09_parent_rev_212_IPn_yT.bak | 239 ++ .../2014-08-10_14-17-09_parent_rev_212_KAC_3x.bak | 122 + .../2014-08-10_14-17-09_parent_rev_212_M_J4ty.bak | 100 + .../2014-08-10_14-17-09_parent_rev_212_Mwh9Qb.bak | 156 ++ .../2014-08-10_14-17-09_parent_rev_212_Nvr8BO.bak | 362 +++ .../2014-08-10_14-17-09_parent_rev_212_O2w2no.bak | 27 + .../2014-08-10_14-17-09_parent_rev_212_Ozaask.bak | 186 ++ .../2014-08-10_14-17-09_parent_rev_212_PVfnen.bak | 109 + .../2014-08-10_14-17-09_parent_rev_212_Q80F4i.bak | 115 + .../2014-08-10_14-17-09_parent_rev_212_QYFq9x.bak | 198 ++ .../2014-08-10_14-17-09_parent_rev_212_QhKuka.bak | 69 + .../2014-08-10_14-17-09_parent_rev_212_RHnNae.bak | 219 ++ .../2014-08-10_14-17-09_parent_rev_212_TbVumX.bak | 175 ++ .../2014-08-10_14-17-09_parent_rev_212_TlaYCc.bak | 55 + .../2014-08-10_14-17-09_parent_rev_212_V50HTU.bak | 512 .../2014-08-10_14-17-09_parent_rev_212_WQ5EF6.bak | 220 ++ .../2014-08-10_14-17-09_parent_rev_212_Wvm2XK.bak | 348 +++ .../2014-08-10_14-17-09_parent_rev_212_XyikZV.bak | 88 + .../2014-08-10_14-17-09_parent_rev_212_XzwqFK.bak | 74 + .../2014-08-10_14-17-09_parent_rev_212_ZQmjwC.bak | 145 + .../2014-08-10_14-17-09_parent_rev_212__FyHdw.bak | 227 ++ .../2014-08-10_14-17-09_parent_rev_212__oamrT.bak | 250 ++ .../2014-08-10_14-17-09_parent_rev_212__xosYF.bak | 173 ++ .../2014-08-10_14-17-09_parent_rev_212_aFBa4m.bak | 533 .../2014-08-10_14-17-09_parent_rev_212_c8KLTi.bak | 31 + .../2014-08-10_14-17-09_parent_rev_212_cFEYOV.bak | 113 + .../2014-08-10_14-17-09_parent_rev_212_dQbVnU.bak | 127 + .../2014-08-10_14-17-09_parent_rev_212_dXCOib.bak | 140 + .../2014-08-10_14-17-09_parent_rev_212_gPbjzI.bak | 360 +++ .../2014-08-10_14-17-09_parent_rev_212_irk_tW.bak | 406 +++ .../2014-08-10_14-17-09_parent_rev_212_jkEjw8.bak | 15 + .../2014-08-10_14-17-09_parent_rev_212_pZMY9I.bak | 466 .../2014-08-10_14-17-09_parent_rev_212_s1NHwd.bak |0 .../2014-08-10_14-17-09_parent_rev_212_uCwhiy.bak | 317 +++ .../2014-08-10_14-17-09_parent_rev_212_ygOGzc.bak | 374 +++ .../2015-02-22_12-03-51_parent_rev_750_8rXOP9.bak | 14 + .../2015-02-22_12-03-51_parent_rev_750_BKqvxh.bak | 30 + .../2015-02-22_12-03-51_parent_rev_750_Yt2BGo.bak | 11 + .../2015-02-22_12-03-51_parent_rev_750_oX1H7k.bak |0 .../2015-02-22_12-03-51_parent_rev_750_q0CIcf.bak |0 .../2015-02-22_12-03-51_parent_rev_750_urUEGg.bak | 14 + .../Trashcan/CDetailsTrk_6SCvxa.cpp.bak| 78 +- .../Trashcan/CDetailsTrk_8daxWy.cpp.bak| 80 +- .../Trashcan/CDetailsWpt_JkBB6Z.h.bak | 29 +- .../Trashcan/CDetailsWpt_KUyyGh.cpp.bak| 155 +- .../Trashcan/CDetailsWpt_VqnTW1.cpp.bak| 142 +- .../Trashcan/CDetailsWpt_wgDUq1.h.bak | 35 +- .../Trashcan/CDiskCache_ZGaMAX.cpp.bak |7 +- .../Trashcan/CDiskCache_ceXfpe.cpp.bak |8 +- .../Trashcan/CGisItemTrk_RakRPD.cpp.bak| 108 +- .../Trashcan/CGisItemTrk_jYp8hv.h.bak | 54 +- .hg/Trashcan/CGisItemWpt_dhk314.cpp.bak| 458 .hg/Trashcan/CGisItemWpt_lZD09f.h.bak | 117 + .hg/Trashcan/CGisItemWpt_qCGlIQ.cpp.bak| 476 .hg/Trashcan/CGisItemWpt_v6zJBd.h.bak | 119 + .../Trashcan/CGisListWks_3x8ATJ.cpp.bak| 384 +-- .hg/Trashcan/CGisListWks_HrzlcL.cpp.bak| 159 ++ .../Trashcan/CGisListWks_N1Po8J.cpp.bak| 370 +-- .hg/Trashcan/CGisListWks_w3G0J5.cpp.bak| 164 ++ .hg/Trashcan/CGisWidget_0r6eN4.cpp.bak | 215 ++ .hg/Trashcan/CGisWidget_1Gl0ex.cpp.bak | 217 ++ .../Trashcan/CMakeLists_OYf8I5.txt.bak |4 +- .hg/Trashcan/CMakeLists_SIS4BY.txt.bak | 256 ++ .../Trashcan/CMakeLists_XwOIvC.txt.bak |6 +-
[qmapshack] tag debian/1.0.0+ds1-1.exp1 created (now b0ab18b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.0.0+ds1-1.exp1 in repository qmapshack. at b0ab18b (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 01/03: pristine-tar data for qmapshack_1.0.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository qmapshack. commit 28d8501ad983adee1c94b8384f2801a35ab0478c Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:20:33 2015 +0100 pristine-tar data for qmapshack_1.0.0.orig.tar.gz --- qmapshack_1.0.0.orig.tar.gz.delta | Bin 0 - 79381 bytes qmapshack_1.0.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/qmapshack_1.0.0.orig.tar.gz.delta b/qmapshack_1.0.0.orig.tar.gz.delta new file mode 100644 index 000..bda69fa Binary files /dev/null and b/qmapshack_1.0.0.orig.tar.gz.delta differ diff --git a/qmapshack_1.0.0.orig.tar.gz.id b/qmapshack_1.0.0.orig.tar.gz.id new file mode 100644 index 000..94064a3 --- /dev/null +++ b/qmapshack_1.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +dcb9fbe975cafb2b2f01ec4052ceea31b0d4019f -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] annotated tag upstream/1.0.0+ds1 created (now e4cad5b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.0.0+ds1 in repository qmapshack. at e4cad5b (tag) tagging 56577b4ff3248eacc9e944fabffcb93732db45f6 (commit) replaces upstream/1.0.0+ds tagged by Bas Couwenberg on Sat Mar 7 13:38:18 2015 +0100 - Log - Upstream version 1.0.0+ds1 Bas Couwenberg (1): Imported Upstream version 1.0.0+ds1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] annotated tag upstream/1.0.0 created (now 0318d40)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.0.0 in repository qmapshack. at 0318d40 (tag) tagging 99a98f2ade0c8043b400afc932a4293a2036a107 (commit) replaces upstream/0.12.0 tagged by Bas Couwenberg on Sat Mar 7 13:20:33 2015 +0100 - Log - Upstream version 1.0.0 Bas Couwenberg (1): Imported Upstream version 1.0.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] branch upstream updated (c7e12fc - 56577b4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository qmapshack. from c7e12fc Imported Upstream version 0.12.0 new 99a98f2 Imported Upstream version 1.0.0 new 86ffa99 Imported Upstream version 1.0.0+ds new 56577b4 Imported Upstream version 1.0.0+ds1 The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: CMakeLists.txt |4 +- CMakeLists.txt.user| 73 +- CMakeLists.txt.user = CMakeLists.txt.user.18 |2 +- CPackConfig.cmake |2 +- changelog.txt | 16 + features.txt | 38 + qmapshack.desktop |4 +- src/CMainWindow.cpp| 1251 + src/CMainWindow.h |5 + src/CMakeLists.txt |8 +- src/GeoMath.cpp| 89 +- src/IMainWindow.ui | 13 + src/canvas/CCanvas.cpp | 23 +- src/canvas/CCanvas.h |2 +- src/canvas/IDrawObject.cpp | 18 - src/canvas/IDrawObject.h | 67 - src/dem/CDemPathSetup.cpp |4 +- src/dem/CDemVRT.cpp|7 +- src/dem/IDemList.ui| 10 +- src/dem/IDemPropSetup.ui |3 + src/device/CDeviceGarmin.cpp | 167 +- src/device/CDeviceGarmin.h | 11 +- src/device/CDeviceTwoNav.cpp | 87 + src/device/CDeviceTwoNav.h |5 + src/device/CDeviceWatcherWindows.cpp | 113 +- src/device/CDeviceWatcherWindows.h | 32 +- src/device/IDevice.cpp | 31 +- src/device/IDevice.h | 29 +- src/gis/CGisListDB.cpp |3 +- src/gis/CGisListWks.cpp| 153 +- src/gis/CGisListWks.h | 13 +- src/gis/CGisWidget.cpp |3 +- src/gis/IGisItem.cpp | 30 +- src/gis/IGisItem.h |4 +- src/gis/IGisWidget.ui |2 +- src/gis/db/CDBProject.cpp |7 +- src/gis/db/CLostFoundProject.cpp |2 +- src/gis/db/CSetupDatabase.cpp | 11 +- src/gis/db/IDB.cpp | 40 +- src/gis/gpx/CGpxProject.cpp| 55 +- src/gis/gpx/CGpxProject.h |2 +- src/gis/gpx/serialization.cpp |3 + src/gis/ovl/CDetailsOvlArea.cpp|4 +- src/gis/ovl/CGisItemOvlArea.cpp|4 +- src/gis/ovl/CGisItemOvlArea.h |2 +- src/gis/prj/CDetailsPrj.cpp| 10 +- src/gis/prj/IGisProject.cpp| 55 +- src/gis/prj/IGisProject.h |7 +- src/gis/qms/CQmsProject.cpp| 12 +- src/gis/rte/CGisItemRte.cpp|4 +- src/gis/rte/CGisItemRte.h |2 +- src/gis/search/CSearchGoogle.cpp |4 +- src/gis/tnv/CTwoNavProject.cpp | 282 ++ src/gis/tnv/CTwoNavProject.h | 77 + src/gis/tnv/serialization.cpp | 753 ++ src/gis/trk/CDetailsTrk.cpp| 60 +- src/gis/trk/CDetailsTrk.h |3 +- src/gis/trk/CGisItemTrk.cpp| 135 +- src/gis/trk/CGisItemTrk.h | 50 +- src/gis/trk/IDetailsTrk.ui | 663 +++-- src/gis/trk/filter/filter.cpp |2 +- src/gis/wpt/CDetailsGeoCache.cpp | 164 +- src/gis/wpt/CDetailsGeoCache.h |8 + src/gis/wpt/CDetailsWpt.cpp| 14 +- src/gis/wpt/CGisItemWpt.cpp| 51 +- src/gis/wpt/CGisItemWpt.h | 82 +- src/gis/wpt/CProjWpt.cpp |2 +- src/gis/wpt/IDetailsGeoCache.ui| 152 +- src/grid/CGridSetup.cpp|6 +- src/grid/CProjWizard.cpp |6 +- src/helpers/CPhotoAlbum.cpp
[qmapshack] 07/18: Repack upstream tarball to exclude .hg directory.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit fb82fe22ce799fa83a021259231c8ef15743909b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:33:11 2015 +0100 Repack upstream tarball to exclude .hg directory. --- CPackConfig.cmake | 2 +- debian/changelog | 1 + debian/copyright | 1 + debian/watch | 7 +-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CPackConfig.cmake b/CPackConfig.cmake index b03b04b..4b0a063 100644 --- a/CPackConfig.cmake +++ b/CPackConfig.cmake @@ -18,7 +18,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSI ### source package settings set(CPACK_SOURCE_GENERATOR TGZ) -set(CPACK_SOURCE_IGNORE_FILES ~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.]) +set(CPACK_SOURCE_IGNORE_FILES ~$;[.]swp$;/[.]svn/;/[.]git/;[.]hg/;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.]) set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) include(CPack) diff --git a/debian/changelog b/debian/changelog index eb8f41d..7726798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ qmapshack (1.0.0-1) UNRELEASED; urgency=medium * Enable verbose makefiles. * Remove unused variables in rules file. * Add upstream metadata. + * Repack upstream tarball to exclude .hg directory. -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:20:57 +0100 diff --git a/debian/copyright b/debian/copyright index aa4224c..e4d0997 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,7 @@ Upstream-Name: QMapShack Upstream-Contact: Oliver Eichler oliver.eich...@gmx.de Source: https://bitbucket.org/maproom/qmapshack/downloads Copyright: 2006-2014, Oliver Eichler oliver.eich...@gmx.de +Files-Excluded: .hg/* Files: * Copyright: diff --git a/debian/watch b/debian/watch index e54c07c..9369248 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,6 @@ version=3 -opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ -https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-([\d.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\ +repacksuffix=+ds \ +https://bitbucket.org/maproom/qmapshack/downloads/ \ +qmapshack-([\d.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 13/18: New repacked upstream release, restore erroniously excluded files.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 683f7fa028bd28d857e5d9be206df2d5ed176c44 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:39:46 2015 +0100 New repacked upstream release, restore erroniously excluded files. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd18783..f4aca64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qmapshack (1.0.0+ds-1) UNRELEASED; urgency=medium +qmapshack (1.0.0+ds1-1) UNRELEASED; urgency=medium * New upstream release. * Enable verbose makefiles. @@ -6,7 +6,7 @@ qmapshack (1.0.0+ds-1) UNRELEASED; urgency=medium * Add upstream metadata. * Repack upstream tarball to exclude .hg directory. - -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:33:44 +0100 + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:39:01 +0100 qmapshack (0.12.0-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 17/18: Fix local modification of CPackConfig.cmake.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit d493c5c726195f1de51a2923b7f4e064e8807b83 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 14:07:19 2015 +0100 Fix local modification of CPackConfig.cmake. --- CPackConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CPackConfig.cmake b/CPackConfig.cmake index 4b0a063..b03b04b 100644 --- a/CPackConfig.cmake +++ b/CPackConfig.cmake @@ -18,7 +18,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSI ### source package settings set(CPACK_SOURCE_GENERATOR TGZ) -set(CPACK_SOURCE_IGNORE_FILES ~$;[.]swp$;/[.]svn/;/[.]git/;[.]hg/;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.]) +set(CPACK_SOURCE_IGNORE_FILES ~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.]) set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) include(CPack) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 14/18: Update my email to @debian.org address.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 897207d5ed58b14b20fab749c12d12f38bbbd4b3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:40:19 2015 +0100 Update my email to @debian.org address. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f4aca64..4efe967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qmapshack (1.0.0+ds1-1) UNRELEASED; urgency=medium * Remove unused variables in rules file. * Add upstream metadata. * Repack upstream tarball to exclude .hg directory. + * Update my email to @debian.org address. -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:39:01 +0100 diff --git a/debian/control b/debian/control index 9fb0a1d..e910c0a 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: qmapshack Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Jaromír Mikeš mira.mi...@seznam.cz, - Bas Couwenberg sebas...@xs4all.nl + Bas Couwenberg sebas...@debian.org Section: science Priority: optional Build-Depends: cmake, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 11/18: Imported Upstream version 1.0.0+ds1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 56577b4ff3248eacc9e944fabffcb93732db45f6 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:38:16 2015 +0100 Imported Upstream version 1.0.0+ds1 --- CMakeLists.txt | 102 + GpxExamples/COPYRIGHT | 19 + GpxExamples/qlandkarte.gpx | Bin 3185 - 3185 bytes 3 files changed, 121 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 000..95b1823 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,102 @@ +cmake_minimum_required(VERSION 3.0.0) + +project(QMapShack) + +# has to be removed later on + +if(UNIX) +#set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /opt/Qt/5.3/gcc_64) +endif(UNIX) + + +if(WIN32) +set(QT_DEV_PATHCACHE PATH Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.3\\msvc2013_64) +set(GDAL_DEV_PATH CACHE PATH Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal) +set(PROJ_DEV_PATH CACHE PATH Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ) +set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DEV_PATH}) +endif(WIN32) + + +set(APPLICATION_NAME qmapshack) + +set(APPLICATION_VERSION_MAJOR 1) +set(APPLICATION_VERSION_MINOR 0) +set(APPLICATION_VERSION_PATCH 0) + +add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME}) + + +if (APPLE) + set(PROGNAME QMapShack) + set(CONFIGDIR Library/Application Support/${PROGNAME}/) + set(MAC_BUNDLE_PATH ${EXECUTABLE_OUTPUT_PATH}/${PROGNAME}.app) + set(MAC_ICON_FILE qmapshack.icns) + set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}) + set(MACOSX_BUNDLE_ICON_FILE ${MAC_ICON_FILE}) + set(MACOSX_BUNDLE_BUNDLE_NAME ${PROGNAME}) + set(MACOSX_BUNDLE_BUNDLE_VERSION ${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}) + set(MACOSX_BUNDLE_GUI_IDENTIFIER org.qlandkarte.QMapShack) +else(APPLE) + set(PROGNAME qmapshack) + set(CONFIGDIR .config/QLandkarte/) +endif(APPLE) +if(MSVC) + # Add link-time code generation to improve performance + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} /GL) + set(CMAKE_EXE_LINKER_FLAGS_RELEASE${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG) + set(CMAKE_MODULE_LINKER_FLAGS_RELEASE ${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG) + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG) +endif(MSVC) + +# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked +set(CMAKE_MODULE_PATH + ${CMAKE_SOURCE_DIR}/cmake/Modules +) + +# add definitions +include(DefineCMakeDefaults) +include(DefineCompilerFlags) +include(DefineInstallationPaths) +include(CPackConfig.cmake) + +include(ConfigureChecks.cmake) +configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) + + +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) +add_subdirectory(3rdparty/CGetOpt) +#add_subdirectory(3rdparty/DBConverter) +add_subdirectory(src) + + +if (UNIX AND NOT WIN32 AND NOT APPLE) + install( +FILES + qmapshack.desktop +DESTINATION + ${XDG_APPS_DIR} + ) + + install( +FILES + src/icons/48x48/QMapShack.png +DESTINATION + ${DATA_INSTALL_PREFIX}/pixmaps + ) + + install( +FILES + qmapshack.1 +DESTINATION + ${MAN_INSTALL_DIR}/man1 + ) +endif (UNIX AND NOT WIN32 AND NOT APPLE) + +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake + IMMEDIATE @ONLY) + +ADD_CUSTOM_TARGET(uninstall + ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) + diff --git a/GpxExamples/COPYRIGHT b/GpxExamples/COPYRIGHT new file mode 100644 index 000..fff30ea --- /dev/null +++ b/GpxExamples/COPYRIGHT @@ -0,0 +1,19 @@ +*.gpx files in this dir are created by Oliver Eichler oliver.eich...@gmx.de and released under GPL-3.0+ license + +/** +Copyright (C) 2014 Oliver Eichler oliver.eich...@gmx.de + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see http://www.gnu.org/licenses/. +
[qmapshack] 18/18: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit b0ab18b3ed6628e915fe07573b4f7a9147e57138 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 14:31:49 2015 +0100 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c39f4ad..3a4d48e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qmapshack (1.0.0+ds1-1) UNRELEASED; urgency=medium +qmapshack (1.0.0+ds1-1~exp1) experimental; urgency=medium * New upstream release. * Enable verbose makefiles. @@ -8,7 +8,7 @@ qmapshack (1.0.0+ds1-1) UNRELEASED; urgency=medium * Update my email to @debian.org address. * Remove patches applied upstream. - -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:39:01 +0100 + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 14:31:31 +0100 qmapshack (0.12.0-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 02/03: pristine-tar data for qmapshack_1.0.0+ds.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository qmapshack. commit 6357a04a97f49a214f57fd47b4d9aeecde4c7156 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:33:27 2015 +0100 pristine-tar data for qmapshack_1.0.0+ds.orig.tar.gz --- qmapshack_1.0.0+ds.orig.tar.gz.delta | Bin 0 - 38605 bytes qmapshack_1.0.0+ds.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/qmapshack_1.0.0+ds.orig.tar.gz.delta b/qmapshack_1.0.0+ds.orig.tar.gz.delta new file mode 100644 index 000..164c870 Binary files /dev/null and b/qmapshack_1.0.0+ds.orig.tar.gz.delta differ diff --git a/qmapshack_1.0.0+ds.orig.tar.gz.id b/qmapshack_1.0.0+ds.orig.tar.gz.id new file mode 100644 index 000..cfdd27e --- /dev/null +++ b/qmapshack_1.0.0+ds.orig.tar.gz.id @@ -0,0 +1 @@ +cc259642498de8427d43a4fc5bddf47a6a1909bc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 03/03: pristine-tar data for qmapshack_1.0.0+ds1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository qmapshack. commit c41725718f1a6c53b8c3f9358cd59b903f72ed8f Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:38:18 2015 +0100 pristine-tar data for qmapshack_1.0.0+ds1.orig.tar.gz --- qmapshack_1.0.0+ds1.orig.tar.gz.delta | Bin 0 - 38612 bytes qmapshack_1.0.0+ds1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/qmapshack_1.0.0+ds1.orig.tar.gz.delta b/qmapshack_1.0.0+ds1.orig.tar.gz.delta new file mode 100644 index 000..e2a33ed Binary files /dev/null and b/qmapshack_1.0.0+ds1.orig.tar.gz.delta differ diff --git a/qmapshack_1.0.0+ds1.orig.tar.gz.id b/qmapshack_1.0.0+ds1.orig.tar.gz.id new file mode 100644 index 000..b21e12b --- /dev/null +++ b/qmapshack_1.0.0+ds1.orig.tar.gz.id @@ -0,0 +1 @@ +22b8073092415f174a41856cfcd79b66764f75b7 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 10/18: New repacked upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit f28a3ca719a40960aaae4c5679af50089cf7e287 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:34:03 2015 +0100 New repacked upstream release. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7726798..fd18783 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qmapshack (1.0.0-1) UNRELEASED; urgency=medium +qmapshack (1.0.0+ds-1) UNRELEASED; urgency=medium * New upstream release. * Enable verbose makefiles. @@ -6,7 +6,7 @@ qmapshack (1.0.0-1) UNRELEASED; urgency=medium * Add upstream metadata. * Repack upstream tarball to exclude .hg directory. - -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:20:57 +0100 + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:33:44 +0100 qmapshack (0.12.0-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 16/18: Restructure copyright file.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 3863779684819d4ce6631043786a12d4a07184e0 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 14:01:40 2015 +0100 Restructure copyright file. --- debian/copyright | 117 +-- 1 file changed, 53 insertions(+), 64 deletions(-) diff --git a/debian/copyright b/debian/copyright index e4d0997..6d08e64 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,26 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: QMapShack Upstream-Contact: Oliver Eichler oliver.eich...@gmx.de Source: https://bitbucket.org/maproom/qmapshack/downloads -Copyright: 2006-2014, Oliver Eichler oliver.eich...@gmx.de Files-Excluded: .hg/* Files: * -Copyright: - 2006-2009, 2012, 2014, Oliver Eichler oliver.eich...@gmx.de -License: GPL-3.0+ +Copyright: 2006-2009, 2012, 2014, Oliver Eichler oliver.eich...@gmx.de +License: GPL-3+ -Files: - src/helpers/Platform.h -Copyright: - 2009, Albrecht Dre albrecht.dr...@arcor.de -License: GPL-3.0+ +Files: src/helpers/Platform.h +Copyright: 2009, Albrecht Dreß albrecht.dr...@arcor.de +License: GPL-3+ Files: src/helpers/CAppOpts.h Copyright: 2009, Joerg Wunsch j...@uriah.heep.sax.de -License: GPL-3.0+ +License: GPL-3+ -Files: - src/GeoMath.cpp +Files: src/GeoMath.cpp src/GeoMath.h src/units/CUnitImperial.cpp src/units/CUnitImperial.h @@ -31,33 +26,28 @@ Files: src/units/CUnitNautic.h src/units/IUnit.cpp src/units/IUnit.h -Copyright: - 2008-2009, Oliver Eichler oliver.eich...@gmx.de -License: GPL-2.0+ +Copyright: 2008-2009, Oliver Eichler oliver.eich...@gmx.de +License: GPL-2+ -Files: - 3rdparty/CGetOpt/CGetOpt.h +Files: 3rdparty/CGetOpt/CGetOpt.h 3rdparty/CGetOpt/CGetOpt.cpp -Copyright: - 2003-2004, froglogic Porten Stadlbauer GbR +Copyright: 2003-2004, froglogic Porten Stadlbauer GbR License: BSD-3-Clause -Files: - src/icons/cache/* -Copyright: - *No copyright* +Files: src/icons/cache/* +Copyright: *No copyright* +Comment: All icons in this directory are from the Open Cache Manager project + http://opencachemanage.sourceforge.net/ License: Apache-2.0 -Files: - src/animation/* -Copyright: - *No copyright* +Files: src/animation/* +Copyright: *No copyright* +Comment: Loading indicators are from: + http://ajaxload.info/ License: WTFPL-2 -Files: - src/cursors/* -Copyright: - *No copyright* +Files: src/cursors/* +Copyright: disclaimed License: public-domain Released to Public Domain . @@ -70,14 +60,13 @@ License: public-domain Files: src/helpers/CTextEditWidget.cpp src/helpers/CTextEditWidget.h Copyright: 2012, Digia Plc and/or its subsidiary(-ies) -License: QT-Commercial or GPL-3.0 or LGPL-2.1 with Digia Qt LGPL Exception 1.1 +License: QT-Commercial or GPL-3 or LGPL-2.1 with Digia Qt LGPL Exception 1.1 Files: debian/* -Copyright: - 2014, Jaromír Mikeš mira.mi...@seznam.cz -License: GPL-3.0+ +Copyright: 2014, Jaromír Mikeš mira.mi...@seznam.cz +License: GPL-3+ -License: GPL-3.0+ +License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -87,27 +76,41 @@ License: GPL-3.0+ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -Comment: You should have received a copy of the GNU General Public License + . + On Debian systems, the full text of the GNU General Public License + version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. + +License: GPL-3 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + . + 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. -License: GPL-2.0+ - This program is free software: you can redistribute it and/or modify +License: GPL-2+ + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . - This package is distributed in the hope
[qmapshack] branch pristine-tar updated (fad11ec - c417257)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository qmapshack. from fad11ec pristine-tar data for qmapshack_0.12.0.orig.tar.gz new 28d8501 pristine-tar data for qmapshack_1.0.0.orig.tar.gz new 6357a04 pristine-tar data for qmapshack_1.0.0+ds.orig.tar.gz new c417257 pristine-tar data for qmapshack_1.0.0+ds1.orig.tar.gz The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: qmapshack_1.0.0+ds.orig.tar.gz.delta | Bin 0 - 38605 bytes qmapshack_1.0.0+ds.orig.tar.gz.id | 1 + qmapshack_1.0.0+ds1.orig.tar.gz.delta | Bin 0 - 38612 bytes qmapshack_1.0.0+ds1.orig.tar.gz.id| 1 + qmapshack_1.0.0.orig.tar.gz.delta | Bin 0 - 79381 bytes qmapshack_1.0.0.orig.tar.gz.id| 1 + 6 files changed, 3 insertions(+) create mode 100644 qmapshack_1.0.0+ds.orig.tar.gz.delta create mode 100644 qmapshack_1.0.0+ds.orig.tar.gz.id create mode 100644 qmapshack_1.0.0+ds1.orig.tar.gz.delta create mode 100644 qmapshack_1.0.0+ds1.orig.tar.gz.id create mode 100644 qmapshack_1.0.0.orig.tar.gz.delta create mode 100644 qmapshack_1.0.0.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 01/18: Enable verbose makefiles.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit e893da19e35cbbe35aa18847c9a6e863dda2a97e Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Feb 16 16:37:54 2015 +0100 Enable verbose makefiles. --- debian/changelog | 6 ++ debian/rules | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0e0f32c..687334e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qmapshack (0.12.0-1~exp2) UNRELEASED; urgency=medium + + * Enable verbose makefiles. + + -- Bas Couwenberg sebas...@xs4all.nl Mon, 16 Feb 2015 16:37:45 +0100 + qmapshack (0.12.0-1~exp1) experimental; urgency=medium * New upstream release. diff --git a/debian/rules b/debian/rules index 4cd5fbc..f3b3405 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,9 @@ export QT_SELECT := qt5 %: dh $@ --parallel +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1 + override_dh_auto_build: $(RM) $(CURDIR)/src/icons/16x16/* $(RM) $(CURDIR)/src/icons/32x32/* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 02/18: Remove unused variables in rules file.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit 99e110166e4017ef54723eedad6bf725839b39f7 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Feb 16 16:38:36 2015 +0100 Remove unused variables in rules file. --- debian/changelog | 1 + debian/rules | 7 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 687334e..2342782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ qmapshack (0.12.0-1~exp2) UNRELEASED; urgency=medium * Enable verbose makefiles. + * Remove unused variables in rules file. -- Bas Couwenberg sebas...@xs4all.nl Mon, 16 Feb 2015 16:37:45 +0100 diff --git a/debian/rules b/debian/rules index f3b3405..39665d5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,8 @@ #!/usr/bin/make -f -# one ring to rule them all ... - -upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+repack\d+)?.*$$/\1/p') -dfsg_version = $(upstream_version)+ds1 -pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p') - export QT_SELECT := qt5 +# one ring to rule them all ... %: dh $@ --parallel -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 06/18: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack. commit d0136c6f5e165953d4b23f6ddb0301bb8a31f766 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:21:06 2015 +0100 New upstream release. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2e7a14..eb8f41d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -qmapshack (0.12.0-1~exp2) UNRELEASED; urgency=medium +qmapshack (1.0.0-1) UNRELEASED; urgency=medium + * New upstream release. * Enable verbose makefiles. * Remove unused variables in rules file. * Add upstream metadata. - -- Bas Couwenberg sebas...@xs4all.nl Mon, 16 Feb 2015 16:37:45 +0100 + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:20:57 +0100 qmapshack (0.12.0-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] branch master updated (00729fe - ab55d9a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository netcdf. from 00729fe Refresh patches. new 881f178 Repack upstream tarball to exclude autom4te.cache directory. new 2085df9 Imported Upstream version 4.3.3.1+ds new ab45e0a Merge tag 'upstream/4.3.3.1+ds' new 1761537 New repacked upstream release. new ab55d9a Fix local modifications of upstream sources. The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: CTestConfig.cmake |17 - RELEASE_NOTES.md|14 - autom4te.cache/output.0 | 20434 -- autom4te.cache/output.1 | 20434 -- autom4te.cache/output.2 | 20434 -- autom4te.cache/requests | 576 -- autom4te.cache/traces.0 | 3688 autom4te.cache/traces.1 | 1676 autom4te.cache/traces.2 | 3688 debian/changelog| 5 +- debian/copyright| 1 + debian/watch| 3 +- docs/building-with-cmake.md | 106 + 13 files changed, 112 insertions(+), 70964 deletions(-) delete mode 100644 CTestConfig.cmake delete mode 100644 autom4te.cache/output.0 delete mode 100644 autom4te.cache/output.1 delete mode 100644 autom4te.cache/output.2 delete mode 100644 autom4te.cache/requests delete mode 100644 autom4te.cache/traces.0 delete mode 100644 autom4te.cache/traces.1 delete mode 100644 autom4te.cache/traces.2 create mode 100644 docs/building-with-cmake.md -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#779974: josm: invalid certificate
Control: notfound -1 josm/0.0.svn7643+dfsg1-1 Control: severity -1 normal Hi Salvo, I also cannot reproduce the issue with the JOSM version in jessie sid. Since the SSL certificates are an issue on the server side, not in JOSM itself, this is not a bug in the package. You can edit the tile URLs in the Preferences to use HTTP instead of HTTPS, so the grave severity is not justified. Please let us know if the issues has been resolved on your end too. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] annotated tag upstream/1.0.0+ds created (now b57af01)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.0.0+ds in repository qmapshack. at b57af01 (tag) tagging 86ffa9957a82253122726992bade130a2f617ecb (commit) replaces upstream/1.0.0 tagged by Bas Couwenberg on Sat Mar 7 13:33:27 2015 +0100 - Log - Upstream version 1.0.0+ds Bas Couwenberg (1): Imported Upstream version 1.0.0+ds --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osm2pgsql] 01/02: Also use --without-lockfree configure option on sparc alpha.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osm2pgsql. commit a62ee230e40b820ef7daf769fa6d3e946b0f58a0 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 17:01:43 2015 +0100 Also use --without-lockfree configure option on sparc alpha. --- debian/changelog | 6 ++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 64ceeaf..2164381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osm2pgsql (0.87.2-1~exp3) UNRELEASED; urgency=medium + + * Also use --without-lockfree configure option on sparc alpha. + + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 17:01:16 +0100 + osm2pgsql (0.87.2-1~exp2) experimental; urgency=medium * Use --without-lockfree configure option only on architectures where the diff --git a/debian/rules b/debian/rules index a8ca692..a3d5f48 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ export VERBOSE=1 CFLAGS += $(CPPFLAGS) CXXFLAGS += $(CPPFLAGS) -ifneq (,$(findstring $(DEB_HOST_ARCH),arm64 armel mips mipsel powerpc ppc64el s390x hppa ppc64)) +ifneq (,$(findstring $(DEB_HOST_ARCH),arm64 armel mips mipsel powerpc ppc64el s390x sparc alpha hppa ppc64)) CONFIGURE_OPTS += --without-lockfree endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osm2pgsql] 02/02: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osm2pgsql. commit f41ffbea1e9fb6d334b673a4e371b59bf62709d7 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 17:05:51 2015 +0100 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2164381..6c0e808 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -osm2pgsql (0.87.2-1~exp3) UNRELEASED; urgency=medium +osm2pgsql (0.87.2-1~exp3) experimental; urgency=medium * Also use --without-lockfree configure option on sparc alpha. - -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 17:01:16 +0100 + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 17:05:36 +0100 osm2pgsql (0.87.2-1~exp2) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 05/05: Fix local modifications of upstream sources.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit ab55d9a507a44642f4f116509e67230745c3e6b8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 15:56:14 2015 +0100 Fix local modifications of upstream sources. --- CTestConfig.cmake | 17 - RELEASE_NOTES.md | 14 -- 2 files changed, 31 deletions(-) diff --git a/CTestConfig.cmake b/CTestConfig.cmake deleted file mode 100644 index 84fa0fb..000 --- a/CTestConfig.cmake +++ /dev/null @@ -1,17 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## -## # The following are required to submit to the CDash dashboard: -## ENABLE_TESTING() -## INCLUDE(CTest) - -set(DART_TESTING_TIMEOUT 4800) - -set(CTEST_PROJECT_NAME netcdf-c) -set(CTEST_NIGHTLY_START_TIME 00:00:00 EST) - -set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE my.cdash.org) -set(CTEST_DROP_LOCATION /submit.php?project=netcdf-c) -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9389b5f..ee0a7ca 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -118,20 +118,6 @@ More details may be found at the Unidata JIRA Dashboard. [NCF-316](https://bugt * Removed redundant variable `BUILD_DOCS` from the CMake configuration file. See the issue at github: [#59](https://github.com/Unidata/netcdf-c/issues/59). -* Bumped minimum CMake version to `2.8.9` from `2.8.8` as part of a larger pull request contributed by Nico Schlömer. [Pull Request #64](https://github.com/Unidata/netcdf-c/pull/64) - -* Replaced the `NetCDF Library Architecture` image with an updated version from the 2012 NetCDF Workshop slides. - -* Fix HDF4 files to support chunking. - [NCF-272](https://bugtracking.unidata.ucar.edu/browse/NCF-272) - -* NetCDF creates a `libnetcdf.settings` file after configuration now, similar to those generated by `HDF4` and `HDF5`. It is installed into the same directory as the libraries. [NCF-303](https://bugtracking.unidata.ucar.edu/browse/NCF-303). - - -* Renamed `man4/` directory to `docs/` to make the purpose and contents clearer. See [man4 vs. docs #60](https://github.com/Unidata/netcdf-c/issues/60). - -* Removed redundant variable `BUILD_DOCS` from the CMake configuration file. See the issue at github: [BUILD\_DOCS, ENABLE\_DOXYGEN #59](https://github.com/Unidata/netcdf-c/issues/59). - * Added missing documentation templates to `man4/Makefile.am`, to correct an issue when trying to build the local `Doxygen`-generated documentation. This issue was reported by Nico Schlömer and may be viewed on github. [Releases miss Doxygen files #56](https://github.com/Unidata/netcdf-c/issues/56) * When the NC_MPIPOSIX flag is given for parallel I/O access and the HDF5 library does not have the MPI-POSIX VFD configured in, the NC_MPIPOSIX flag is transparently aliased to the NC_MPIIO flag within the netCDF-4 library. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 01/01: pristine-tar data for netcdf_4.3.3.1+ds.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository netcdf. commit 95c148e583e7ad8e52691443bc98a607df96562c Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 15:49:41 2015 +0100 pristine-tar data for netcdf_4.3.3.1+ds.orig.tar.gz --- netcdf_4.3.3.1+ds.orig.tar.gz.delta | Bin 0 - 53464 bytes netcdf_4.3.3.1+ds.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/netcdf_4.3.3.1+ds.orig.tar.gz.delta b/netcdf_4.3.3.1+ds.orig.tar.gz.delta new file mode 100644 index 000..e57b0d1 Binary files /dev/null and b/netcdf_4.3.3.1+ds.orig.tar.gz.delta differ diff --git a/netcdf_4.3.3.1+ds.orig.tar.gz.id b/netcdf_4.3.3.1+ds.orig.tar.gz.id new file mode 100644 index 000..19589b5 --- /dev/null +++ b/netcdf_4.3.3.1+ds.orig.tar.gz.id @@ -0,0 +1 @@ +40728ad127a7ec1a51c27a607c68011bd2250968 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 03/05: Merge tag 'upstream/4.3.3.1+ds'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit ab45e0a0227255ac81e142a5831dd39b6aac857d Merge: 881f178 2085df9 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 15:49:41 2015 +0100 Merge tag 'upstream/4.3.3.1+ds' Upstream version 4.3.3.1+ds autom4te.cache/output.0 | 20434 -- autom4te.cache/output.1 | 20434 -- autom4te.cache/output.2 | 20434 -- autom4te.cache/requests | 576 -- autom4te.cache/traces.0 | 3688 autom4te.cache/traces.1 | 1676 autom4te.cache/traces.2 | 3688 docs/building-with-cmake.md | 106 + 8 files changed, 106 insertions(+), 70930 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] annotated tag upstream/4.3.3.1+ds created (now 5be4a16)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/4.3.3.1+ds in repository netcdf. at 5be4a16 (tag) tagging 2085df95eedca54149db6ed7b507b616af5cc1ba (commit) replaces upstream/4.3.3.1 tagged by Bas Couwenberg on Sat Mar 7 15:49:41 2015 +0100 - Log - Upstream version 4.3.3.1+ds Bas Couwenberg (1): Imported Upstream version 4.3.3.1+ds --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] branch pristine-tar updated (fee3aba - 95c148e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository netcdf. from fee3aba pristine-tar data for netcdf_4.3.3.1.orig.tar.gz new 95c148e pristine-tar data for netcdf_4.3.3.1+ds.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: netcdf_4.3.3.1+ds.orig.tar.gz.delta | Bin 0 - 53464 bytes netcdf_4.3.3.1+ds.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 netcdf_4.3.3.1+ds.orig.tar.gz.delta create mode 100644 netcdf_4.3.3.1+ds.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 04/05: New repacked upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 17615379eb8465869a019a3ed8652b2206b64555 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 15:52:13 2015 +0100 New repacked upstream release. --- debian/changelog | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c89fa4..a750612 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -netcdf (1:4.3.3.1-1) UNRELEASED; urgency=medium +netcdf (1:4.3.3.1+ds-1) UNRELEASED; urgency=medium [ Nico Schlömer ] * Upgrade to 4.3.3.1 (C-only) @@ -42,11 +42,9 @@ netcdf (1:4.3.3.1-1) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.6, changes: canonical Vcs-* URLs, minimal dh rules, copyright-format 1.0, symbols. * Add myself to Uploaders. - - [ Nico Schlömer ] * Repack upstream tarball to exclude autom4te.cache directory. - -- Nico Schlömer nico.schloe...@gmail.com Mon, 12 May 2014 14:27:06 +0200 + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 15:51:54 +0100 netcdf (1:4.1.3-7.2) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 01/05: Repack upstream tarball to exclude autom4te.cache directory.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 881f17847aae5ad1204a09903a7567b2ff79b67e Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 15:45:41 2015 +0100 Repack upstream tarball to exclude autom4te.cache directory. --- debian/changelog | 3 +++ debian/copyright | 1 + debian/watch | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 50c89b0..2c89fa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,9 @@ netcdf (1:4.3.3.1-1) UNRELEASED; urgency=medium minimal dh rules, copyright-format 1.0, symbols. * Add myself to Uploaders. + [ Nico Schlömer ] + * Repack upstream tarball to exclude autom4te.cache directory. + -- Nico Schlömer nico.schloe...@gmail.com Mon, 12 May 2014 14:27:06 +0200 netcdf (1:4.1.3-7.2) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index d94801d..3286fdf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: NetCDF-C Upstream-Contact: University Corporation for Atmospheric Research/Unidata Source: https://github.com/Unidata/netcdf-c/releases +Files-Excluded: autom4te.cache/* Files: * Copyright: 1993-2014, University Corporation for Atmospheric Research/Unidata diff --git a/debian/watch b/debian/watch index 4a4d2a0..6e928c0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,7 +1,8 @@ version=3 opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|gamma|beta|alpha|b|a)[\-\.]?(\d*))$/$1~$3$4/,\ -filenamemangle=s/(?:.*?)?[vr]?(\d[\d\.\-\w]*)\.tar\.gz/netcdf-c-$1.tar.gz/ \ +filenamemangle=s/(?:.*?)?[vr]?(\d[\d\.\-\w]*)\.tar\.gz/netcdf-c-$1.tar.gz/,\ +repacksuffix=+ds \ https://github.com/Unidata/netcdf-c/releases \ (?:.*/)*(?:rel|v|r|netcdf-c|)[\-\_]?(\d[\d\-\.\w]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \ debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osm2pgsql] branch master updated (17a9c92 - f41ffbe)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osm2pgsql. from 17a9c92 Set distribution to experimental. new a62ee23 Also use --without-lockfree configure option on sparc alpha. new f41ffbe Set distribution to experimental. The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osm2pgsql] tag debian/0.87.2-1.exp3 created (now f41ffbe)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.87.2-1.exp3 in repository osm2pgsql. at f41ffbe (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 01/07: Imported Upstream version 1.0.0i
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository freexl. commit a6cb9c930c1a2d78ddb67008d9da3a97ccbd2d9e Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 12:59:42 2015 +0100 Imported Upstream version 1.0.0i --- configure| 20 ++-- configure.ac | 2 +- src/freexl.c | 21 - 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 44b5f23..91e18df 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for FreeXL 1.0.0h. +# Generated by GNU Autoconf 2.69 for FreeXL 1.0.0i. # # Report bugs to a.furi...@lqt.it. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeXL' PACKAGE_TARNAME='freexl' -PACKAGE_VERSION='1.0.0h' -PACKAGE_STRING='FreeXL 1.0.0h' +PACKAGE_VERSION='1.0.0i' +PACKAGE_STRING='FreeXL 1.0.0i' PACKAGE_BUGREPORT='a.furi...@lqt.it' PACKAGE_URL='' @@ -1326,7 +1326,7 @@ if test $ac_init_help = long; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat _ACEOF -\`configure' configures FreeXL 1.0.0h to adapt to many kinds of systems. +\`configure' configures FreeXL 1.0.0i to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ fi if test -n $ac_init_help; then case $ac_init_help in - short | recursive ) echo Configuration of FreeXL 1.0.0h:;; + short | recursive ) echo Configuration of FreeXL 1.0.0i:;; esac cat \_ACEOF @@ -1508,7 +1508,7 @@ fi test -n $ac_init_help exit $ac_status if $ac_init_version; then cat \_ACEOF -FreeXL configure 1.0.0h +FreeXL configure 1.0.0i generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2052,7 +2052,7 @@ cat config.log _ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeXL $as_me 1.0.0h, which was +It was created by FreeXL $as_me 1.0.0i, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2923,7 +2923,7 @@ fi # Define the identity of the package. PACKAGE='freexl' - VERSION='1.0.0h' + VERSION='1.0.0i' cat confdefs.h _ACEOF @@ -17812,7 +17812,7 @@ cat $CONFIG_STATUS \_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log= -This file was extended by FreeXL $as_me 1.0.0h, which was +This file was extended by FreeXL $as_me 1.0.0i, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -17878,7 +17878,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'` ac_cs_version=\\ -FreeXL config.status 1.0.0h +FreeXL config.status 1.0.0i configured by $0, generated by GNU Autoconf 2.69, with options \\\$ac_cs_config\\ diff --git a/configure.ac b/configure.ac index 0687e47..6f4d3cb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(FreeXL, 1.0.0h, a.furi...@lqt.it) +AC_INIT(FreeXL, 1.0.0i, a.furi...@lqt.it) AC_LANG(C) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/freexl.c b/src/freexl.c index c33e8fe..3bf4742 100644 --- a/src/freexl.c +++ b/src/freexl.c @@ -1068,6 +1068,11 @@ allocate_cells (biff_workbook * workbook) unsigned int col; biff_cell_value *p_cell; +if (workbook == NULL) + return FREEXL_NULL_ARGUMENT; +if (workbook-active_sheet == NULL) + return FREEXL_NULL_ARGUMENT; + /* allocating the cell values array */ workbook-active_sheet-cell_values = malloc (sizeof (biff_cell_value) * @@ -1713,6 +1718,11 @@ parse_SST (biff_workbook * workbook, int swap) swap32 (n_strings); p_string = workbook-record + 8; workbook-shared_strings.string_count = n_strings.value; + if (workbook-shared_strings.string_count 1024 * 1024) + { + /* unexpected huge count ... cowardly giving up ... */ + return FREEXL_INSUFFICIENT_MEMORY; + } workbook-shared_strings.utf8_strings = malloc (sizeof (char **) * workbook-shared_strings.string_count); for (i_string = 0; i_string workbook-shared_strings.string_count; @@ -3749,6 +3759,8 @@ read_biff_next_record (biff_workbook * workbook, int swap, int *errcode) unsigned int already_done; unsigned int chunk = workbook-sector_end - (workbook-p_in - workbook-sector_buf); + if (workbook-sector_end = (workbook-p_in - workbook-sector_buf)) +
[freexl] branch master updated (d2d8f47 - 56ce84f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository freexl. from d2d8f47 Set distribution to experimental. new a6cb9c9 Imported Upstream version 1.0.0i new 9aca087 Merge tag 'upstream/1.0.0i' new 7b4264f New upstream release. new d1f444f Update my email to @debian.org address. new 66cbd41 Also install examples. new 4714d30 Enable verbose test output. new 56ce84f Set distribution to experimental. The 7 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: configure | 20 ++-- configure.ac | 2 +- debian/changelog | 9 + debian/control | 2 +- debian/libfreexl1.examples | 1 + debian/rules | 3 +++ src/freexl.c | 21 - 7 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 debian/libfreexl1.examples -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 07/07: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository freexl. commit 56ce84f7be3b8a882b96c3208a22b48b49c3b589 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:18:52 2015 +0100 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38f096d..ce3e941 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -freexl (1.0.0i-1) UNRELEASED; urgency=medium +freexl (1.0.0i-1~exp1) experimental; urgency=medium * New upstream release. * Update my email to @debian.org address. * Also install examples. * Enable verbose test output. - -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:00:34 +0100 + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:18:38 +0100 freexl (1.0.0h-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] tag debian/1.0.0i-1.exp1 created (now 56ce84f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.0.0i-1.exp1 in repository freexl. at 56ce84f (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 01/01: pristine-tar data for freexl_1.0.0i.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository freexl. commit d4d2eee4a0c1c1c3043706ce69f087f099ca1c66 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 12:59:42 2015 +0100 pristine-tar data for freexl_1.0.0i.orig.tar.gz --- freexl_1.0.0i.orig.tar.gz.delta | Bin 0 - 4202 bytes freexl_1.0.0i.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/freexl_1.0.0i.orig.tar.gz.delta b/freexl_1.0.0i.orig.tar.gz.delta new file mode 100644 index 000..8c32445 Binary files /dev/null and b/freexl_1.0.0i.orig.tar.gz.delta differ diff --git a/freexl_1.0.0i.orig.tar.gz.id b/freexl_1.0.0i.orig.tar.gz.id new file mode 100644 index 000..fedecc5 --- /dev/null +++ b/freexl_1.0.0i.orig.tar.gz.id @@ -0,0 +1 @@ +d16d6d03b52c13b37346a358978868faa5743355 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 03/07: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository freexl. commit 7b4264fbc614d3d33f9ecd51fae237bfa14eb141 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:00:47 2015 +0100 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e925401..b5dccee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +freexl (1.0.0i-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:00:34 +0100 + freexl (1.0.0h-1~exp1) experimental; urgency=medium * New upstream release. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] branch pristine-tar updated (49b5e63 - d4d2eee)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository freexl. from 49b5e63 pristine-tar data for freexl_1.0.0h.orig.tar.gz new d4d2eee pristine-tar data for freexl_1.0.0i.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: freexl_1.0.0i.orig.tar.gz.delta | Bin 0 - 4202 bytes freexl_1.0.0i.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 freexl_1.0.0i.orig.tar.gz.delta create mode 100644 freexl_1.0.0i.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 04/07: Update my email to @debian.org address.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository freexl. commit d1f444f78028d7bd9272ee16ff181f1ac999bad8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:01:02 2015 +0100 Update my email to @debian.org address. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b5dccee..adf09ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ freexl (1.0.0i-1) UNRELEASED; urgency=medium * New upstream release. + * Update my email to @debian.org address. -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:00:34 +0100 diff --git a/debian/control b/debian/control index 9ce5d47..59f6f64 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: freexl Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org, - Bas Couwenberg sebas...@xs4all.nl + Bas Couwenberg sebas...@debian.org Section: libs Priority: optional Build-Depends: debhelper (= 9~), -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] branch upstream updated (5f5c322 - a6cb9c9)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository freexl. from 5f5c322 Imported Upstream version 1.0.0h new a6cb9c9 Imported Upstream version 1.0.0i The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: configure| 20 ++-- configure.ac | 2 +- src/freexl.c | 21 - 3 files changed, 31 insertions(+), 12 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] annotated tag upstream/1.0.0i created (now 5fb7937)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.0.0i in repository freexl. at 5fb7937 (tag) tagging a6cb9c930c1a2d78ddb67008d9da3a97ccbd2d9e (commit) replaces upstream/1.0.0h tagged by Bas Couwenberg on Sat Mar 7 12:59:42 2015 +0100 - Log - Upstream version 1.0.0i Bas Couwenberg (1): Imported Upstream version 1.0.0i --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 05/07: Also install examples.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository freexl. commit 66cbd418e33020eca9c424f2eb9853fa6d852fdd Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:03:03 2015 +0100 Also install examples. --- debian/changelog | 1 + debian/libfreexl1.examples | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index adf09ca..9eb869d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ freexl (1.0.0i-1) UNRELEASED; urgency=medium * New upstream release. * Update my email to @debian.org address. + * Also install examples. -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:00:34 +0100 diff --git a/debian/libfreexl1.examples b/debian/libfreexl1.examples new file mode 100644 index 000..e39721e --- /dev/null +++ b/debian/libfreexl1.examples @@ -0,0 +1 @@ +examples/* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 06/07: Enable verbose test output.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository freexl. commit 4714d303d7ce6638b4659c665b979f8276f54974 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 13:15:29 2015 +0100 Enable verbose test output. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9eb869d..38f096d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ freexl (1.0.0i-1) UNRELEASED; urgency=medium * New upstream release. * Update my email to @debian.org address. * Also install examples. + * Enable verbose test output. -- Bas Couwenberg sebas...@debian.org Sat, 07 Mar 2015 13:00:34 +0100 diff --git a/debian/rules b/debian/rules index 83cc1d2..f380b44 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# Verbose test output +export VERBOSE=1 + %: dh $@ --with autoreconf -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[freexl] 02/07: Merge tag 'upstream/1.0.0i'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository freexl. commit 9aca087594178db581e2b79c6af742e1923c9927 Merge: d2d8f47 a6cb9c9 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 12:59:43 2015 +0100 Merge tag 'upstream/1.0.0i' Upstream version 1.0.0i configure| 20 ++-- configure.ac | 2 +- src/freexl.c | 21 - 3 files changed, 31 insertions(+), 12 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 06/47: Merge commit 'upstream/2.3.2'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 0d2cf88c3d71de155ee1548a1d7feaa630939a4f Merge: 6f741f2 e3b372e Author: David Paleino da...@debian.org Date: Tue Oct 11 23:07:43 2011 +0200 Merge commit 'upstream/2.3.2' CHANGES | 43 + MANIFEST.in |3 + PKG-INFO | 45 +- imposm.egg-info/PKG-INFO | 45 +- imposm.egg-info/SOURCES.txt |9 +- imposm/app.py| 105 +- imposm/base.py |2 +- imposm/cache/internal.cc | 717 ++ imposm/cache/osm.py | 26 +- imposm/cache/tc.c| 5063 ++ imposm/cache/tc.pyx | 187 +- imposm/{version.py = config.py} | 12 +- imposm/db/__init__.py|4 - imposm/db/config.py | 73 + imposm/db/postgis.py | 62 +- imposm/dbimporter.py | 26 +- imposm/defaultmapping.py | 63 +- imposm/geom.py |9 +- imposm/mapping.py| 316 ++- imposm/multipolygon.py | 222 +- imposm/psqldb.py |2 +- imposm/test/test_cache.py| 57 +- imposm/test/test_field_types.py | 49 + imposm/test/test_imported.py | 108 + imposm/test/test_multipolygon.py | 294 ++- imposm/test/test_tag_mapper.py | 140 ++ imposm/version.py|2 +- imposm/writer.py | 30 +- internal.proto | 11 + setup.py | 31 + 30 files changed, 7066 insertions(+), 690 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 44/47: Upload to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 04d7cb6222d085c9106a24989d9f2f1195e4b3a8 Author: David Paleino da...@debian.org Date: Mon Nov 4 17:22:56 2013 +0100 Upload to unstable. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31e77ae..c36bfe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -imposm (2.5.0-2) UNRELEASED; urgency=low +imposm (2.5.0-2) unstable; urgency=low + * Upload to unstable. * Standards-Version bump to 3.9.5, no changes needed. * Use canonical Vcs-* urls. - -- David Paleino da...@debian.org Mon, 04 Nov 2013 17:22:22 +0100 + -- David Paleino da...@debian.org Mon, 04 Nov 2013 17:22:43 +0100 imposm (2.5.0-1) experimental; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 02/47: First debianization
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit db9fc7ee4cef75d871c3eeab956543679ba0da8c Author: David Paleino da...@debian.org Date: Sun Apr 24 19:57:46 2011 +0200 First debianization --- debian/changelog | 5 + debian/compat| 1 + debian/control | 22 ++ debian/copyright | 27 +++ debian/rules | 9 + debian/source/format | 1 + debian/watch | 2 ++ 7 files changed, 67 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..a22c765 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +imposm (2.1.3-1) UNRELEASED; urgency=low + + * Initial release (Closes: #623942) + + -- David Paleino da...@debian.org Sun, 24 Apr 2011 19:47:09 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 000..4b1684d --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: imposm +Section: python +Priority: extra +Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org +Uploaders: + David Paleino da...@debian.org +Build-Depends: debhelper (= 8~) +Standards-Version: 3.9.2 +Homepage: http://imposm.org/ +Vcs-Git: git://git.debian.org/pkg-osm/imposm.git +Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm.git;a=summary + +Package: python-imposm +Architecture: all +Depends: ${python:Depends} + , ${misc:Depends} +Description: Python importer for OpenStreetMap data + Imposm is an importer for OpenStreetMap data. It reads XML and PBF files and + can import the data into PostgreSQL/PostGIS databases. + . + It is designed to create databases that are optimized for rendering/WMS + services. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000..d1c23e7 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: imposm +Upstream-Author: Oliver Tonnhofer o...@omniscale.de +Source: http://imposm.org + +Files: * +Copyright: © 2011, Omniscale http://omniscale.com +License: Apache-2.0 + +Files: debian/* +Copyright: © 2011, David Paleino da...@debian.org +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +X-Comment: on Debian systems, the complete text of the Apache version 2.0 + license can be found in /usr/share/common-licenses/Apache-2.0. diff --git a/debian/rules b/debian/rules new file mode 100755 index 000..e05d7fc --- /dev/null +++ b/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ \ + --with python2 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..09379d0 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://pypi.python.org/packages/source/i/imposm/imposm-(\d+.*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] branch pristine-tar created (now c4cf8ff)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository imposm. at c4cf8ff pristine-tar data for imposm_2.5.0.orig.tar.gz This branch includes the following new commits: new c848c78 pristine-tar data for imposm_2.1.3.orig.tar.gz new c47036c pristine-tar data for imposm_2.3.2.orig.tar.gz new 2579b80 pristine-tar data for imposm_2.4.0.orig.tar.gz new cbf6e8a pristine-tar data for imposm_2.4.0+dfsg.orig.tar.gz new c4cf8ff pristine-tar data for imposm_2.5.0.orig.tar.gz The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 03/05: pristine-tar data for imposm_2.4.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository imposm. commit 2579b8071b5e363dd29713c7c1940216bdcdabff Author: David Paleino da...@debian.org Date: Sun Apr 8 09:10:58 2012 +0200 pristine-tar data for imposm_2.4.0.orig.tar.gz --- imposm_2.4.0.orig.tar.gz.delta | Bin 0 - 2493 bytes imposm_2.4.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/imposm_2.4.0.orig.tar.gz.delta b/imposm_2.4.0.orig.tar.gz.delta new file mode 100644 index 000..5bb300b Binary files /dev/null and b/imposm_2.4.0.orig.tar.gz.delta differ diff --git a/imposm_2.4.0.orig.tar.gz.id b/imposm_2.4.0.orig.tar.gz.id new file mode 100644 index 000..7f51f2c --- /dev/null +++ b/imposm_2.4.0.orig.tar.gz.id @@ -0,0 +1 @@ +5d2527a6098e3205d1b74bc972228a3f14e32a84 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 04/05: pristine-tar data for imposm_2.4.0+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository imposm. commit cbf6e8a55c8c0fc6fe5adef22bb17c3439e5be8d Author: David Paleino da...@debian.org Date: Mon Dec 10 19:20:52 2012 +0100 pristine-tar data for imposm_2.4.0+dfsg.orig.tar.gz --- imposm_2.4.0+dfsg.orig.tar.gz.delta | Bin 0 - 2302 bytes imposm_2.4.0+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/imposm_2.4.0+dfsg.orig.tar.gz.delta b/imposm_2.4.0+dfsg.orig.tar.gz.delta new file mode 100644 index 000..ea34ab7 Binary files /dev/null and b/imposm_2.4.0+dfsg.orig.tar.gz.delta differ diff --git a/imposm_2.4.0+dfsg.orig.tar.gz.id b/imposm_2.4.0+dfsg.orig.tar.gz.id new file mode 100644 index 000..70cb197 --- /dev/null +++ b/imposm_2.4.0+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +5bcc36b17c0421f17581991cd936b4d3b78865b6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 15/47: Seems it's not needed?
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 3c2269d2e4a47a69bf70f3d7d5c7b0743828b472 Author: David Paleino da...@debian.org Date: Tue Oct 11 23:32:12 2011 +0200 Seems it's not needed? --- debian/clean | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/clean b/debian/clean index 0509112..68e9247 100644 --- a/debian/clean +++ b/debian/clean @@ -1,5 +1,5 @@ -imposm/cache/internal.pb.cc -imposm/cache/internal.pb.h -imposm/cache/tc.c +#imposm/cache/internal.pb.cc +#imposm/cache/internal.pb.h +#imposm/cache/tc.c imposm.egg-info/PKG-INFO -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 14/47: Add missing B-D
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit af62e403c4f69ced3f42c61e0d353552ad0c7bcc Author: David Paleino da...@debian.org Date: Tue Oct 11 23:24:50 2011 +0200 Add missing B-D --- debian/control | 4 1 file changed, 4 insertions(+) diff --git a/debian/control b/debian/control index 0b200a8..f6dff24 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,10 @@ Uploaders: David Paleino da...@debian.org Build-Depends: debhelper (= 8~) , python (= 2.6.6-3~) + , python-setuptools + , libtokyocabinet-dev + , cython + , protobuf-compiler Standards-Version: 3.9.2 Homepage: http://imposm.org/ Vcs-Git: git://git.debian.org/pkg-osm/imposm.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 25/47: Uploading to sid
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit c0f620a97066e4f65312c16d3769c163a9a498f5 Author: David Paleino da...@debian.org Date: Fri Oct 14 00:00:28 2011 +0200 Uploading to sid --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26215a5..69d38ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -imposm (2.3.2-2) UNRELEASED; urgency=low +imposm (2.3.2-2) unstable; urgency=low * Add missing dependency on python-pkg-resources (Closes: #645253) - -- David Paleino da...@debian.org Thu, 13 Oct 2011 23:59:43 +0200 + -- David Paleino da...@debian.org Fri, 14 Oct 2011 00:00:21 +0200 imposm (2.3.2-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 10/47: Split package
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 01d43dfe8bab30cb9697122a16e8ba5be3f3977c Author: David Paleino da...@debian.org Date: Tue Oct 11 23:21:07 2011 +0200 Split package --- debian/control | 17 + debian/imposm.install| 1 + debian/python-imposm.install | 2 ++ 3 files changed, 20 insertions(+) diff --git a/debian/control b/debian/control index 38de0ca..488eb9b 100644 --- a/debian/control +++ b/debian/control @@ -21,3 +21,20 @@ Description: importer for OpenStreetMap data - Python module . It is designed to create databases that are optimized for rendering/WMS services. + . + This package contains the Python module + +Package: imposm +Section: web +Architecture: all +Depends: + ${misc:Depends} + , python-imposm (= ${source:Version}) +Description: importer for OpenStreetMap data + Imposm is an importer for OpenStreetMap data. It reads XML and PBF files and + can import the data into PostgreSQL/PostGIS databases. + . + It is designed to create databases that are optimized for rendering/WMS + services. + . + This package contains the importer. diff --git a/debian/imposm.install b/debian/imposm.install new file mode 100644 index 000..c703cf8 --- /dev/null +++ b/debian/imposm.install @@ -0,0 +1 @@ +usr/bin/ diff --git a/debian/python-imposm.install b/debian/python-imposm.install new file mode 100644 index 000..bed05a5 --- /dev/null +++ b/debian/python-imposm.install @@ -0,0 +1,2 @@ +usr/lib/ +usr/share/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 38/47: Standards-Version bump to 3.9.4, no changes needed.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 40b451ce96b76d5a407b0b3eff7c418547600a3f Author: David Paleino da...@debian.org Date: Mon Dec 10 19:25:08 2012 +0100 Standards-Version bump to 3.9.4, no changes needed. --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0d3f77..ffd5e85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ imposm (2.5.0-1) UNRELEASED; urgency=low * Acknowledge NMU. * New upstream version. + * Standards-Version bump to 3.9.4, no changes needed. - -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:24:37 +0100 + -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:24:59 +0100 imposm (2.4.0+dfsg-0.1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4f16b50..8d66a6d 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (= 8~) , cython , protobuf-compiler , libprotobuf-dev -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://imposm.org/ Vcs-Git: git://git.debian.org/pkg-osm/imposm.git Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm.git;a=summary -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 41/47: Uploading to experimental
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit e03391a7b4564695c9331cae520abc2e99b21afa Author: David Paleino da...@debian.org Date: Wed Dec 12 22:04:29 2012 +0100 Uploading to experimental --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26043e4..7b25069 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -imposm (2.5.0-1) UNRELEASED; urgency=low +imposm (2.5.0-1) experimental; urgency=low * Acknowledge NMU. * New upstream version. * Standards-Version bump to 3.9.4, no changes needed. * debhelper compat bumped to 9. - -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:25:36 +0100 + -- David Paleino da...@debian.org Wed, 12 Dec 2012 22:04:12 +0100 imposm (2.4.0+dfsg-0.1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 39/47: debhelper compat bumped to 9.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 9543d7f80ff3603bd012b98b88e24768e91c485a Author: David Paleino da...@debian.org Date: Mon Dec 10 19:25:45 2012 +0100 debhelper compat bumped to 9. --- debian/changelog | 3 ++- debian/compat| 2 +- debian/control | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ffd5e85..26043e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ imposm (2.5.0-1) UNRELEASED; urgency=low * Acknowledge NMU. * New upstream version. * Standards-Version bump to 3.9.4, no changes needed. + * debhelper compat bumped to 9. - -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:24:59 +0100 + -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:25:36 +0100 imposm (2.4.0+dfsg-0.1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 8d66a6d..7b2d3a7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org -Build-Depends: debhelper (= 8~) +Build-Depends: debhelper (= 9~) , python-all-dev (= 2.6.6-3~) , python-setuptools , libtokyocabinet-dev -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 31/47: Releasing to sid
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 300c72b68df1b2d5792a789684d2c2e91a5d39fc Author: David Paleino da...@debian.org Date: Sun Apr 8 09:18:04 2012 +0200 Releasing to sid --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce1d165..10d5fe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -imposm (2.4.0-1) UNRELEASED; urgency=low +imposm (2.4.0-1) unstable; urgency=low * New upstream version * Updated debian/copyright * Standards-Version bump to 3.9.3, no changes needed - -- David Paleino da...@debian.org Sun, 08 Apr 2012 09:12:40 +0200 + -- David Paleino da...@debian.org Sun, 08 Apr 2012 09:12:51 +0200 imposm (2.3.2-2) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 05/05: pristine-tar data for imposm_2.5.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository imposm. commit c4cf8ff221be3f179a9493efca80d8ee10fd60c4 Author: David Paleino da...@debian.org Date: Mon Dec 10 19:23:46 2012 +0100 pristine-tar data for imposm_2.5.0.orig.tar.gz --- imposm_2.5.0.orig.tar.gz.delta | Bin 0 - 2570 bytes imposm_2.5.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/imposm_2.5.0.orig.tar.gz.delta b/imposm_2.5.0.orig.tar.gz.delta new file mode 100644 index 000..5ab498c Binary files /dev/null and b/imposm_2.5.0.orig.tar.gz.delta differ diff --git a/imposm_2.5.0.orig.tar.gz.id b/imposm_2.5.0.orig.tar.gz.id new file mode 100644 index 000..be820d8 --- /dev/null +++ b/imposm_2.5.0.orig.tar.gz.id @@ -0,0 +1 @@ +a2a275baf9d8593fc625411a481c24931007696d -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] branch upstream created (now 03271ca)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository imposm. at 03271ca Imported Upstream version 2.5.0 This branch includes the following new commits: new 8ae2b24 Imported Upstream version 2.1.3 new e3b372e Imported Upstream version 2.3.2 new e81c95e Imported Upstream version 2.4.0 new 56fee94 Imported Upstream version 2.4.0+dfsg new 03271ca Imported Upstream version 2.5.0 The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 22/47: Really fix dependency
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 1063592adccf5ab6df557ecae694d8e209d14714 Author: David Paleino da...@debian.org Date: Tue Oct 11 23:46:46 2011 +0200 Really fix dependency --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ec00ab0..ed6f5fb 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Architecture: all Depends: ${misc:Depends} , ${python:Depends} - , python-imposm (= ${binary:Version}) + , python-imposm (= ${binary:Version}) Description: importer for OpenStreetMap data Imposm is an importer for OpenStreetMap data. It reads XML and PBF files and can import the data into PostgreSQL/PostGIS databases. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 18/47: More missing B-D
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit b7d2851177dbe6869901c52be6c6852d006a41c6 Author: David Paleino da...@debian.org Date: Tue Oct 11 23:35:26 2011 +0200 More missing B-D --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 564b576..9b9d3b2 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: debhelper (= 8~) , libtokyocabinet-dev , cython , protobuf-compiler + , libprotobuf-dev Standards-Version: 3.9.2 Homepage: http://imposm.org/ Vcs-Git: git://git.debian.org/pkg-osm/imposm.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 20/47: Fix dependency relation
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 29f817a4cd6ab99ff6fc0266a4a9659db3a6379a Author: David Paleino da...@debian.org Date: Tue Oct 11 23:40:43 2011 +0200 Fix dependency relation --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f740ab8..ec00ab0 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Architecture: all Depends: ${misc:Depends} , ${python:Depends} - , python-imposm (= ${source:Version}) + , python-imposm (= ${binary:Version}) Description: importer for OpenStreetMap data Imposm is an importer for OpenStreetMap data. It reads XML and PBF files and can import the data into PostgreSQL/PostGIS databases. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 11/47: Add Provides
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 41117cab62776ca507bd2f89ae055de17c4c3b4d Author: David Paleino da...@debian.org Date: Tue Oct 11 23:21:38 2011 +0200 Add Provides --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 488eb9b..0b200a8 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm.git;a=summary Package: python-imposm Architecture: all +Provides: ${python:Provides} Depends: ${python:Depends} , ${misc:Depends} Description: importer for OpenStreetMap data - Python module -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 17/47: It really is arch-dependent
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 632966dbc8e0f9b76a05b428ee7bfef72a30c647 Author: David Paleino da...@debian.org Date: Tue Oct 11 23:33:43 2011 +0200 It really is arch-dependent --- debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index f6dff24..564b576 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org Build-Depends: debhelper (= 8~) - , python (= 2.6.6-3~) + , python-all-dev (= 2.6.6-3~) , python-setuptools , libtokyocabinet-dev , cython @@ -16,10 +16,11 @@ Vcs-Git: git://git.debian.org/pkg-osm/imposm.git Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm.git;a=summary Package: python-imposm -Architecture: all +Architecture: any Provides: ${python:Provides} Depends: ${python:Depends} , ${misc:Depends} + , ${shlibs:Depends} Description: importer for OpenStreetMap data - Python module Imposm is an importer for OpenStreetMap data. It reads XML and PBF files and can import the data into PostgreSQL/PostGIS databases. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 07/47: Properly use dh_python2
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit f91265002befd50d03f1fc9826372dfff1c4126a Author: David Paleino da...@debian.org Date: Tue Oct 11 23:09:57 2011 +0200 Properly use dh_python2 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 440b9d1..58a3f79 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org Build-Depends: debhelper (= 8~) - , python-support + , python (= 2.6.6-3~) Standards-Version: 3.9.2 Homepage: http://imposm.org/ Vcs-Git: git://git.debian.org/pkg-osm/imposm.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm] 03/47: Add B-D on pysupport
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm. commit 46d51fc415afb93e866bd3c9a92d5c3a71933494 Author: David Paleino da...@debian.org Date: Sun Apr 24 20:04:46 2011 +0200 Add B-D on pysupport --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 4b1684d..440b9d1 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org Build-Depends: debhelper (= 8~) + , python-support Standards-Version: 3.9.2 Homepage: http://imposm.org/ Vcs-Git: git://git.debian.org/pkg-osm/imposm.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm-parser] 14/29: Proper support for dh_python2 in debian/control
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm-parser. commit c370f985d9283ec9b761eef47a616e10a89fb45d Author: David Paleino da...@debian.org Date: Wed Sep 7 10:15:07 2011 +0200 Proper support for dh_python2 in debian/control --- debian/changelog | 2 +- debian/control | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1544c1c..c1e8c3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ imposm-parser (1.0.3-1) UNRELEASED; urgency=low * New upstream version - -- David Paleino da...@debian.org Wed, 07 Sep 2011 10:10:33 +0200 + -- David Paleino da...@debian.org Wed, 07 Sep 2011 10:14:50 +0200 imposm-parser (1.0.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index bfceab5..5d41baf 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,11 @@ Priority: extra Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org Build-Depends: debhelper (= 8~) - , python-support , python-setuptools - , python-all-dev + , python-all-dev (= 2.6.6-3~) , libprotobuf-dev (= 2.4) , protobuf-compiler -XS-Python-Version: = 2.5 +X-Python-Version: = 2.5 Standards-Version: 3.9.2 Homepage: http://dev.omniscale.net/imposm.parser/ Vcs-Git: git://git.debian.org/pkg-osm/imposm-parser.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm-parser.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm-parser] 13/29: New upstream version
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm-parser. commit 9ca01081f05832383b01bc49552244b0ac1f82f9 Author: David Paleino da...@debian.org Date: Wed Sep 7 10:10:42 2011 +0200 New upstream version --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb0e386..1544c1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +imposm-parser (1.0.3-1) UNRELEASED; urgency=low + + * New upstream version + + -- David Paleino da...@debian.org Wed, 07 Sep 2011 10:10:33 +0200 + imposm-parser (1.0.2-1) unstable; urgency=low * Initial release (Closes: #623942) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm-parser.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm-parser] 21/29: debhelper compatibility bumped to 9.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm-parser. commit 6bdf182322bcf6d3961bfe7f2a95e860978f2207 Author: David Paleino da...@debian.org Date: Mon Nov 4 17:26:55 2013 +0100 debhelper compatibility bumped to 9. --- debian/changelog | 3 ++- debian/compat| 2 +- debian/control | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 27e9249..abf14a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ imposm-parser (1.0.5-1) UNRELEASED; urgency=low * New upstream version. * Use canonical Vcs-* urls. * Standards-Version bump to 3.9.5, no changes needed. + * debhelper compatibility bumped to 9. - -- David Paleino da...@debian.org Mon, 04 Nov 2013 17:26:22 +0100 + -- David Paleino da...@debian.org Mon, 04 Nov 2013 17:26:48 +0100 imposm-parser (1.0.3-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index f55d795..870415b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: python Priority: extra Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org -Build-Depends: debhelper (= 8~) +Build-Depends: + debhelper (= 9~) , python-setuptools , python-all-dev (= 2.6.6-3~) , libprotobuf-dev (= 2.4) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm-parser.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm-parser] 01/05: pristine-tar data for imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository imposm-parser. commit 29a0e925fd25eec67cff80acb90cc71620d50a56 Author: David Paleino da...@debian.org Date: Sun Apr 24 20:30:31 2011 +0200 pristine-tar data for imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz --- ...arser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.delta | Bin 0 - 3216 bytes ...m-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.id | 1 + 2 files changed, 1 insertion(+) diff --git a/imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.delta b/imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.delta new file mode 100644 index 000..99d9568 Binary files /dev/null and b/imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.delta differ diff --git a/imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.id b/imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.id new file mode 100644 index 000..9dac30e --- /dev/null +++ b/imposm-parser_1.0.1+hg20110424.5307e5693e0c.orig.tar.gz.id @@ -0,0 +1 @@ +e1c6bf5146442240d7942f3071e6ab8264fb2068 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm-parser.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[imposm-parser] 28/29: Merge changes from unreleased 1.0.5-2.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm-parser. commit b5536bc2c54a6d59b21c826c28ef57a51dac7017 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 13 19:57:35 2015 +0100 Merge changes from unreleased 1.0.5-2. --- debian/changelog | 6 ++ debian/copyright | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index de9630d..8bc5d31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +imposm-parser (1.0.6-1) UNRELEASED; urgency=low + + * Updated debian/copyright. + + -- David Paleino da...@debian.org Mon, 04 Nov 2013 17:33:40 +0100 + imposm-parser (1.0.6-0.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/copyright b/debian/copyright index 43217f2..1168ba0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: imposm-parser Upstream-Author: Oliver Tonnhofer o...@omniscale.de Source: http://dev.omniscale.net/imposm.parser/ @@ -8,7 +8,7 @@ Copyright: © 2011, Omniscale GmbH Co. KG License: Apache-2.0 Files: debian/* -Copyright: © 2011, David Paleino da...@debian.org +Copyright: © 2011-2013, David Paleino da...@debian.org License: Apache-2.0 License: Apache-2.0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm-parser.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel