[libosmium] annotated tag upstream/2.0.0 created (now cb6fa05)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.0.0 in repository libosmium. at cb6fa05 (tag) tagging 24235488ffe1e33b1adbcdb85c2afae88801d6f6 (commit) replaces upstream/0.0_20150303-f074d94 tagged by Bas Couwenberg on Fri Mar 6 22:10:44 2015 +0100 - Log - Upstream version 2.0.0 Bas Couwenberg (1): Imported Upstream version 2.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/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] 04/12: Also build documentation.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 253da9f0d41392f03f52d5cd2fb172cbc8d0c0f1 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 18:28:50 2015 +0100 Also build documentation. --- debian/rules | 4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 6f47230..13783ca 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,10 @@ export VERBOSE=1 override_dh_auto_configure: dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1 +override_dh_auto_build: + dh_auto_build + (cd build $(MAKE) doc) + get-orig-source: . debian/get-orig-source -- 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] 02/12: Add build dependencies.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 1a10535e3d9545d42baaac75138e96524c644d6a Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 18:21:14 2015 +0100 Add build dependencies. --- debian/control | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1c3d4bd..1119417 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,22 @@ 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) +Build-Depends: debhelper (= 9), + cmake, + protobuf-compiler, + libprotobuf-dev, + libosmpbf-dev, + libexpat1-dev, + zlib1g-dev, + libbz2-dev, + libsparsehash-dev, + libboost-dev, + libboost-program-options-dev, + libgdal-dev, + libgeos++-dev, + libproj-dev, + doxygen, + graphviz 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 -- 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] 05/12: Use watch file for GitHub releases.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libosmium.
commit 6dfcb172bc470340359779a2bf738a1016e603d8
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 19:38:21 2015 +0100
Use watch file for GitHub releases.
---
debian/get-orig-source | 19 ---
debian/rules | 3 ---
debian/watch | 6 ++
3 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index 0088e5c..000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-REMOTE=upstream
-BRANCH=${REMOTE}/master
-
-if [ $(git remote show ${REMOTE} | wc -l) -eq 0 ]; then
- git remote add ${REMOTE} https://github.com/osmcode/libosmium.git
-fi
-
-git fetch ${REMOTE} --no-tags
-
-PACKAGE=$(dpkg-parsechangelog | grep ^Source: | awk '{print $2}')
-
-COMMIT=$(git log -n1 --format=format:%h ${BRANCH})
-DATE=$(date +%Y%m%d --date=@$(git log -n1 --format=format:%ct ${BRANCH}))
-
-VERSION=0.0~${DATE}-${COMMIT}
-
-git archive --format=tar.gz --prefix=${PACKAGE}-${VERSION}/ -o
../${PACKAGE}_${VERSION}.orig.tar.gz ${BRANCH}
diff --git a/debian/rules b/debian/rules
index 13783ca..3b66002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,3 @@ override_dh_auto_build:
dh_auto_build
(cd build $(MAKE) doc)
-get-orig-source:
- . debian/get-orig-source
-
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..f158b7b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+version=3
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*)?v(\d[\d\.]*)\.tar\.gz/libosmium-$1.tar.gz/ \
+https://github.com/osmcode/libosmium/releases \
+(?:.*/)?(?:rel|v|libosmium)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
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_2.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 libosmium. commit f888040969694abd0abdebab0343bafe7117a914 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 22:10:44 2015 +0100 pristine-tar data for libosmium_2.0.0.orig.tar.gz --- libosmium_2.0.0.orig.tar.gz.delta | Bin 0 - 10187 bytes libosmium_2.0.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libosmium_2.0.0.orig.tar.gz.delta b/libosmium_2.0.0.orig.tar.gz.delta new file mode 100644 index 000..5758ecc Binary files /dev/null and b/libosmium_2.0.0.orig.tar.gz.delta differ diff --git a/libosmium_2.0.0.orig.tar.gz.id b/libosmium_2.0.0.orig.tar.gz.id new file mode 100644 index 000..2c6ab8d --- /dev/null +++ b/libosmium_2.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +70f9fd5d4594f5a7a1181c8a33f9f4cce8741693 -- 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 updated (1e50084 - 2423548)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository libosmium. from 1e50084 Imported Upstream version 0.0~20150303-f074d94 new 2423548 Imported Upstream version 2.0.0 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: CMakeLists.txt | 4 ++-- cmake/FindOsmium.cmake | 10 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) -- 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] 06/12: Override dh_auto_test to run ctest.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit f4740bf75fc983dacb74ac09f980d3ff6d5c689b Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 19:47:58 2015 +0100 Override dh_auto_test to run ctest. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 3b66002..a1be1b6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,3 +15,6 @@ override_dh_auto_build: dh_auto_build (cd build $(MAKE) doc) +override_dh_auto_test: + (cd build ctest -V) + -- 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] 09/12: Imported Upstream version 2.0.0
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libosmium.
commit 24235488ffe1e33b1adbcdb85c2afae88801d6f6
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 22:10:44 2015 +0100
Imported Upstream version 2.0.0
---
CMakeLists.txt | 4 ++--
cmake/FindOsmium.cmake | 10 +++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b48f271..00d48d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,9 @@ set(CMAKE_CONFIGURATION_TYPES
Debug;Release;RelWithDebInfo;MinSizeRel;Dev
project(libosmium)
-set(LIBOSMIUM_VERSION_MAJOR 0)
+set(LIBOSMIUM_VERSION_MAJOR 2)
set(LIBOSMIUM_VERSION_MINOR 0)
-set(LIBOSMIUM_VERSION_PATCH 1)
+set(LIBOSMIUM_VERSION_PATCH 0)
set(LIBOSMIUM_VERSION
${LIBOSMIUM_VERSION_MAJOR}.${LIBOSMIUM_VERSION_MINOR}.${LIBOSMIUM_VERSION_PATCH})
diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
index 4c33708..1de41a0 100644
--- a/cmake/FindOsmium.cmake
+++ b/cmake/FindOsmium.cmake
@@ -226,7 +226,6 @@ if(Osmium_USE_SPARSEHASH)
if(SPARSEHASH_INCLUDE_DIR)
# Find size of sparsetable::size_type. This does not work on older
# CMake versions because they can do this check only in C, not in C++.
-# Until we find a better way, we'll live with that.
include(CheckTypeSize)
set(CMAKE_REQUIRED_INCLUDES ${SPARSEHASH_INCLUDE_DIR})
set(CMAKE_EXTRA_INCLUDE_FILES google/sparsetable)
@@ -234,14 +233,19 @@ if(Osmium_USE_SPARSEHASH)
set(CMAKE_EXTRA_INCLUDE_FILES)
set(CMAKE_REQUIRED_INCLUDES)
+# Falling back to checking size_t if
google::sparsetableint::size_type
+# could not be checked.
+if(SPARSETABLE_SIZE_TYPE STREQUAL )
+check_type_size(void* VOID_PTR_SIZE)
+set(SPARSETABLE_SIZE_TYPE ${VOID_PTR_SIZE})
+endif()
+
# Sparsetable::size_type must be at least 8 bytes (64bit), otherwise
# OSM object IDs will not fit.
if(SPARSETABLE_SIZE_TYPE GREATER 7)
set(SPARSEHASH_FOUND 1)
add_definitions(-DOSMIUM_WITH_SPARSEHASH=${SPARSEHASH_FOUND})
list(APPEND OSMIUM_INCLUDE_DIRS ${SPARSEHASH_INCLUDE_DIR})
-elseif(SPARSETABLE_SIZE_TYPE STREQUAL )
-message(WARNING Osmium: Disabled Google SparseHash library
because we can't detect whether we are on a 64bit system.)
else()
message(WARNING Osmium: Disabled Google SparseHash library on
32bit system (size_type=${SPARSETABLE_SIZE_TYPE}).)
endif()
--
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] 12/12: Install generated HTML documentation.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libosmium.
commit 7ea282f542d1314121a02e4cfc630f17069f7145
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 22:47:08 2015 +0100
Install generated HTML documentation.
---
debian/control | 25 -
debian/{docs = libosmium2-dev.docs} | 0
debian/{examples = libosmium2-dev.examples} | 0
debian/{install = libosmium2-dev.install} | 0
debian/libosmium2-doc.doc-base | 8
debian/libosmium2-doc.docs | 1 +
debian/libosmium2-doc.links | 1 +
debian/rules | 15 +--
8 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 532c16b..fa3f639 100644
--- a/debian/control
+++ b/debian/control
@@ -28,11 +28,12 @@ Package: libosmium2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
+Recommends: libosmium2-doc
Suggests: osmium-tool,
osmium-contrib,
node-osmium,
pyosmium
-Description: Fast and flexible C++ library for working with OpenStreetMap data
+Description: C++ framework for working with OSM data files
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.
@@ -44,4 +45,26 @@ Description: Fast and flexible C++ library for working with
OpenStreetMap data
.
Osmium is a header-only library, so there is nothing to compile to build it.
Just include the header files you need.
+ .
+ This package contains the Osmium library headers.
+
+Package: libosmium2-doc
+Architecture: all
+Section: doc
+Depends: libjs-jquery,
+ ${misc:Depends}
+Description: C++ framework for working with OSM data files - documentation
+ 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.
+ .
+ This package contains the Osmium library documentation.
diff --git a/debian/docs b/debian/libosmium2-dev.docs
similarity index 100%
rename from debian/docs
rename to debian/libosmium2-dev.docs
diff --git a/debian/examples b/debian/libosmium2-dev.examples
similarity index 100%
rename from debian/examples
rename to debian/libosmium2-dev.examples
diff --git a/debian/install b/debian/libosmium2-dev.install
similarity index 100%
rename from debian/install
rename to debian/libosmium2-dev.install
diff --git a/debian/libosmium2-doc.doc-base b/debian/libosmium2-doc.doc-base
new file mode 100644
index 000..3b407f7
--- /dev/null
+++ b/debian/libosmium2-doc.doc-base
@@ -0,0 +1,8 @@
+Document: libosmium
+Title: libosmium documentation
+Author: Jochen Topf
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/libosmium2-doc/html/index.html
+Files: /usr/share/doc/libosmium2-doc/html/*.html
diff --git a/debian/libosmium2-doc.docs b/debian/libosmium2-doc.docs
new file mode 100644
index 000..708e851
--- /dev/null
+++ b/debian/libosmium2-doc.docs
@@ -0,0 +1 @@
+build/doc/html/
diff --git a/debian/libosmium2-doc.links b/debian/libosmium2-doc.links
new file mode 100644
index 000..cf85f0b
--- /dev/null
+++ b/debian/libosmium2-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js
usr/share/libosmium2-dev/doc/html/jquery.js
diff --git a/debian/rules b/debian/rules
index a1be1b6..4731120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,21 @@ export VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1
-override_dh_auto_build:
- dh_auto_build
+override_dh_auto_build-arch:
+ dh_auto_build --arch
+
+override_dh_auto_build-indep:
(cd build $(MAKE) doc)
override_dh_auto_test:
(cd build ctest -V)
+override_dh_installdocs:
+ dh_installdocs
+
+ # Remove embedded jquery.js in favor of libjs-query
+ $(RM) debian/*/usr/share/doc/*/html/jquery.js
+
+ # Remove useless autogenerated doxygen file
+ $(RM) debian/*/usr/share/doc/*/html/*.md5
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libosmium.git
___
[libosmium] branch pristine-tar updated (6fc6899 - f888040)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository libosmium. from 6fc6899 pristine-tar data for libosmium_0.0~20150303-f074d94.orig.tar.gz new f888040 pristine-tar data for libosmium_2.0.0.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: libosmium_2.0.0.orig.tar.gz.delta | Bin 0 - 10187 bytes libosmium_2.0.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 libosmium_2.0.0.orig.tar.gz.delta create mode 100644 libosmium_2.0.0.orig.tar.gz.id -- 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] 03/12: Enable verbose build output.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 178efd72ac979fa62f85841c99d615f1d2f3c9a3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 18:23:39 2015 +0100 Enable verbose build output. --- debian/rules | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/rules b/debian/rules index 6f059c0..6f47230 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,15 @@ # DH_VERBOSE := 1 +# Verbose make output +export VERBOSE=1 + %: dh $@ --parallel +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1 + get-orig-source: . debian/get-orig-source -- 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] 07/12: Install headers, examples docs.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit c4bf8cce6606fbf4285a9f4c7bfa0273c761c523 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 21:01:45 2015 +0100 Install headers, examples docs. --- debian/docs | 2 ++ debian/examples | 1 + debian/install | 1 + 3 files changed, 4 insertions(+) diff --git a/debian/docs b/debian/docs new file mode 100644 index 000..e4bd0a0 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +README.md +CONTRIBUTING.md diff --git a/debian/examples b/debian/examples new file mode 100644 index 000..7c8b6ef --- /dev/null +++ b/debian/examples @@ -0,0 +1 @@ +examples/*.cpp diff --git a/debian/install b/debian/install new file mode 100644 index 000..ab093ac --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +include/ usr/ -- 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] 10/12: Merge tag 'upstream/2.0.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit ce6907ac34c9dab802a56ceeb2f1ff5ec6db534a Merge: 8a7c55c 2423548 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 22:10:44 2015 +0100 Merge tag 'upstream/2.0.0' Upstream version 2.0.0 CMakeLists.txt | 4 ++-- cmake/FindOsmium.cmake | 10 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) -- 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] 08/12: Use libosmium2-dev as package name.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libosmium.
commit 8a7c55c228516dd8e9a8f26aa9da6b6f6b44126a
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 21:58:23 2015 +0100
Use libosmium2-dev as package name.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 1119417..532c16b 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ 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
+Package: libosmium2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
--
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/12: Suggest osmium-tool instead of osmium.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libosmium.
commit f47503a08cda5fc2c4506c1c83f4bb381893ddf9
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 18:17:03 2015 +0100
Suggest osmium-tool instead of osmium.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index ae23f28..1c3d4bd 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: libosmium-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
-Suggests: osmium,
+Suggests: osmium-tool,
osmium-contrib,
node-osmium,
pyosmium
--
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 master updated (fdc0e87 - 7ea282f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository libosmium. from fdc0e87 Initial Debian packaging. new f47503a Suggest osmium-tool instead of osmium. new 1a10535 Add build dependencies. new 178efd7 Enable verbose build output. new 253da9f Also build documentation. new 6dfcb17 Use watch file for GitHub releases. new f4740bf Override dh_auto_test to run ctest. new c4bf8cc Install headers, examples docs. new 8a7c55c Use libosmium2-dev as package name. new 2423548 Imported Upstream version 2.0.0 new ce6907a Merge tag 'upstream/2.0.0' new 2057d97 New upstream release. new 7ea282f Install generated HTML documentation. The 12 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 ++-- cmake/FindOsmium.cmake | 10 ++--- debian/changelog | 4 ++-- debian/control | 46 ++ debian/get-orig-source | 19 - debian/libosmium2-dev.docs | 2 ++ debian/libosmium2-dev.examples | 1 + debian/libosmium2-dev.install | 1 + debian/libosmium2-doc.doc-base | 8 debian/libosmium2-doc.docs | 1 + debian/libosmium2-doc.links| 1 + debian/rules | 25 +-- debian/watch | 6 ++ 13 files changed, 96 insertions(+), 32 deletions(-) delete mode 100755 debian/get-orig-source create mode 100644 debian/libosmium2-dev.docs create mode 100644 debian/libosmium2-dev.examples create mode 100644 debian/libosmium2-dev.install create mode 100644 debian/libosmium2-doc.doc-base create mode 100644 debian/libosmium2-doc.docs create mode 100644 debian/libosmium2-doc.links create mode 100644 debian/watch -- 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
[qgis] 02/05: Add patch to cast doubles to qreal to fix FTBFS on arm*.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit c194e1309909106cc132df29525602b0bc2b0205
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Thu Mar 5 22:51:35 2015 +0100
Add patch to cast doubles to qreal to fix FTBFS on arm*.
---
debian/changelog | 1 +
debian/patches/arm-qreal.patch | 205 +
debian/patches/series | 1 +
3 files changed, 207 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5f24ecf..408b87c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qgis (2.8.1+dfsg1-1~exp2) UNRELEASED; urgency=medium
* Don't build internal PySpatiaLite, use Debian package instead.
(closes: #779933)
+ * Add patch to cast doubles to qreal to fix FTBFS on arm*.
-- Bas Couwenberg sebas...@debian.org Thu, 05 Mar 2015 22:51:10 +0100
diff --git a/debian/patches/arm-qreal.patch b/debian/patches/arm-qreal.patch
new file mode 100644
index 000..3b23392
--- /dev/null
+++ b/debian/patches/arm-qreal.patch
@@ -0,0 +1,205 @@
+Description: Fix FTBFS on arm* by casting doubles to qreal.
+ In qt4 on arm architectures qreal is defined as float while on other
+ architectures it is defined as double.
+Author: Bas Couwenberg sebas...@debian.org
+
+--- a/src/core/symbology-ng/qgsrendererv2.cpp
b/src/core/symbology-ng/qgsrendererv2.cpp
+@@ -53,7 +53,10 @@ const unsigned char* QgsFeatureRendererV
+ context.coordinateTransform()-transformInPlace( x, y, z );
+ }
+
+- context.mapToPixel().transformInPlace( x, y );
++ qreal qx = (qreal) x;
++ qreal qy = (qreal) y;
++
++ context.mapToPixel().transformInPlace( qx, qy );
+
+ pt = QPointF( x, y );
+ return wkbPtr;
+--- a/src/core/qgsgeometry.cpp
b/src/core/qgsgeometry.cpp
+@@ -4683,7 +4683,13 @@ void QgsGeometry::transformVertex( QgsWk
+
+ QgsWkbPtr tmp = wkbPtr;
+ tmp x y;
+- trans.map( x, y, rotated_x, rotated_y );
++
++ qreal qx = (qreal) x;
++ qreal qy = (qreal) y;
++ qreal qrx = (qreal) rotated_x;
++ qreal qry = (qreal) rotated_y;
++
++ trans.map( qx, qy, qrx, qry );
+ wkbPtr rotated_x rotated_y;
+
+ if ( hasZValue )
+--- a/src/core/qgsmaptopixel.cpp
b/src/core/qgsmaptopixel.cpp
+@@ -124,7 +124,16 @@ QgsPoint QgsMapToPixel::toMapPoint( doub
+ QTransform matrix = mMatrix.inverted( invertible );
+ assert( invertible );
+ double mx, my;
+- matrix.map( x, y, mx, my );
++
++ qreal qx = (qreal) x;
++ qreal qy = (qreal) y;
++ qreal qmx, qmy;
++
++ matrix.map( qx, qy, qmx, qmy );
++
++ mx = (double) qmx;
++ my = (double) qmy;
++
+ QgsPoint ret( mx, my );
+
+ //QgsDebugMsg(QString(XXX toMapPoint x:%1 y:%2 - x:%3
y:%4).arg(x).arg(y).arg(mx).arg(my));
+@@ -238,7 +247,14 @@ QString QgsMapToPixel::showParameters()
+
+ QgsPoint QgsMapToPixel::transform( double x, double y ) const
+ {
+- transformInPlace( x, y );
++ qreal qx = (qreal) x;
++ qreal qy = (qreal) y;
++
++ transformInPlace( qx, qy );
++
++ x = (double) qx;
++ y = (double) qy;
++
+ return QgsPoint( x, y );
+ }
+
+@@ -246,7 +262,14 @@ QgsPoint QgsMapToPixel::transform( const
+ {
+ double dx = p.x();
+ double dy = p.y();
+- transformInPlace( dx, dy );
++
++ qreal qdx = (qreal) dx;
++ qreal qdy = (qreal) dy;
++
++ transformInPlace( qdx, qdy );
++
++ dx = (double) qdx;
++ dy = (double) qdy;
+
+ // QgsDebugMsg(QString(Point to pixel...X : %1--%2, Y: %3
--%4).arg(p.x()).arg(dx).arg(p.y()).arg(dy));
+ return QgsPoint( dx, dy );
+@@ -256,7 +279,14 @@ void QgsMapToPixel::transform( QgsPoint*
+ {
+ double x = p-x();
+ double y = p-y();
+- transformInPlace( x, y );
++
++ qreal qx = (qreal) x;
++ qreal qy = (qreal) y;
++
++ transformInPlace( qx, qy );
++
++ x = (double) qx;
++ y = (double) qy;
+
+ #ifdef QGISDEBUG
+ // QgsDebugMsg(QString(Point to pixel...X : %1--%2, Y: %3
--%4).arg(p-x()).arg(x).arg(p-y()).arg(y));
+@@ -267,7 +297,7 @@ void QgsMapToPixel::transform( QgsPoint*
+ void QgsMapToPixel::transformInPlace( qreal x, qreal y ) const
+ {
+ // Map 2 Pixel
+- double mx, my;
++ qreal mx, my;
+ mMatrix.map( x, y, mx, my );
+ //QgsDebugMsg(QString(XXX transformInPlace X : %1--%2, Y: %3
--%4).arg(x).arg(mx).arg(y).arg(my));
+ x = mx; y = my;
+--- a/src/core/qgspallabeling.cpp
b/src/core/qgspallabeling.cpp
+@@ -2106,7 +2106,16 @@ void QgsPalLayerSettings::registerFeatur
+ t.rotate( -m2p.mapRotation() );
+ t.translate( -center.x(), -center.y() );
+ double xPosR, yPosR;
+- t.map( xPos, yPos, xPosR, yPosR );
++
++ qreal qxPos = (qreal) xPos;
++ qreal qyPos = (qreal) yPos;
++ qreal qxPosR, qyPosR;
++
++ t.map( qxPos, qyPos, qxPosR, qyPosR );
++
++ xPosR = (double) qxPosR;
++ yPosR = (double) qyPosR;
++
+ xPos = xPosR; yPos = yPosR;
+ }
+
+--- a/src/core/composer/qgscomposermapgrid.cpp
[qgis] branch master updated (61767f4 - 0c523a2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository qgis. from 61767f4 Set distribution to experimental. new a3a6a2b Don't build internal PySpatiaLite, use Debian package instead. new c194e13 Add patch to cast doubles to qreal to fix FTBFS on arm*. new a5f9768 Replace patch to fix arm FTBFS by upstream one. new 17ff6e6 Add patches from upstream release-2_8 branch. new 0c523a2 Set distribution to experimental. 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: debian/changelog | 9 + ...-about-possible-pending-bug-in-force2d-ne.patch | 32 ++ ...er-of-dimensions-for-tables-with-unconstr.patch | 40 ++ ...001-Fix-handling-of-warped-VRT-refs-12264.patch | 24 ++ ...or-dimension-if-it-is-not-already-known-a.patch | 65 ...0001-Use-ST_Force2D-from-PostGIS-2.1.0-up.patch | 26 ++ ...tribute-table-fix-changing-header-font-fi.patch | 23 ++ ...builder-widget-save-scripts-in-the-same-m.patch | 24 ++ ...-fix-SAGA-2.1.3-Kernel-Density-Estimation.patch | 22 ++ debian/patches/0001-fix-arm-build.patch| 418 + .../0001-german-translation-fix-fixes-12231.patch | 163 ...ovider-restore-behaviour-to-keep-3d-wkb-r.patch | 72 ...ovider-use-min-max-before-casting-followu.patch | 95 + ...fix-error-in-MultipleFileInput-selector-w.patch | 23 ++ debian/patches/0001-translation-string-fix.patch | 21 ++ debian/patches/series | 14 + debian/python-qgis.install | 1 - debian/rules | 2 +- 18 files changed, 1072 insertions(+), 2 deletions(-) create mode 100644 debian/patches/0001-Add-comment-about-possible-pending-bug-in-force2d-ne.patch create mode 100644 debian/patches/0001-Detect-number-of-dimensions-for-tables-with-unconstr.patch create mode 100644 debian/patches/0001-Fix-handling-of-warped-VRT-refs-12264.patch create mode 100644 debian/patches/0001-Only-scan-for-dimension-if-it-is-not-already-known-a.patch create mode 100644 debian/patches/0001-Use-ST_Force2D-from-PostGIS-2.1.0-up.patch create mode 100644 debian/patches/0001-composer-attribute-table-fix-changing-header-font-fi.patch create mode 100644 debian/patches/0001-expression-builder-widget-save-scripts-in-the-same-m.patch create mode 100644 debian/patches/0001-fix-SAGA-2.1.3-Kernel-Density-Estimation.patch create mode 100644 debian/patches/0001-fix-arm-build.patch create mode 100644 debian/patches/0001-german-translation-fix-fixes-12231.patch create mode 100644 debian/patches/0001-postgres-provider-restore-behaviour-to-keep-3d-wkb-r.patch create mode 100644 debian/patches/0001-postgres-provider-use-min-max-before-casting-followu.patch create mode 100644 debian/patches/0001-processing-fix-error-in-MultipleFileInput-selector-w.patch create mode 100644 debian/patches/0001-translation-string-fix.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.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
[qgis] 01/05: Don't build internal PySpatiaLite, use Debian package instead.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis. commit a3a6a2bcbd4b1a1521e21eb8c0869e057ef4f27b Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 17:40:36 2015 +0100 Don't build internal PySpatiaLite, use Debian package instead. --- debian/changelog | 7 +++ debian/python-qgis.install | 1 - debian/rules | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 482eb13..5f24ecf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +qgis (2.8.1+dfsg1-1~exp2) UNRELEASED; urgency=medium + + * Don't build internal PySpatiaLite, use Debian package instead. +(closes: #779933) + + -- Bas Couwenberg sebas...@debian.org Thu, 05 Mar 2015 22:51:10 +0100 + qgis (2.8.1+dfsg1-1~exp1) experimental; urgency=medium * Fix upstream version extraction from changelog. diff --git a/debian/python-qgis.install b/debian/python-qgis.install index 95dc23d..327df22 100644 --- a/debian/python-qgis.install +++ b/debian/python-qgis.install @@ -1,2 +1 @@ usr/lib/python*/*-packages/qgis/ -usr/lib/python*/*-packages/pyspatialite/ diff --git a/debian/rules b/debian/rules index 902d23c..5f5e69a 100755 --- a/debian/rules +++ b/debian/rules @@ -71,7 +71,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -ifneq (,$(findstring $(DISTRIBUTION),wheezy jessie sid precise)) +ifneq (,$(findstring $(DISTRIBUTION),wheezy precise)) CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.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
[qgis] 04/05: Add patches from upstream release-2_8 branch.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 17ff6e6b241a680c3f378d01b7c6c7c67a3b88f1
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Mar 9 19:19:26 2015 +0100
Add patches from upstream release-2_8 branch.
---
debian/changelog | 1 +
...-about-possible-pending-bug-in-force2d-ne.patch | 32
...er-of-dimensions-for-tables-with-unconstr.patch | 40 +
...001-Fix-handling-of-warped-VRT-refs-12264.patch | 24 +++
...or-dimension-if-it-is-not-already-known-a.patch | 65
...0001-Use-ST_Force2D-from-PostGIS-2.1.0-up.patch | 26
...tribute-table-fix-changing-header-font-fi.patch | 23 +++
...builder-widget-save-scripts-in-the-same-m.patch | 24 +++
...-fix-SAGA-2.1.3-Kernel-Density-Estimation.patch | 22 +++
.../0001-german-translation-fix-fixes-12231.patch | 163 +
...ovider-restore-behaviour-to-keep-3d-wkb-r.patch | 72 +
...ovider-use-min-max-before-casting-followu.patch | 95
...fix-error-in-MultipleFileInput-selector-w.patch | 23 +++
debian/patches/0001-translation-string-fix.patch | 21 +++
debian/patches/series | 13 ++
15 files changed, 644 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0da02e6..82fe8cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qgis (2.8.1+dfsg1-1~exp2) UNRELEASED; urgency=medium
* Don't build internal PySpatiaLite, use Debian package instead.
(closes: #779933)
* Add patch to fix FTBFS on arm*.
+ * Add patches from upstream release-2_8 branch.
-- Bas Couwenberg sebas...@debian.org Thu, 05 Mar 2015 22:51:10 +0100
diff --git
a/debian/patches/0001-Add-comment-about-possible-pending-bug-in-force2d-ne.patch
b/debian/patches/0001-Add-comment-about-possible-pending-bug-in-force2d-ne.patch
new file mode 100644
index 000..79a5d95
--- /dev/null
+++
b/debian/patches/0001-Add-comment-about-possible-pending-bug-in-force2d-ne.patch
@@ -0,0 +1,32 @@
+From d2d6813673a6a7da97dc47f8b5bc27f124326a62 Mon Sep 17 00:00:00 2001
+From: Sandro Santilli s...@keybit.net
+Date: Tue, 3 Mar 2015 17:41:29 +0100
+Subject: Add comment about possible pending bug in force2d need detection
+Origin:
https://github.com/qgis/QGIS/commit/d2d6813673a6a7da97dc47f8b5bc27f124326a62
+
+---
+ src/providers/postgres/qgspostgresconn.cpp |6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/src/providers/postgres/qgspostgresconn.cpp
b/src/providers/postgres/qgspostgresconn.cpp
+@@ -469,6 +469,10 @@ bool QgsPostgresConn::getTableInfo( bool
+ layerProperty.types = QListQGis::WkbType() (
QgsPostgresConn::wkbTypeFromPostgis( type ) );
+ layerProperty.srids = QListint() srid;
+ layerProperty.sql = ;
++ /* TODO: why not != 2 ?
++ * Also note the value is not necessarely trustworthy:
++ * http://trac.osgeo.org/postgis/ticket/3068
++ */
+ layerProperty.force2d = dim == 4;
+ addColumnInfo( layerProperty, schemaName, tableName, isView );
+
+@@ -1307,7 +1311,7 @@ void QgsPostgresConn::retrieveLayerTypes
+
+ query += FROM + table;
+
+-//QgsDebugMsg( Retrieving geometry types: + query );
++//QgsDebugMsg( Retrieving geometry types,srids and dims: + query );
+
+ QgsPostgresResult gresult = PQexec( query );
+
diff --git
a/debian/patches/0001-Detect-number-of-dimensions-for-tables-with-unconstr.patch
b/debian/patches/0001-Detect-number-of-dimensions-for-tables-with-unconstr.patch
new file mode 100644
index 000..68e5102
--- /dev/null
+++
b/debian/patches/0001-Detect-number-of-dimensions-for-tables-with-unconstr.patch
@@ -0,0 +1,40 @@
+From 3d6554e0ab35444228cf3d7d0e1eb6e1e08173bb Mon Sep 17 00:00:00 2001
+From: Sandro Santilli s...@keybit.net
+Date: Tue, 3 Mar 2015 17:34:48 +0100
+Subject: Detect number of dimensions for tables with unconstrained type
+Origin:
https://github.com/qgis/QGIS/commit/3d6554e0ab35444228cf3d7d0e1eb6e1e08173bb
+Bug: http://hub.qgis.org/issues/9748
+
+Fixes #9748
+
+(cherry picked from commit f512e87ffd0ed7297520bf63830c1fc5c37d7ee9)
+---
+ src/providers/postgres/qgspostgresconn.cpp | 10 ++
+ 1 file changed, 10 insertions(+)
+
+--- a/src/providers/postgres/qgspostgresconn.cpp
b/src/providers/postgres/qgspostgresconn.cpp
+@@ -1298,6 +1298,12 @@ void QgsPostgresConn::retrieveLayerTypes
+ query += QString::number( srid );
+ }
+
++query += ,;
++query += QString( %1(%2%3) )
++ .arg( majorVersion() 2 ? ndims : st_ndims )
++ .arg( quotedIdentifier( layerProperty.geometryColName ) )
++ .arg( layerProperty.geometryColType == sctGeography ?
::geometry : );
++
+ query += FROM + table;
+
+ //QgsDebugMsg( Retrieving geometry types: + query );
+@@ -1310,6 +1316,10 @@ void QgsPostgresConn::retrieveLayerTypes
+ {
+
[qgis] 03/05: Replace patch to fix arm FTBFS by upstream one.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit a5f97688fe88b351253162c766e5473998b09e3d
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Mar 9 19:09:55 2015 +0100
Replace patch to fix arm FTBFS by upstream one.
---
debian/changelog| 2 +-
debian/patches/0001-fix-arm-build.patch | 418
debian/patches/arm-qreal.patch | 205
debian/patches/series | 2 +-
4 files changed, 420 insertions(+), 207 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 408b87c..0da02e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ qgis (2.8.1+dfsg1-1~exp2) UNRELEASED; urgency=medium
* Don't build internal PySpatiaLite, use Debian package instead.
(closes: #779933)
- * Add patch to cast doubles to qreal to fix FTBFS on arm*.
+ * Add patch to fix FTBFS on arm*.
-- Bas Couwenberg sebas...@debian.org Thu, 05 Mar 2015 22:51:10 +0100
diff --git a/debian/patches/0001-fix-arm-build.patch
b/debian/patches/0001-fix-arm-build.patch
new file mode 100644
index 000..04bf77a
--- /dev/null
+++ b/debian/patches/0001-fix-arm-build.patch
@@ -0,0 +1,418 @@
+From 1aff7335d004bc410eb61e1436ee7648716f9319 Mon Sep 17 00:00:00 2001
+From: Juergen E. Fischer j...@norbit.de
+Date: Mon, 9 Mar 2015 09:27:27 +0100
+Subject: fix arm build
+Origin:
https://github.com/qgis/QGIS/commit/1aff7335d004bc410eb61e1436ee7648716f9319
+
+---
+ src/app/qgsdecorationgrid.cpp | 16 ++--
+ src/app/qgsdecorationgrid.h|6 ++---
+ src/app/qgsmapmouseevent.cpp |3 +--
+ src/core/composer/qgscomposermapgrid.cpp |4 +--
+ src/core/qgsgeometry.cpp |2 +-
+ src/core/qgsgeometry.h |9 +++
+ src/core/qgsmaptopixel.cpp | 38 ++--
+ src/core/qgsmaptopixel.h |4 +--
+ src/core/qgspallabeling.cpp|2 +-
+ src/core/qgspointlocator.cpp |8 +++---
+ src/core/symbology-ng/qgsrendererv2.cpp| 12 +++--
+ src/gui/qgsmapcanvasitem.cpp |2 +-
+ src/gui/qgsmaptool.cpp |2 +-
+ src/providers/wcs/qgswcsprovider.cpp |2 +-
+ tests/src/core/testqgsatlascomposition.cpp |8 +++---
+ 15 files changed, 56 insertions(+), 62 deletions(-)
+
+--- a/src/app/qgsdecorationgrid.cpp
b/src/app/qgsdecorationgrid.cpp
+@@ -217,14 +217,14 @@ void QgsDecorationGrid::render( QPainter
+
+ // p-setPen( mGridPen );
+
+- QList QPair double, QLineF verticalLines;
++ QList QPair qreal, QLineF verticalLines;
+ yGridLines( verticalLines );
+- QList QPair double, QLineF horizontalLines;
++ QList QPair qreal, QLineF horizontalLines;
+ xGridLines( horizontalLines );
+ //QgsDebugMsg( QString(grid has %1 vertical and %2 horizontal lines).arg(
verticalLines.size() ).arg( horizontalLines.size() ) );
+
+- QList QPair double, QLineF ::const_iterator vIt =
verticalLines.constBegin();
+- QList QPair double, QLineF ::const_iterator hIt =
horizontalLines.constBegin();
++ QList QPair qreal, QLineF ::const_iterator vIt =
verticalLines.constBegin();
++ QList QPair qreal, QLineF ::const_iterator hIt =
horizontalLines.constBegin();
+
+ //simpler approach: draw vertical lines first, then horizontal ones
+ if ( mGridStyle == QgsDecorationGrid::Line )
+@@ -338,7 +338,7 @@ void QgsDecorationGrid::render( QPainter
+ }
+ }
+
+-void QgsDecorationGrid::drawCoordinateAnnotations( QPainter* p, const QList
QPair double, QLineF hLines, const QList QPair double, QLineF
vLines )
++void QgsDecorationGrid::drawCoordinateAnnotations( QPainter* p, const QList
QPair qreal, QLineF hLines, const QList QPair qreal, QLineF vLines
)
+ {
+ if ( !p )
+ {
+@@ -346,7 +346,7 @@ void QgsDecorationGrid::drawCoordinateAn
+ }
+
+ QString currentAnnotationString;
+- QList QPair double, QLineF ::const_iterator it = hLines.constBegin();
++ QList QPair qreal, QLineF ::const_iterator it = hLines.constBegin();
+ for ( ; it != hLines.constEnd(); ++it )
+ {
+ currentAnnotationString = QString::number( it-first, 'f',
mGridAnnotationPrecision );
+@@ -566,7 +566,7 @@ QPolygonF canvasExtent()
+ return poly;
+ }
+
+-int QgsDecorationGrid::xGridLines( QList QPair double, QLineF lines )
const
++int QgsDecorationGrid::xGridLines( QList QPair qreal, QLineF lines )
const
+ {
+ // prepare horizontal lines
+ lines.clear();
+@@ -612,7 +612,7 @@ int QgsDecorationGrid::xGridLines( QList
+ return 0;
+ }
+
+-int QgsDecorationGrid::yGridLines( QList QPair double, QLineF lines )
const
++int QgsDecorationGrid::yGridLines( QList QPair qreal, QLineF lines )
const
+ {
+ // prepare vertical lines
+
+--- a/src/app/qgsdecorationgrid.h
b/src/app/qgsdecorationgrid.h
+@@ -199,7
[qgis] 05/05: 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 qgis. commit 0c523a276171900fd5837cc8b9df454a1776eb58 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Mar 9 19:19:41 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 82fe8cf..141fbf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -qgis (2.8.1+dfsg1-1~exp2) UNRELEASED; urgency=medium +qgis (2.8.1+dfsg1-1~exp2) experimental; urgency=medium * Don't build internal PySpatiaLite, use Debian package instead. (closes: #779933) * Add patch to fix FTBFS on arm*. * Add patches from upstream release-2_8 branch. - -- Bas Couwenberg sebas...@debian.org Thu, 05 Mar 2015 22:51:10 +0100 + -- Bas Couwenberg sebas...@debian.org Mon, 09 Mar 2015 19:19:27 +0100 qgis (2.8.1+dfsg1-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.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
[qgis] tag debian/2.8.1+dfsg1-1.exp2 created (now 0c523a2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.8.1+dfsg1-1.exp2 in repository qgis. at 0c523a2 (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/qgis.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
[proj] 02/06: Merge tag 'upstream/4.9.1' into experimental
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository proj. commit 8565a253fe46659e219d5b1ef28b823da03ed6f3 Merge: c04b5e2 0ff3ded Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Mar 10 20:52:01 2015 +0100 Merge tag 'upstream/4.9.1' into experimental Upstream version 4.9.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.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
[osmium-tool] 01/01: pristine-tar data for osmium-tool_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 osmium-tool. commit 82b79e8c6b3c6923d246664b5c8c82f82526d3ef Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 19:52:05 2015 +0100 pristine-tar data for osmium-tool_1.0.0.orig.tar.gz --- osmium-tool_1.0.0.orig.tar.gz.delta | Bin 0 - 2288 bytes osmium-tool_1.0.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osmium-tool_1.0.0.orig.tar.gz.delta b/osmium-tool_1.0.0.orig.tar.gz.delta new file mode 100644 index 000..8ba66a6 Binary files /dev/null and b/osmium-tool_1.0.0.orig.tar.gz.delta differ diff --git a/osmium-tool_1.0.0.orig.tar.gz.id b/osmium-tool_1.0.0.orig.tar.gz.id new file mode 100644 index 000..46c7da4 --- /dev/null +++ b/osmium-tool_1.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +847f0f97d92b7dc156941d4144472e0b0ccf8897 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] 08/11: Add libbz2-dev build dependency.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit fcb571b1d1ca058424d55d1863ea6ea10ac9f9cc Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Mar 11 21:16:41 2015 +0100 Add libbz2-dev build dependency. --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 8f43f71..201925c 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (= 9), cmake, libboost-dev, libboost-program-options-dev, + libbz2-dev, libexpat1-dev, libosmium2-dev, libosmpbf-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] branch master updated (a34c03c - 320e7c9)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmium-tool. from a34c03c Initial Debian packaging. new ab2c74c Use watch file for GitHub releases. new fc95954 Imported Upstream version 1.0.0 new 1d9ab29 Merge tag 'upstream/1.0.0' new f658b47 New upstream release. new f39b004 Fix Homepage URL. new effa1bf Trim build dependencies to those listed in README.md. new 0f9573e Drop Suggests on other packages in the osmium family. new fcb571b Add libbz2-dev build dependency. new 9c2fdba Wrap lines in extended description at 80 characters. new 8186eaa Enable verbose build output. new 320e7c9 Explicitly use CMake build system, also enable parallel builds. The 11 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 ++-- debian/changelog | 4 ++-- debian/control | 19 ++- debian/get-orig-source | 19 --- debian/rules | 9 - debian/watch | 6 ++ 6 files changed, 28 insertions(+), 33 deletions(-) delete mode 100755 debian/get-orig-source create mode 100644 debian/watch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] 01/11: Use watch file for GitHub releases.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit ab2c74cb7d794e9c1b813cced372bc6747320942
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 19:51:46 2015 +0100
Use watch file for GitHub releases.
---
debian/get-orig-source | 19 ---
debian/watch | 6 ++
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index 205fd0d..000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-REMOTE=upstream
-BRANCH=${REMOTE}/master
-
-if [ $(git remote show ${REMOTE} | wc -l) -eq 0 ]; then
- git remote add ${REMOTE} https://github.com/osmcode/osmium-tool.git
-fi
-
-git fetch ${REMOTE} --no-tags
-
-PACKAGE=$(dpkg-parsechangelog | grep ^Source: | awk '{print $2}')
-
-COMMIT=$(git log -n1 --format=format:%h ${BRANCH})
-DATE=$(date +%Y%m%d --date=@$(git log -n1 --format=format:%ct ${BRANCH}))
-
-VERSION=0.0~${DATE}-${COMMIT}
-
-git archive --format=tar.gz --prefix=${PACKAGE}-${VERSION}/ -o
../${PACKAGE}_${VERSION}.orig.tar.gz ${BRANCH}
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..22797ea
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+version=3
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*)?v(\d[\d\.]*)\.tar\.gz/osmium-tool-$1.tar.gz/ \
+https://github.com/osmcode/osmium-tool/releases \
+(?:.*/)?(?:rel|v|osmium-tool)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] 03/11: 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 osmium-tool. commit 1d9ab29302783fcb74efa1e3c72f697c78672b4d Merge: ab2c74c fc95954 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 19:52:05 2015 +0100 Merge tag 'upstream/1.0.0' Upstream version 1.0.0 CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] 05/11: Fix Homepage URL.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit f39b0044eddc09c5bc2e3c1c8081702f7b3ef1cd Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 19:53:32 2015 +0100 Fix Homepage URL. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e055a94..ea22ec0 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (= 9), Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/ Vcs-Git: git://anonscm.debian.org/pkg-grass/osmium-tool.git -Homepage: http://osmcode.org/osmium-tool/ +Homepage: http://osmcode.org/osmium/ Package: osmium-tool Architecture: any -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] 07/11: Drop Suggests on other packages in the osmium family.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit 0f9573e84176834d97b113008ad2a8b4ec7e1aa0
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Mar 11 21:11:58 2015 +0100
Drop Suggests on other packages in the osmium family.
---
debian/control | 3 ---
1 file changed, 3 deletions(-)
diff --git a/debian/control b/debian/control
index c1836dd..8f43f71 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,6 @@ Architecture: any
Section: utils
Depends: ${shlibs:Depends},
${misc:Depends}
-Suggests: osmium-contrib,
- node-osmium,
- pyosmium
Description: Command line tool for working with OpenStreetMap data
Osmium Tool is a multipurpose command line tool based on the Osmium library.
.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] branch upstream updated (e1e2b0e - fc95954)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository osmium-tool. from e1e2b0e Imported Upstream version 0.0~20150306-4ef5dd5 new fc95954 Imported Upstream version 1.0.0 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: CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-contrib] branch master updated (b73cb86 - 159dca7)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmium-contrib. from b73cb86 Initial Debian packaging. new 159dca7 Drop Suggests on other packages in the osmium family. 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: debian/control | 3 --- 1 file changed, 3 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-contrib.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
[pyosmium] branch master updated (0fcb2c0 - 0ab0209)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository pyosmium. from 0fcb2c0 Initial Debian packaging. new 0ab0209 Drop Suggests on other packages in the osmium family. 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: debian/control | 6 -- 1 file changed, 6 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.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
[osmium-tool] 06/11: Trim build dependencies to those listed in README.md.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit effa1bf21a31d081db7f78f2beca94551cd19007 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Mar 7 00:52:43 2015 +0100 Trim build dependencies to those listed in README.md. --- debian/control | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index ea22ec0..c1836dd 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,14 @@ Uploaders: Bas Couwenberg sebas...@debian.org Section: science Priority: optional Build-Depends: debhelper (= 9), - cmake (= 2.8), + cmake, + libboost-dev, libboost-program-options-dev, - libbz2-dev, - libcrypto++-dev, libexpat1-dev, + libosmium2-dev, libosmpbf-dev, - libprotobuf-c-dev | libprotobuf-c0-dev (= 0.14), + libprotobuf-dev, + protobuf-compiler, pandoc, zlib1g-dev Standards-Version: 3.9.6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-tool] 04/11: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit f658b472588f5c828c585c761d36eeeafc2bc2d3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 19:52:17 2015 +0100 New upstream release. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0fba18..d076ac8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -osmium-tool (0.0~20150306-4ef5dd5-1) UNRELEASED; urgency=medium +osmium-tool (1.0.0-1) UNRELEASED; urgency=medium * Initial release (Closes: #779938) - -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 15:43:50 +0100 + -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 19:52:10 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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/03: Fix jquery.js symlink for doc package.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 9c7c1e426eded82f220981daac49e3400cb8cd6a Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Mar 11 17:57:06 2015 +0100 Fix jquery.js symlink for doc package. --- debian/libosmium2-doc.links | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libosmium2-doc.links b/debian/libosmium2-doc.links index cf85f0b..d08292f 100644 --- a/debian/libosmium2-doc.links +++ b/debian/libosmium2-doc.links @@ -1 +1 @@ -usr/share/javascript/jquery/jquery.js usr/share/libosmium2-dev/doc/html/jquery.js +usr/share/javascript/jquery/jquery.js usr/share/doc/libosmium2-doc/html/jquery.js -- 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] 03/03: Drop Suggests on other packages in the osmium family.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libosmium.
commit 4ec978a0a266a1bd6e54b8824283ff1d38c86446
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Mar 11 19:59:12 2015 +0100
Drop Suggests on other packages in the osmium family.
---
debian/control | 4
1 file changed, 4 deletions(-)
diff --git a/debian/control b/debian/control
index fa3f639..2b7849c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,10 +29,6 @@ Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Recommends: libosmium2-doc
-Suggests: osmium-tool,
- osmium-contrib,
- node-osmium,
- pyosmium
Description: C++ framework for working with OSM data files
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
--
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
[qgis] tag debian/2.8.1+dfsg1-1.exp3 created (now 5f0c9b3)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.8.1+dfsg1-1.exp3 in repository qgis. at 5f0c9b3 (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/qgis.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 updated (7ea282f - 4ec978a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository libosmium. from 7ea282f Install generated HTML documentation. new 9c7c1e4 Fix jquery.js symlink for doc package. new 3abcf43 Use osmcode.org contact URL instead of d...@osm.org in Upstream-Contact. new 4ec978a Drop Suggests on other packages in the osmium family. 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: debian/control | 4 debian/copyright| 2 +- debian/libosmium2-doc.links | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) -- 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
[qgis] 03/03: 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 qgis. commit 5f0c9b33818775ca16d70f4317f062ecad47dd0e Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Mar 11 18:53:15 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 520bff4..95a7a54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -qgis (2.8.1+dfsg1-1~exp3) UNRELEASED; urgency=medium +qgis (2.8.1+dfsg1-1~exp3) experimental; urgency=medium * Update symbols for armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, mips, mipsel, powerpc, ppc64el s390x. * Add patches from upstream release-2_8 branch. - -- Bas Couwenberg sebas...@debian.org Wed, 11 Mar 2015 18:32:07 +0100 + -- Bas Couwenberg sebas...@debian.org Wed, 11 Mar 2015 18:52:57 +0100 qgis (2.8.1+dfsg1-1~exp2) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.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/01: Drop Suggests on other packages in the osmium family.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository node-osmium.
commit b93250c30e22d3db808a5dea399d4002cfd174dd
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Mar 11 22:55:25 2015 +0100
Drop Suggests on other packages in the osmium family.
---
debian/changelog | 4 ++--
debian/control | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 129447f..7c73af9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-node-osmium (0.1.0) UNRELEASED; urgency=medium
+node-osmium (0.3.0-1) UNRELEASED; urgency=medium
* Initial release (Closes: #779927)
- -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 13:50:11 +0100
+ -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 15:16:48 +0100
diff --git a/debian/control b/debian/control
index fac5414..5ce55ee 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,6 @@ Section: web
Depends: ${misc:Depends},
nodejs,
libosmium
-Suggests: osmium,
- osmium-contrib,
- pyosmium
Description: Osmium library Node.js bindings
The osmium module for Node.js allows you to access some of the features of the
Osmium Library from Javascript code.
--
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
[netcdf] branch master updated (3d5ea5c - b5dbb8b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository netcdf. from 3d5ea5c Merge branch 'upstream' new 455a6fb Update years in copyright file, add OPeNPDAP copyright holder. new b5dbb8b Add myself to Uploaders. 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 | 1 + debian/control | 3 ++- debian/copyright | 5 +++-- 3 files changed, 6 insertions(+), 3 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
[josm] annotated tag upstream/0.0.svn8109+dfsg1 created (now a685eb7)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0.svn8109+dfsg1 in repository josm. at a685eb7 (tag) tagging 82c8334d12c17c1c6509552dfb1747b516aeb969 (commit) replaces upstream/0.0.svn7995+dfsg1 tagged by Bas Couwenberg on Wed Mar 4 21:02:58 2015 +0100 - Log - Upstream version 0.0.svn8109+dfsg1 Bas Couwenberg (1): Imported Upstream version 0.0.svn8109+dfsg1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.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
[josm] 08/09: Refresh patches.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 1e32f03053ffdb33c49861e065cf5915d86b7c18
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Thu Mar 5 19:13:44 2015 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/01-bts.patch | 2 +-
debian/patches/02-elemstyles.patch| 2 +-
debian/patches/03-default_look_and_feel.patch | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d00fc99..580b421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ josm (0.0.svn8109+dfsg1-1) UNRELEASED; urgency=medium
- Add i18n/convmaps.pl, remove i18n/convwms.pl
* Bump minimum required jmapviewer version to 1.06, JOSM uses the new
TemplatedTMSTileSource() method introduced in JMapViewer 1.06.
+ * Refresh patches.
-- Bas Couwenberg sebas...@debian.org Wed, 04 Mar 2015 21:19:16 +0100
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index c655637..76d2336 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -86,7 +86,7 @@ bug triaging.
);
// Check user is running current tested version, the
error may already be fixed
int josmVersion = Version.getInstance().getVersion();
-@@ -200,24 +200,13 @@ public final class BugReportExceptionHan
+@@ -201,24 +201,13 @@ public final class BugReportExceptionHan
JPanel p = new JPanel(new GridBagLayout());
p.add(new JMultilineLabel(
diff --git a/debian/patches/02-elemstyles.patch
b/debian/patches/02-elemstyles.patch
index 306955b..3aeb8a6 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -15,7 +15,7 @@ applications. This patch points josm to the shared
directories.
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -202,14 +202,19 @@ public final class MapPaintStyles {
+@@ -229,14 +229,19 @@ public final class MapPaintStyles {
}
if (Main.pref.getBoolean(mappaint.icon.enable-defaults, true)) {
diff --git a/debian/patches/03-default_look_and_feel.patch
b/debian/patches/03-default_look_and_feel.patch
index de66fb2..77110ca 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -11,7 +11,7 @@ Patch rewritten for new code, original patch was from Ubuntu's
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -98,7 +98,7 @@ public class PlatformHookUnixoid impleme
+@@ -157,7 +157,7 @@ public class PlatformHookUnixoid impleme
@Override
public String getDefaultStyle() {
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm.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 (27b4f26 - 00729fe)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository netcdf. from 27b4f26 Merge changelog entries for 4.3.3~rc3 4.3.3.1. new 00729fe Refresh patches. 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: debian/patches/privacy-breach-logo.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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
[josm] 02/09: Merge tag 'upstream/0.0.svn8109+dfsg1'
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 7c94b13f695eeadef4e69ec3b02018af4f2c6fae
Merge: 03676ba 82c8334
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Mar 4 21:02:58 2015 +0100
Merge tag 'upstream/0.0.svn8109+dfsg1'
Upstream version 0.0.svn8109+dfsg1
REVISION | 6 +-
build.xml | 2 +
data/defaultpresets.xml| 982 +-
data/maps.xsd | 126 +-
data/validator/combinations.mapcss |74 +-
data/validator/deprecated.mapcss |13 +
data/validator/geometry.mapcss | 9 +
data/validator/numeric.mapcss |13 +-
i18n/build.xml | 6 +-
i18n/{convwms.pl = convmaps.pl} |10 +-
i18n/convplugins.pl| 4 +-
i18n/launchpad.pl | 4 +-
i18n/po/af.po | 6138 -
i18n/po/am.po | 6138 -
i18n/po/ar.po | 7404 +--
i18n/po/ast.po | 11284 +
i18n/po/az.po | 6138 -
i18n/po/be.po | 6152 +-
i18n/po/bg.po | 11066 +
i18n/po/bn.po | 6138 -
i18n/po/br.po | 6138 -
i18n/po/bs.po | 6138 -
i18n/po/ca.po | 11316 -
i18n/po/c...@valencia.po | 10063 +++
i18n/po/cs.po | 11264 +
i18n/po/cy.po | 6138 -
i18n/po/da.po | 11366 -
i18n/po/de.po | 11732 +-
i18n/po/de_DE.po | 6170 +-
i18n/po/el.po | 8306 +++--
i18n/po/en_AU.po | 8434 +++--
i18n/po/en_CA.po | 6138 -
i18n/po/en_GB.po | 10122 +++
i18n/po/eo.po | 6470 +-
i18n/po/es.po | 11679 +-
i18n/po/et.po | 8665 ++---
i18n/po/eu.po | 8462 +++--
i18n/po/fa.po | 6138 -
i18n/po/fi.po | 8324 +++--
i18n/po/fil.po | 6138 -
i18n/po/{az.po = fo.po} | 6202 +-
i18n/po/fr.po | 11088 +
i18n/po/gl.po | 9277 +++---
i18n/po/he.po | 7392 +--
i18n/po/hi.po | 6138 -
i18n/po/hr.po | 6554 +-
i18n/po/ht.po | 6138 -
i18n/po/hu.po | 11405 -
i18n/po/hy.po | 6138 -
i18n/po/ia.po | 6138 -
i18n/po/id.po | 9619 ---
i18n/po/is.po | 7099 ++-
i18n/po/it.po | 11311 -
i18n/po/ja.po | 11026 +
i18n/po/ka.po | 6138 -
i18n/po/km.po | 6418 +-
i18n/po/ko.po | 6183 +-
i18n/po/ky.po | 6138 -
i18n/po/lo.po | 6138 -
i18n/po/lt.po | 8456 +++--
i18n/po/lv.po | 6138 -
i18n/po/mk.po | 6138 -
i18n/po/ms.po | 6148 +-
i18n/po/nb.po | 8326 +++--
i18n/po/nds.po | 6186 +-
[josm] 01/01: pristine-tar data for josm_0.0.svn8109+dfsg1.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 josm. commit 3e8ee624048f306913ea7c4190e4a7cc245936b4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Mar 4 21:02:58 2015 +0100 pristine-tar data for josm_0.0.svn8109+dfsg1.orig.tar.gz --- josm_0.0.svn8109+dfsg1.orig.tar.gz.delta | Bin 0 - 102384 bytes josm_0.0.svn8109+dfsg1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/josm_0.0.svn8109+dfsg1.orig.tar.gz.delta b/josm_0.0.svn8109+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..f73e7a4 Binary files /dev/null and b/josm_0.0.svn8109+dfsg1.orig.tar.gz.delta differ diff --git a/josm_0.0.svn8109+dfsg1.orig.tar.gz.id b/josm_0.0.svn8109+dfsg1.orig.tar.gz.id new file mode 100644 index 000..3dbf948 --- /dev/null +++ b/josm_0.0.svn8109+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +25d2828ff1ddc8030005415a328a425153f51be1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.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
[josm] 06/09: Reorder dependencies.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 1aca27d8c374f9446bb9d008c8019b5b663e3b8f
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Mar 4 21:39:19 2015 +0100
Reorder dependencies.
---
debian/control | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index c77a1fc..f66ec5f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,21 +6,21 @@ Uploaders: David Paleino da...@debian.org,
Bas Couwenberg sebas...@debian.org
Section: utils
Priority: extra
-Build-Depends: ant,
+Build-Depends: debhelper (= 9~),
+ default-jdk,
+ ant,
ant-contrib,
javacc,
- debhelper (= 9~),
gettext,
- default-jdk,
+ libandroid-json-org-java,
libcommons-codec-java,
libcommons-compress-java,
+ libgettext-ant-tasks-java,
libgettext-commons-java (= 0.9.6),
libmetadata-extractor-java (= 2.6.4),
- libgettext-ant-tasks-java,
liboauth-signpost-java (= 1.2),
libsvgsalamander-java,
libterm-readkey-perl,
- libandroid-json-org-java,
jmapviewer (= 1.05)
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/josm.git
@@ -30,14 +30,14 @@ Homepage: http://josm.openstreetmap.de
Package: josm
Architecture: all
Depends: default-jre | java7-runtime,
+ libandroid-json-org-java,
libcommons-codec-java,
libcommons-compress-java,
libgettext-commons-java (= 0.9.6),
libmetadata-extractor-java (= 2.6.4),
- liboauth-signpost-java (= 1.2),
libsvgsalamander-java,
+ liboauth-signpost-java (= 1.2),
openstreetmap-map-icons-classic,
- libandroid-json-org-java,
jmapviewer (= 1.05),
fonts-droid,
${misc:Depends}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm.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
[josm] 03/09: New tested snapshot.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm. commit 782cfaef9d68819c54cc5e485a3ccbcc9f3bd9d6 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Mar 4 21:22:10 2015 +0100 New tested snapshot. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6bbfb46..b77658b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm (0.0.svn8109+dfsg1-1) UNRELEASED; urgency=medium + + * New tested snapshot. + + -- Bas Couwenberg sebas...@debian.org Wed, 04 Mar 2015 21:19:16 +0100 + josm (0.0.svn7995+dfsg1-1~exp1) experimental; urgency=medium * New tested snapshot. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.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
[josm] tag debian/0.0.svn8109+dfsg1-1.exp1 created (now 84bf250)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.0.svn8109+dfsg1-1.exp1 in repository josm. at 84bf250 (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/josm.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
[josm] 07/09: Bump minimum required jmapviewer version to 1.06, JOSM uses the new TemplatedTMSTileSource() method introduced in JMapViewer 1.06.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 5f179797340bcbc8ecddbb18400c86445b6e30de
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Thu Mar 5 19:12:50 2015 +0100
Bump minimum required jmapviewer version to 1.06, JOSM uses the new
TemplatedTMSTileSource() method introduced in JMapViewer 1.06.
---
debian/changelog | 2 ++
debian/control | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea436fc..d00fc99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ josm (0.0.svn8109+dfsg1-1) UNRELEASED; urgency=medium
- Update copyright years
- Indent multiline copyright
- Add i18n/convmaps.pl, remove i18n/convwms.pl
+ * Bump minimum required jmapviewer version to 1.06, JOSM uses the new
+TemplatedTMSTileSource() method introduced in JMapViewer 1.06.
-- Bas Couwenberg sebas...@debian.org Wed, 04 Mar 2015 21:19:16 +0100
diff --git a/debian/control b/debian/control
index f66ec5f..9c7e6c7 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (= 9~),
liboauth-signpost-java (= 1.2),
libsvgsalamander-java,
libterm-readkey-perl,
- jmapviewer (= 1.05)
+ jmapviewer (= 1.06)
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/josm.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/josm.git
@@ -38,7 +38,7 @@ Depends: default-jre | java7-runtime,
libsvgsalamander-java,
liboauth-signpost-java (= 1.2),
openstreetmap-map-icons-classic,
- jmapviewer (= 1.05),
+ jmapviewer (= 1.06),
fonts-droid,
${misc:Depends}
Recommends: josm-plugins,
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm.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
[josm] branch master updated (03676ba - 84bf250)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository josm.
from 03676ba Set distribution to experimental.
new 82c8334 Imported Upstream version 0.0.svn8109+dfsg1
new 7c94b13 Merge tag 'upstream/0.0.svn8109+dfsg1'
new 782cfae New tested snapshot.
new 15eb558 Update my email to @debian.org address.
new e7cb36f Update copyright file.
new 1aca27d Reorder dependencies.
new 5f17979 Bump minimum required jmapviewer version to 1.06, JOSM
uses the new TemplatedTMSTileSource() method introduced in JMapViewer 1.06.
new 1e32f03 Refresh patches.
new 84bf250 Set distribution to experimental.
The 9 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:
REVISION | 6 +-
build.xml | 2 +
data/defaultpresets.xml| 982 +-
data/maps.xsd | 126 +-
data/validator/combinations.mapcss |74 +-
data/validator/deprecated.mapcss |13 +
data/validator/geometry.mapcss | 9 +
data/validator/numeric.mapcss |13 +-
debian/changelog |14 +
debian/control |20 +-
debian/copyright |52 +-
debian/patches/01-bts.patch| 2 +-
debian/patches/02-elemstyles.patch | 2 +-
debian/patches/03-default_look_and_feel.patch | 2 +-
i18n/build.xml | 6 +-
i18n/{convwms.pl = convmaps.pl} |10 +-
i18n/convplugins.pl| 4 +-
i18n/launchpad.pl | 4 +-
i18n/po/af.po | 6138 -
i18n/po/am.po | 6138 -
i18n/po/ar.po | 7404 +--
i18n/po/ast.po | 11284 +
i18n/po/az.po | 6138 -
i18n/po/be.po | 6152 +-
i18n/po/bg.po | 11066 +
i18n/po/bn.po | 6138 -
i18n/po/br.po | 6138 -
i18n/po/bs.po | 6138 -
i18n/po/ca.po | 11316 -
i18n/po/c...@valencia.po | 10063 +++
i18n/po/cs.po | 11264 +
i18n/po/cy.po | 6138 -
i18n/po/da.po | 11366 -
i18n/po/de.po | 11732 +-
i18n/po/de_DE.po | 6170 +-
i18n/po/el.po | 8306 +++--
i18n/po/en_AU.po | 8434 +++--
i18n/po/en_CA.po | 6138 -
i18n/po/en_GB.po | 10122 +++
i18n/po/eo.po | 6470 +-
i18n/po/es.po | 11679 +-
i18n/po/et.po | 8665 ++---
i18n/po/eu.po | 8462 +++--
i18n/po/fa.po | 6138 -
i18n/po/fi.po | 8324 +++--
i18n/po/fil.po | 6138 -
i18n/po/{az.po = fo.po} | 6202 +-
i18n/po/fr.po | 11088 +
i18n/po/gl.po | 9277 +++---
i18n/po/he.po | 7392 +--
i18n/po/hi.po | 6138 -
i18n/po/hr.po | 6554 +-
i18n/po/ht.po | 6138 -
i18n/po/hu.po | 11405 -
i18n/po/hy.po | 6138 -
i18n/po/ia.po | 6138 -
i18n/po/id.po | 9619 ---
Bug#779807: osmosis: XML parser messes up data
On 03/05/2015 09:06 AM, Sebastiaan Couwenberg wrote: I've fixed the issue in a new revision for experimental, and I'll also backport the fix to the version in jessie and request an unblock from the release team. The unblock request was accepted, see: https://bugs.debian.org/779823 The fixed package should migrate from unstable to testing in 5 days. 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
[netcdf] 01/01: Merge changelog entries for 4.3.3~rc3 4.3.3.1.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 27b4f262ffd76ed92c9082ba83cf48217ef6b168 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Mar 5 22:02:17 2015 +0100 Merge changelog entries for 4.3.3~rc3 4.3.3.1. --- debian/changelog | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8fce02a..50c89b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,7 @@ -netcdf (1:4.3.3.1-1) unstable; urgency=low - - * Non-maintainer upload. - * Upgrade to 4.3.3.1 - -netcdf (1:4.3.3~rc3-1) UNRELEASED; urgency=medium +netcdf (1:4.3.3.1-1) UNRELEASED; urgency=medium [ Nico Schlömer ] - * Upgrade to 4.3.3-rc3 (C-only) + * Upgrade to 4.3.3.1 (C-only) (Closes: #735075) * Fix segfault with malformed URLs (Closes: #757884) * Fix ncdump crash with exit status 139 (Closes: #716126) -- 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
[josm-plugins] 04/08: New upstream SVN snapshot.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 49620460b00f18a238c67b4449977c0dd4574151 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Mar 4 21:44:12 2015 +0100 New upstream SVN snapshot. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6a45d23..5a9cf08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm-plugins (0.0.svn31044+ds1-1~exp1) UNRELEASED; urgency=medium + + * New upstream SVN snapshot. + + -- Bas Couwenberg sebas...@debian.org Wed, 04 Mar 2015 21:43:58 +0100 + josm-plugins (0.0.svn30932+ds1-1~exp1) experimental; urgency=medium * New upstream SVN snapshot. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.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
[josm-plugins] 08/08: 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 josm-plugins. commit c74eb9395e49af74f3e08b3bbdbff42f74eaae72 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 00:22:19 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 c3b573e..24b2572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -josm-plugins (0.0.svn31044+ds1-1~exp1) UNRELEASED; urgency=medium +josm-plugins (0.0.svn31044+ds1-1~exp1) experimental; urgency=medium * New upstream SVN snapshot. * Bump JOSM dependency to 8109. * Update my email to @debian.org address. * Refresh patches. - -- Bas Couwenberg sebas...@debian.org Wed, 04 Mar 2015 21:43:58 +0100 + -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 00:22:09 +0100 josm-plugins (0.0.svn30932+ds1-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.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
[josm-plugins] tag debian/0.0.svn31044+ds1-1.exp1 created (now c74eb93)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.0.svn31044+ds1-1.exp1 in repository josm-plugins. at c74eb93 (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/josm-plugins.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
[josm-plugins] branch upstream updated (5ab0502 - b59645c)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository josm-plugins. from 5ab0502 Imported Upstream version 0.0.svn30932+ds1 new b59645c Imported Upstream version 0.0.svn31044+ds1 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: build-common.xml | 7 ++- svn-info.xml | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.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
[josm-plugins] 02/08: Merge tag 'upstream/0.0.svn31044+ds1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm-plugins. commit 060b437978fab612c406072044a4be3c4a01a515 Merge: cc993c9 b59645c Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Mar 4 21:02:48 2015 +0100 Merge tag 'upstream/0.0.svn31044+ds1' Upstream version 0.0.svn31044+ds1 build-common.xml | 7 ++- svn-info.xml | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.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
[josm-plugins] branch master updated (cc993c9 - c74eb93)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository josm-plugins. from cc993c9 Set distribution to experimental. new b59645c Imported Upstream version 0.0.svn31044+ds1 new 060b437 Merge tag 'upstream/0.0.svn31044+ds1' new 97927ad Sort dependencies. new 4962046 New upstream SVN snapshot. new af72030 Bump JOSM dependency to 8109. new 96a6cc6 Update my email to @debian.org address. new c187111 Refresh patches. new c74eb93 Set distribution to experimental. The 8 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: build-common.xml | 7 ++- debian/changelog | 9 + debian/control | 26 +- debian/patches/00-fix_build-common.patch | 2 +- svn-info.xml | 6 +++--- 5 files changed, 32 insertions(+), 18 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.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
[josm-plugins] 03/08: Sort dependencies.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm-plugins.
commit 97927ad63464b03a337304109513b942a98ff2f6
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Mar 4 21:43:39 2015 +0100
Sort dependencies.
---
debian/control | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/control b/debian/control
index 2759909..7e3e2dd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,15 @@ Uploaders: David Paleino da...@debian.org,
Bas Couwenberg sebas...@xs4all.nl
Section: science
Priority: optional
-Build-Depends: ant,
- ant-contrib,
- debhelper (= 9),
+Build-Depends: debhelper (= 9),
default-jdk,
+ ant,
+ ant-contrib,
josm (= 0.0.svn7995),
- libmetadata-extractor-java,
- liblog4j1.2-java,
- libjgrapht0.8-java,
libgettext-ant-tasks-java,
+ libjgrapht0.8-java,
+ liblog4j1.2-java,
+ libmetadata-extractor-java,
python
Build-Conflicts: josm (= 0.0.svn7996)
Standards-Version: 3.9.6
@@ -26,9 +26,9 @@ Package: josm-plugins
Architecture: all
Depends: ${misc:Depends},
josm (= 0.0.svn7995),
- libmetadata-extractor-java,
+ libjgrapht0.8-java,
liblog4j1.2-java,
- libjgrapht0.8-java
+ libmetadata-extractor-java
Suggests: gpsd
Breaks: josm (= 0.0.svn7996)
Description: Plugins for JOSM
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.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
[package_template] 01/01: Add gbp.conf.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository package_template. commit 0c845f3ad7ea69e7b0ab2086207b768a4a2f09fb Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 13:44:16 2015 +0100 Add gbp.conf. --- debian/gbp.conf | 16 1 file changed, 16 insertions(+) diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000..21d0417 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,16 @@ +[DEFAULT] + +# The default name for the upstream branch is upstream. +# Change it if the name is different (for instance, master). +upstream-branch = upstream + +# The default name for the Debian branch is master. +# Change it if the name is different (for instance, debian/unstable). +debian-branch = master + +# git-import-orig uses the following names for the upstream tags. +# Change the value if you are not using git-import-orig +upstream-tag = upstream/%(version)s + +# Always use pristine-tar. +pristine-tar = True -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/package_template.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
[package_template] branch master updated (d963c8f - 0c845f3)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository package_template. from d963c8f Restructure control file like cme. new 0c845f3 Add gbp.conf. 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: debian/gbp.conf | 16 1 file changed, 16 insertions(+) create mode 100644 debian/gbp.conf -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/package_template.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.3.0 created (now 1493e73)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.3.0 in repository node-osmium. at 1493e73 (tag) tagging 38391dbafd15a97c071294c3269db47740af9df6 (commit) replaces upstream/0.2.0 tagged by Bas Couwenberg on Fri Mar 6 15:16:44 2015 +0100 - Log - Upstream version 0.3.0 Bas Couwenberg (1): Imported Upstream version 0.3.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/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
[pyosmium] 01/02: Imported Upstream version 0.0~20150204-298c708
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pyosmium.
commit 3519db65c8c7885fed4d98d3b7ea0d7a3979a875
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 15:28:31 2015 +0100
Imported Upstream version 0.0~20150204-298c708
---
.gitignore | 2 +
.travis.yml | 43
LICENSE.TXT | 25 +++
README.md| 54 +++
examples/amenity_list.py | 27
examples/create_nodecache.py | 15
examples/osm_file_stats.py | 26 +++
examples/pub_names.py| 19 +
examples/road_length.py | 19 +
examples/use_nodecache.py| 28
lib/generic_handler.hpp | 161 +++
lib/geom.cc | 30
lib/index.cc | 33 +
lib/io.cc| 24 +++
lib/osm.cc | 117 +++
lib/osmium.cc| 86 +++
osmium/__init__.py | 5 ++
setup.py | 57 +++
test/run_tests.py| 16 +
test/test_helper.py | 88 +++
test/test_io.py | 64 +
test/test_osm.py | 75
22 files changed, 1014 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..6f97ca1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+build
+*.pyc
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..d855c02
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,43 @@
+language: cpp
+
+compiler:
+ - gcc
+ - clang
+
+env:
+ - USE_PYTHON_VERSION=2
+ - USE_PYTHON_VERSION=3
+
+before_install:
+ # we need at least g++-4.8 for c++11 features
+ - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+ - sudo apt-get update --yes --quiet
+
+install:
+ # upgrade compilers
+ - sudo apt-get install --yes gcc-4.8 g++-4.8
+ # make sure 'cpp' is the just installed current one
+ - sudo rm /usr/bin/cpp
+ - sudo ln -s /usr/bin/cpp-4.8 /usr/bin/cpp
+ # innstall dependencies
+ - sudo apt-get install --yes make python3-dev python3 libboost-dev
libboost-python-dev libprotobuf-dev protobuf-compiler libsparsehash-dev
python-nose python3-nose
+ - cd ..
+ - git clone https://github.com/osmcode/libosmium.git
+ # OSMPBF is too old, install from git
+ #- sudo apt-get install --yes libosmpbf-dev
+ - git clone https://github.com/scrosby/OSM-binary.git
+ - cd OSM-binary/src
+ - make
+ - sudo make install
+
+#before_script:
+# - true
+
+script:
+ - cd $TRAVIS_BUILD_DIR
+ - if [ ${CXX} = 'g++' ]; then export CXX=g++-4.8; fi;
+ - if [ ${CC} = 'gcc' ]; then export CC=gcc-4.8; fi;
+ - python${USE_PYTHON_VERSION} setup.py build
+ - cd test
+ - python${USE_PYTHON_VERSION} run_tests.py
+
diff --git a/LICENSE.TXT b/LICENSE.TXT
new file mode 100644
index 000..fdccd14
--- /dev/null
+++ b/LICENSE.TXT
@@ -0,0 +1,25 @@
+
+Copyright (c) 2014, Sarah Hoffmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/README.md b/README.md
new file mode 100644
index 000..0a82bad
--- /dev/null
+++ b/README.md
@@ -0,0 +1,54 @@
+# pyosmium
+
+Provides Python bindings for the
[libosmium](https://github.com/osmcode/libosmium) C++
+library, a library for working with OpenStreetMap data in a fast and flexible
+manner.
+
+[](http://travis-ci.org/osmcode/pyosmium)
+
+## Depends
+
+Python = 2.7 is supported (that includes python 3.x).
+
+pyosmium uses
[Boost.Python](http://www.boost.org/doc/libs/1_56_0/libs/python/doc/index.html)
+to create the
[osmium-tool] branch master created (now a34c03c)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmium-tool. at a34c03c Initial Debian packaging. This branch includes the following new commits: new e1e2b0e Imported Upstream version 0.0~20150306-4ef5dd5 new a34c03c 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/osmium-tool.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.2 created (now f172e92)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.1.2 in repository node-osmium. at f172e92 (tag) tagging 9a9a819fc63ceb7e7b8358d21c2199c4e0d34ad6 (commit) replaces upstream/0.1.1 tagged by Bas Couwenberg on Fri Mar 6 15:16:35 2015 +0100 - Log - Upstream version 0.1.2 Bas Couwenberg (1): Imported Upstream version 0.1.2 --- 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
[node-osmium] annotated tag upstream/0.2.0 created (now 962ba6a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.2.0 in repository node-osmium. at 962ba6a (tag) tagging c7d49bdc623109a23a3d1511ca7c2e20378c96c0 (commit) replaces upstream/0.1.2 tagged by Bas Couwenberg on Fri Mar 6 15:16:40 2015 +0100 - Log - Upstream version 0.2.0 Bas Couwenberg (1): Imported Upstream version 0.2.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/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
[pyosmium] branch master created (now 0fcb2c0)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository pyosmium. at 0fcb2c0 Initial Debian packaging. This branch includes the following new commits: new 3519db6 Imported Upstream version 0.0~20150204-298c708 new 0fcb2c0 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/pyosmium.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.0 created (now 39fb48b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.1.0 in repository node-osmium. at 39fb48b (tag) tagging 289b58a7838d0de8a7168e0992bd8811356e9053 (commit) tagged by Bas Couwenberg on Fri Mar 6 14:56:23 2015 +0100 - Log - Upstream version 0.1.0 Bas Couwenberg (1): Imported Upstream version 0.1.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/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] branch master created (now d71748f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository node-osmium. at d71748f Merge tag 'upstream/0.3.0' This branch includes the following new commits: new 289b58a Imported Upstream version 0.1.0 new f43eaf7 Initial Debian packaging. new 80ef48b Imported Upstream version 0.1.1 new 40ee3e5 Merge tag 'upstream/0.1.1' new 9a9a819 Imported Upstream version 0.1.2 new bac0234 Merge tag 'upstream/0.1.2' new c7d49bd Imported Upstream version 0.2.0 new 3bc0a87 Merge tag 'upstream/0.2.0' new 38391db Imported Upstream version 0.3.0 new d71748f Merge tag 'upstream/0.3.0' The 10 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] annotated tag upstream/0.0_20150303-f074d94 created (now e9e4b3e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0_20150303-f074d94 in repository libosmium. at e9e4b3e (tag) tagging 1e500844e4c90ed3b0fd829059e560fe237850eb (commit) tagged by Bas Couwenberg on Fri Mar 6 13:50:07 2015 +0100 - Log - Upstream version 0.0~20150303-f074d94 Bas Couwenberg (1): Imported Upstream version 0.0~20150303-f074d94 --- No new revisions were added by this update. -- 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
[osmium-tool] branch pristine-tar created (now fcff3ec)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository osmium-tool. at fcff3ec pristine-tar data for osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz This branch includes the following new commits: new fcff3ec pristine-tar data for osmium-tool_0.0~20150306-4ef5dd5.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/osmium-tool.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
[osmium-tool] branch upstream created (now e1e2b0e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository osmium-tool. at e1e2b0e Imported Upstream version 0.0~20150306-4ef5dd5 This branch includes the following new commits: new e1e2b0e Imported Upstream version 0.0~20150306-4ef5dd5 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/osmium-tool.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
[pyosmium] branch pristine-tar created (now a94634c)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository pyosmium. at a94634c pristine-tar data for pyosmium_0.0~20150204-298c708.orig.tar.gz This branch includes the following new commits: new a94634c pristine-tar data for pyosmium_0.0~20150204-298c708.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/pyosmium.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
[osmium-tool] 01/01: pristine-tar data for osmium-tool_0.0~20150306-4ef5dd5.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 osmium-tool. commit fcff3ecb56a8d43523590d4edec680286e003c49 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:43:41 2015 +0100 pristine-tar data for osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz --- osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.delta | Bin 0 - 2312 bytes osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.delta b/osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.delta new file mode 100644 index 000..11f4847 Binary files /dev/null and b/osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.delta differ diff --git a/osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.id b/osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.id new file mode 100644 index 000..3911afa --- /dev/null +++ b/osmium-tool_0.0~20150306-4ef5dd5.orig.tar.gz.id @@ -0,0 +1 @@ +cf0d794230db6c94e5ca51a88b7c36a4f6d83b5f -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[pyosmium] 01/01: pristine-tar data for pyosmium_0.0~20150204-298c708.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 pyosmium. commit a94634cf58b27690c534184ae49e10efcece1cb6 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 15:28:32 2015 +0100 pristine-tar data for pyosmium_0.0~20150204-298c708.orig.tar.gz --- pyosmium_0.0~20150204-298c708.orig.tar.gz.delta | Bin 0 - 1541 bytes pyosmium_0.0~20150204-298c708.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/pyosmium_0.0~20150204-298c708.orig.tar.gz.delta b/pyosmium_0.0~20150204-298c708.orig.tar.gz.delta new file mode 100644 index 000..7ec37ba Binary files /dev/null and b/pyosmium_0.0~20150204-298c708.orig.tar.gz.delta differ diff --git a/pyosmium_0.0~20150204-298c708.orig.tar.gz.id b/pyosmium_0.0~20150204-298c708.orig.tar.gz.id new file mode 100644 index 000..601bc78 --- /dev/null +++ b/pyosmium_0.0~20150204-298c708.orig.tar.gz.id @@ -0,0 +1 @@ +2ffde68a301e7120707a0cd73f793f6769f37f30 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.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
[osmium-tool] annotated tag upstream/0.0_20150306-4ef5dd5 created (now 5fe8ba4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0_20150306-4ef5dd5 in repository osmium-tool. at 5fe8ba4 (tag) tagging e1e2b0e5b933631384d18473ef0ac068b54d8ffd (commit) tagged by Bas Couwenberg on Fri Mar 6 15:43:41 2015 +0100 - Log - Upstream version 0.0~20150306-4ef5dd5 Bas Couwenberg (1): Imported Upstream version 0.0~20150306-4ef5dd5 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.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
[osmium-contrib] 01/02: Imported Upstream version 0.0~20150306-0c4f263
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-contrib.
commit 3b146944868cfc09aae5646729b82cea17716a9e
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 16:28:05 2015 +0100
Imported Upstream version 0.0~20150306-0c4f263
---
.gitignore | 2 +
.travis.yml | 43 +
CMakeLists.txt | 44 +
Makefile| 18 ++
README.md | 41 +
amenity_list/.gitignore | 1 +
amenity_list/CMakeLists.txt | 24 +++
amenity_list/Makefile | 12 ++
amenity_list/README.md | 47 +
amenity_list/amenity_list.cpp | 84 +
cmake/CppcheckTarget.cmake | 25 +++
cmake/FindOSMPBF.cmake | 50 ++
cmake/FindOsmium.cmake | 340
cmake/common.cmake | 90 ++
export_to_wkt/.gitignore| 1 +
export_to_wkt/CMakeLists.txt| 24 +++
export_to_wkt/Makefile | 12 ++
export_to_wkt/README.md | 45 +
export_to_wkt/export_to_wkt.cpp | 77
mapolution/.gitignore | 3 +
mapolution/CMakeLists.txt | 31
mapolution/Makefile | 12 ++
mapolution/README.md| 70
mapolution/cmdline_options.cpp | 105 +++
mapolution/cmdline_options.hpp | 35
mapolution/gdalcpp.hpp | 221 +++
mapolution/geom_handler.hpp | 63 +++
mapolution/handlers/buildings.hpp | 43 +
mapolution/handlers/restaurants.hpp | 59 +++
mapolution/handlers/roads.hpp | 42 +
mapolution/main.cpp | 253 +++
mapolution/rasterize.sh | 40 +
node_density/.gitignore | 3 +
node_density/CMakeLists.txt | 24 +++
node_density/Makefile | 12 ++
node_density/README.md | 109
node_density/cmdline_options.cpp| 125 +
node_density/cmdline_options.hpp| 35
node_density/colors.txt | 5 +
node_density/example.qlr| 49 ++
node_density/main.cpp | 197 +
pub_names/.gitignore| 1 +
pub_names/CMakeLists.txt| 24 +++
pub_names/Makefile | 12 ++
pub_names/README.md | 45 +
pub_names/pub_names.cpp | 46 +
road_length/.gitignore | 1 +
road_length/CMakeLists.txt | 24 +++
road_length/Makefile| 12 ++
road_length/README.md | 46 +
road_length/road_length.cpp | 45 +
51 files changed, 2772 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..fdb2c6c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+build*
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..f5dffb1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,43 @@
+language: cpp
+
+compiler:
+ - gcc
+ - clang
+
+env:
+ - CONFIGURATION=Dev
+ - CONFIGURATION=Release
+
+before_install:
+ # we need at least g++-4.8 for c++11 features
+ - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+ - sudo apt-get update --yes --quiet
+
+install:
+ # upgrade compilers
+ - sudo apt-get install --yes gcc-4.8 g++-4.8
+ # make sure 'cpp' is the just installed current one
+ - sudo rm /usr/bin/cpp
+ - sudo ln -s /usr/bin/cpp-4.8 /usr/bin/cpp
+ # upgrade libosmium dependencies
+ - sudo apt-get install --yes make libboost1.48-dev
libboost-program-options1.48-dev libboost-filesystem1.48-dev libsparsehash-dev
libgdal-dev libproj-dev libprotobuf-dev protobuf-compiler
+ - cd ..
+ - git clone https://github.com/osmcode/libosmium.git
+ # OSMPBF is too old, install from git
+ #- sudo apt-get install --yes libosmpbf-dev
+ - git clone https://github.com/scrosby/OSM-binary.git
+ - cd OSM-binary/src
+ - make
+ - sudo make install
+
+#before_script:
+# - true
+
+script:
+ - cd $TRAVIS_BUILD_DIR
+ - if [ ${CXX} = 'g++' ]; then export CXX=g++-4.8; fi;
+ - mkdir build
+ - cd build
+ - cmake -LA -DCMAKE_BUILD_TYPE=${CONFIGURATION} ..
+ - make VERBOSE=1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000..6e04c7e
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,44 @@
+#-
+#
+# CMake Config
+#
+# Osmium-contrib
+#
+#-
+
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+
+#-
+project(osmium-contrib)
+
+include(common)
+
+find_package(Boost REQUIRED
[node-osmium] branch pristine-tar created (now 8975393)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository node-osmium. at 8975393 pristine-tar data for node-osmium_0.3.0.orig.tar.gz This branch includes the following new commits: new c280157 pristine-tar data for node-osmium_0.1.0.orig.tar.gz new 2708e8c pristine-tar data for node-osmium_0.1.1.orig.tar.gz new cc66918 pristine-tar data for node-osmium_0.1.2.orig.tar.gz new 7e6c974 pristine-tar data for node-osmium_0.2.0.orig.tar.gz new 8975393 pristine-tar data for node-osmium_0.3.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/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
[osmium-tool] 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 osmium-tool.
commit a34c03c646849e8ca776320356f6763c706a8529
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 16:11:49 2015 +0100
Initial Debian packaging.
---
debian/changelog | 6 +++---
debian/control | 42 -
debian/copyright | 54
debian/gbp.conf | 16 ++
debian/get-orig-source | 19 +
debian/source/format | 1 +
debian/upstream/metadata | 7 +++
7 files changed, 119 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e0fbeea..b0fba18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-osmium (0.0.1) jessie; urgency=low
+osmium-tool (0.0~20150306-4ef5dd5-1) UNRELEASED; urgency=medium
- * Initial standalone debian package
+ * Initial release (Closes: #779938)
- -- Jochen Topf joc...@topf.org Wed, 27 Nov 2013 13:42:00 +0100
+ -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 15:43:50 +0100
diff --git a/debian/control b/debian/control
index a52d9a1..e055a94 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
-Source: osmium
-Section: utils
+Source: osmium-tool
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: Bas Couwenberg sebas...@debian.org
+Section: science
Priority: optional
-Maintainer: Jochen Topf joc...@topf.org
Build-Depends: debhelper (= 9),
cmake (= 2.8),
libboost-program-options-dev,
@@ -12,14 +13,35 @@ Build-Depends: debhelper (= 9),
libprotobuf-c-dev | libprotobuf-c0-dev (= 0.14),
pandoc,
zlib1g-dev
-Standards-Version: 3.9.5
-Homepage: http://osmcode.org/osmium/
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/
+Vcs-Git: git://anonscm.debian.org/pkg-grass/osmium-tool.git
+Homepage: http://osmcode.org/osmium-tool/
-Package: osmium
+Package: osmium-tool
Architecture: any
+Section: utils
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends:
-Description: Command line tool for working with OpenStreetMap data.
- A versatile command line tool that makes manipulating
- OpenStreetMap data easy.
+Suggests: osmium-contrib,
+ node-osmium,
+ pyosmium
+Description: Command line tool for working with OpenStreetMap data
+ Osmium Tool is a multipurpose command line tool based on the Osmium library.
+ .
+ With the Osmium Tool you currently can:
+ .
+ * Get information about an OSM file
+ * Convert OSM files from one format into another (supports all XML and PBF
formats)
+ * Merge and apply change files to an OSM file (with or without history)
+ * Extract data from OSM history files for a given point in time or a time
range
+ .
+ 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.
+
diff --git a/debian/copyright b/debian/copyright
index e5743ab..bbf56dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,46 @@
-Copyright 2013 Jochen Topf joc...@topf.org
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Osmium Tool
+Upstream-Contact: Osmium Developers d...@openstreetmap.org
+Source: https://github.com/osmcode/osmium-tool
-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.
+Files: *
+Copyright: 2013-2015, Jochen Topf joc...@topf.org
+License: GPL-3+
-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.
+Files: debian/*
+Copyright: © 2015, Bas Couwenberg sebas...@debian.org
+License: GPL-2+
-You should have received a copy of the GNU General Public License along
-with this program. If not, see http://www.gnu.org/licenses/.
+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
+ (at your option)
[osmium-contrib] 01/01: pristine-tar data for osmium-contrib_0.0~20150306-0c4f263.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 osmium-contrib. commit 23fd708c0b7756526dd852a719f2440b2b399201 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 16:28:05 2015 +0100 pristine-tar data for osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz --- osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.delta | Bin 0 - 2478 bytes osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.delta b/osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.delta new file mode 100644 index 000..a287fc1 Binary files /dev/null and b/osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.delta differ diff --git a/osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.id b/osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.id new file mode 100644 index 000..d42cfa8 --- /dev/null +++ b/osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz.id @@ -0,0 +1 @@ +3f86a5c3eee24857d2aba89249ef0da1442fc8cb -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-contrib.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
[osmium-contrib] annotated tag upstream/0.0_20150306-0c4f263 created (now 17034e1)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0_20150306-0c4f263 in repository osmium-contrib. at 17034e1 (tag) tagging 3b146944868cfc09aae5646729b82cea17716a9e (commit) tagged by Bas Couwenberg on Fri Mar 6 16:28:05 2015 +0100 - Log - Upstream version 0.0~20150306-0c4f263 Bas Couwenberg (1): Imported Upstream version 0.0~20150306-0c4f263 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-contrib.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/10: Initial Debian packaging.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository node-osmium.
commit f43eaf790361b843cfea29b9bc1235cf497e1c5a
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 15:16:18 2015 +0100
Initial Debian packaging.
---
debian/changelog | 5 +
debian/compat| 1 +
debian/control | 35 +
debian/copyright | 57
debian/gbp.conf | 16 ++
debian/rules | 7 ++
debian/source/format | 1 +
debian/upstream/metadata | 7 ++
debian/watch | 6 +
9 files changed, 135 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..129447f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+node-osmium (0.1.0) UNRELEASED; urgency=medium
+
+ * Initial release (Closes: #779927)
+
+ -- 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..fac5414
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,35 @@
+Source: node-osmium
+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/node-osmium.git/
+Vcs-Git: git://anonscm.debian.org/pkg-grass/node-osmium.git
+Homepage: http://osmcode.org/node-osmium/
+
+Package: node-osmium
+Architecture: all
+Section: web
+Depends: ${misc:Depends},
+ nodejs,
+ libosmium
+Suggests: osmium,
+ osmium-contrib,
+ pyosmium
+Description: Osmium library Node.js bindings
+ The osmium module for Node.js allows you to access some of the features of the
+ Osmium Library from Javascript code.
+ .
+ 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.
+ .
+ Node.js is an event-based server-side JavaScript engine.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..f2e05d3
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,57 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: node-osmium
+Upstream-Contact: Osmium Developers d...@openstreetmap.org
+Source: https://github.com/osmcode/node-osmium
+
+Files: *
+Copyright: Dane Springmeyer d...@dbsgeo.com,
+ Jochen Topf joc...@topf.org
+License: BSL-1.0
+
+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
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later
[osmium-contrib] branch pristine-tar created (now 23fd708)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository osmium-contrib. at 23fd708 pristine-tar data for osmium-contrib_0.0~20150306-0c4f263.orig.tar.gz This branch includes the following new commits: new 23fd708 pristine-tar data for osmium-contrib_0.0~20150306-0c4f263.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/osmium-contrib.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
[osmium-contrib] 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 osmium-contrib.
commit b73cb86992918e6fff9b56207bf0af4185fb3897
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 16:58:21 2015 +0100
Initial Debian packaging.
---
debian/changelog | 5
debian/compat| 1 +
debian/control | 46 +++
debian/copyright | 62
debian/gbp.conf | 16 +
debian/get-orig-source | 19 +++
debian/rules | 10
debian/source/format | 1 +
debian/upstream/metadata | 7 ++
9 files changed, 167 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..de87652
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+osmium-contrib (0.0~20150306-0c4f263-1) UNRELEASED; urgency=medium
+
+ * Initial release (Closes: #779942)
+
+ -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 16:28:10 +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..03d6a5c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,46 @@
+Source: osmium-contrib
+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/osmium-contrib.git/
+Vcs-Git: git://anonscm.debian.org/pkg-grass/osmium-contrib.git
+Homepage: http://osmcode.org/osmium-contrib/
+
+Package: osmium-contrib
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: osmium-tool,
+ node-osmium,
+ pyosmium
+Description: Various programs showing what you can do with the Osmium library
+ Osmium Contrib contains various programs showing what you can do with the
+ Osmium library.
+ .
+ The osmium-contrib repository collects little programs that use the Osmium
+ library in various ways. These programs can be useful in their own right, but
+ they also provide nice examples for developers who want to learn about the
+ features of the Osmium library.
+ .
+ Currently the following programs are available:
+ .
+ * amenity_list - Print list of amenities in OSM file
+ * export_to_wkt - Write out node, way, and area geometries as WKT
+ * mapolution- Show evolution of OSM map
+ * node_density - Create image showing OSM node density
+ * pub_names - Extract names of pubs from OSM file
+ * road_length - Calculate length of highways from an OSM file
+ .
+ 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.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..5a1eac2
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,62 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Osmium Contrib
+Upstream-Contact: Osmium Developers d...@openstreetmap.org
+Source: https://github.com/osmcode/osmium-contrib
+
+Files: *
+Copyright: 2013-2015, Jochen Topf joc...@topf.org
+License: public-domain
+ This program is released into the Public Domain.
+
+Files: amenity_list/*
+Copyright: disclaimed
+License: public-domain
+ This program is released into the Public Domain.
+
+Files: export_to_wkt/*
+Copyright: disclaimed
+License: public-domain
+ This program is released into the Public Domain.
+
+Files: mapolution/*
+Copyright: NONE
+License: UNKNOWN
+ No license
+
+Files: node_density/*
+Copyright: disclaimed
+License: public-domain
+ This program is released into the Public Domain.
+
+Files: pub_names/*
+Copyright: disclaimed
+License: public-domain
+ This program is released into the Public Domain.
+
+Files: road_length/*
+Copyright: disclaimed
+License: public-domain
+ This program is released into the Public Domain.
+
+Files: debian/*
+Copyright: © 2015, Bas Couwenberg sebas...@debian.org
+License: GPL-2+
+
+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
+ (at your option) any later version.
+ .
[pyosmium] annotated tag upstream/0.0_20150204-298c708 created (now 502f5b4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0_20150204-298c708 in repository pyosmium. at 502f5b4 (tag) tagging 3519db65c8c7885fed4d98d3b7ea0d7a3979a875 (commit) tagged by Bas Couwenberg on Fri Mar 6 15:28:32 2015 +0100 - Log - Upstream version 0.0~20150204-298c708 Bas Couwenberg (1): Imported Upstream version 0.0~20150204-298c708 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.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
[osmium-contrib] branch upstream created (now 3b14694)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository osmium-contrib. at 3b14694 Imported Upstream version 0.0~20150306-0c4f263 This branch includes the following new commits: new 3b14694 Imported Upstream version 0.0~20150306-0c4f263 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/osmium-contrib.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
[osmcoastline] 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 osmcoastline.
commit 794f1e986a7a350ee32f3eb4d37cc7ce9beb8d0c
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 17:12:47 2015 +0100
Initial Debian packaging.
---
debian/changelog | 5 +
debian/compat| 1 +
debian/control | 35 +++
debian/copyright | 46 ++
debian/gbp.conf | 16
debian/get-orig-source | 19 +++
debian/rules | 10 ++
debian/source/format | 1 +
debian/upstream/metadata | 7 +++
9 files changed, 140 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..4a46b18
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+osmcoastline (0.0~20150306-1f2b90a-1) UNRELEASED; urgency=medium
+
+ * Initial release (Closes: #779944)
+
+ -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 17:05:29 +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..e998df5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,35 @@
+Source: osmcoastline
+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/osmcoastline.git/
+Vcs-Git: git://anonscm.debian.org/pkg-grass/osmcoastline.git
+Homepage: http://osmcode.org/osmcoastline/
+
+Package: osmcoastline
+Architecture: any
+Section: utils
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: osmium-tool,
+ osmium-contrib,
+ node-osmium,
+ python-pyosmium
+Description: Extract coastline data from OpenStreetMap planet file
+ OSMCoastline extracts the coastline from an OSM planet file and assembles all
+ the pieces into polygons for use in map renderers etc.
+ .
+ OSMCoastline relies on the Osmium library for its OpenStreetMap data handling.
+ .
+ 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.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..a75e21a
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,46 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OSMCoastline
+Upstream-Contact: Osmium Developers d...@openstreetmap.org
+Source: https://github.com/osmcode/osmcoastline
+
+Files: *
+Copyright: 2012-2015, Jochen Topf joc...@topf.org
+License: GPL-3+
+
+Files: debian/*
+Copyright: © 2015, Bas Couwenberg sebas...@debian.org
+License: GPL-2+
+
+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
+ (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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+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
+ (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.
+ .
+ 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'.
+
diff --git
[pyosmium] 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 pyosmium.
commit 0fcb2c08ae875fd2155013f699b104580af09dad
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 15:34:05 2015 +0100
Initial Debian packaging.
---
debian/changelog | 5
debian/compat| 1 +
debian/control | 66
debian/copyright | 53 ++
debian/gbp.conf | 16
debian/get-orig-source | 19 ++
debian/rules | 10
debian/source/format | 1 +
debian/upstream/metadata | 7 +
9 files changed, 178 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..cca1f95
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+pyosmium (0.0~20150204-298c708-1) UNRELEASED; urgency=medium
+
+ * Initial release (Closes: #779932)
+
+ -- Bas Couwenberg sebas...@debian.org Fri, 06 Mar 2015 15:28:44 +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..ecc7a1d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,66 @@
+Source: pyosmium
+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),
+ dh-python,
+ python-all-dev,
+ python-setuptools,
+ python3-all-dev,
+ python3-setuptools
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/pyosmium.git/
+Vcs-Git: git://anonscm.debian.org/pkg-grass/pyosmium.git
+Homepage: http://osmcode.org/pyosmium/
+
+Package: python-pyosmium
+Architecture: any
+Section: python
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: osmium,
+ osmium-contrib,
+ node-osmium
+Provides: ${python:Provides}
+Description: Osmium library bindings for Python
+ The PyOsmium module allows you to access some of the features of the Osmium
+ library from Python code.
+ .
+ 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.
+ .
+ This package contains the PyOsmium module for Python 2.
+
+Package: python3-pyosmium
+Architecture: any
+Section: python
+Depends: ${python3:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: osmium,
+ osmium-contrib,
+ node-osmium
+Provides: ${python3:Provides}
+Description: Osmium library bindings for Python 3
+ The PyOsmium module allows you to access some of the features of the Osmium
+ library from Python code.
+ .
+ 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.
+ .
+ This package contains the PyOsmium module for Python 3.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..bee0589
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,53 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: PyOsmium
+Upstream-Contact: Osmium Developers d...@openstreetmap.org
+Source: https://github.com/osmcode/pyosmium
+
+Files: *
+Copyright: 2014, Sarah Hoffmann
+License: BSD-2-Clause
+
+Files: debian/*
+Copyright: © 2015, Bas Couwenberg sebas...@debian.org
+License: GPL-2+
+
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of
[osmcoastline] branch master created (now 794f1e9)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmcoastline. at 794f1e9 Initial Debian packaging. This branch includes the following new commits: new 085ba3a Imported Upstream version 0.0~20150306-1f2b90a new 794f1e9 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/osmcoastline.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
[osmcoastline] 01/01: pristine-tar data for osmcoastline_0.0~20150306-1f2b90a.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 osmcoastline. commit 6bf6ea06861fd9b692a8e822047fbc48d905e81f Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Mar 6 17:05:25 2015 +0100 pristine-tar data for osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz --- osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.delta | Bin 0 - 2429 bytes osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.delta b/osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.delta new file mode 100644 index 000..b10f1e0 Binary files /dev/null and b/osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.delta differ diff --git a/osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.id b/osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.id new file mode 100644 index 000..322d2e9 --- /dev/null +++ b/osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz.id @@ -0,0 +1 @@ +50d5751a830b50035a9ceaaf739b0f98194eb536 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmcoastline.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
[osmcoastline] branch upstream created (now 085ba3a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository osmcoastline. at 085ba3a Imported Upstream version 0.0~20150306-1f2b90a This branch includes the following new commits: new 085ba3a Imported Upstream version 0.0~20150306-1f2b90a 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/osmcoastline.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
[osmcoastline] annotated tag upstream/0.0_20150306-1f2b90a created (now 3303c1a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0_20150306-1f2b90a in repository osmcoastline. at 3303c1a (tag) tagging 085ba3a6ca0a00650d98ac56bbed6de137cdabc8 (commit) tagged by Bas Couwenberg on Fri Mar 6 17:05:25 2015 +0100 - Log - Upstream version 0.0~20150306-1f2b90a Bas Couwenberg (1): Imported Upstream version 0.0~20150306-1f2b90a --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmcoastline.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
[osmcoastline] branch pristine-tar created (now 6bf6ea0)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository osmcoastline. at 6bf6ea0 pristine-tar data for osmcoastline_0.0~20150306-1f2b90a.orig.tar.gz This branch includes the following new commits: new 6bf6ea0 pristine-tar data for osmcoastline_0.0~20150306-1f2b90a.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/osmcoastline.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#779933: python-qgis: fails to install, trying to overwrite other packages files: /usr/lib/python2.7/dist-packages/pyspatialite/dump.py
Control: tags -1 pending Hi Andreas, Thanks for your work on piuparts. On 03/06/2015 03:44 PM, Andreas Beckmann wrote: Unpacking python-qgis (2.8.1+dfsg1-1~exp1) ... dpkg: error processing archive /var/cache/apt/archives/python-qgis_2.8.1+dfsg1-1~exp1_amd64.deb (--unpack): trying to overwrite '/usr/lib/python2.7/dist-packages/pyspatialite/dump.py', which is also in package python-pyspatialite 3.0.1-6 I've fixed the qgis package to not build the internal pyspatialite and use the Debian package instead. The interal build was erroniously re-enabled after merging the upstream package changes. 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
[node-osmium] 05/10: Imported Upstream version 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 9a9a819fc63ceb7e7b8358d21c2199c4e0d34ad6
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 15:16:35 2015 +0100
Imported 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(-)
diff --git a/.gitignore b/.gitignore
index 31fef51..b13eb67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
node_modules
-lib/osmium.node
+lib/binding
.DS_Store
build
berlin-latest.osm.pbf
diff --git a/.travis.yml b/.travis.yml
index 0f23dda..eb695f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,19 @@ node_js:
- 0.10
before_install:
+ # we need c++11 compatible g++
+ - sudo apt-add-repository --yes ppa:ubuntu-toolchain-r/test
+ - sudo apt-get -y update
+ - sudo apt-get -y install gcc-4.7 g++-4.7
# first test install of binary
- - npm install --verbose
- - make test
+# - 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
- - sudo apt-get -y install git gcc-4.7 g++-4.7 build-essential libboost-dev
zlib1g-dev protobuf-compiler libprotobuf-lite7 libprotobuf-dev libexpat1-dev
libsparsehash-dev
+ - sudo apt-get -y install git build-essential libboost-dev zlib1g-dev
protobuf-compiler libprotobuf-lite7 libprotobuf-dev libexpat1-dev
libsparsehash-dev
- git clone https://github.com/scrosby/OSM-binary.git
- cd OSM-binary/src
- make sudo make install
@@ -21,7 +24,7 @@ install:
before_script:
- git clone https://github.com/osmcode/libosmium.git ../libosmium
- - CXX=g++-4.7 npm install
+ - CXX=g++-4.7 npm install --build-from-source
script:
- make test
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..c320724
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,7 @@
+## Changelog
+
+### 0.1.2
+
+ - Upgraded node-pre-gyp to 0.5.10
+
+
diff --git a/Makefile b/Makefile
index bca59f3..645cb37 100755
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
all: osmium.node
-./build:
- `npm explore npm -g -- pwd`/bin/node-gyp-bin/node-gyp configure
+./node_modules/.bin/node-gyp:
+ npm install node-gyp
-osmium.node: binding.gyp Makefile ./build
- `npm explore npm -g -- pwd`/bin/node-gyp-bin/node-gyp --verbose build
+./build: binding.gyp ./node_modules/.bin/node-gyp
+ ./node_modules/.bin/node-gyp configure
+
+osmium.node: Makefile ./build
+ ./node_modules/.bin/node-gyp build
clean:
rm -rf ./build
@@ -14,11 +17,7 @@ rebuild:
@make clean
@make
-test/data/berlin-latest.osm.pbf:
- cd test/data; \
- wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
-
-test: test/data/berlin-latest.osm.pbf
+test:
@PATH=./node_modules/mocha/bin:${PATH}
NODE_PATH=./lib:$(NODE_PATH) mocha -R spec --timeout 1
indent:
diff --git a/binding.gyp b/binding.gyp
index e262a27..740c262 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -10,6 +10,7 @@
sources: [
src/node_osmium.cpp,
src/handler.cpp,
+src/location_handler_wrap.cpp,
src/file_wrap.cpp,
src/reader_wrap.cpp,
src/osm_object_wrap.cpp,
diff --git a/common.gypi b/common.gypi
index f59efdf..3e0d5de 100644
--- a/common.gypi
+++ b/common.gypi
@@ -13,6 +13,7 @@
'Release': {
'xcode_settings': {
'GCC_OPTIMIZATION_LEVEL': 's',
+
'OTHER_CPLUSPLUSFLAGS':['-gline-tables-only','-fno-omit-frame-pointer'],
},
'ldflags': [
[node-osmium] 09/10: Imported Upstream version 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 38391dbafd15a97c071294c3269db47740af9df6
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Mar 6 15:16:44 2015 +0100
Imported 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(-)
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 000..f6a4e2e
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,10 @@
+.gitignore
+.gitmodules
+.npmignore
+.travis.yml
+Makefile
+build
+demo
+node_modules
+scripts
+test
diff --git a/Makefile b/Makefile
index f5e5d06..5ee8736 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ INCLUDES_REPORT_FILES := $(subst
src,check_reports,$(INCLUDE_FILES:.hpp=.compile
DEMOS := $(shell find demo -mindepth 1 -maxdepth 1 -type d)
all: build
+.PHONY: all build
./node_modules:
npm install --build-from-source
diff --git a/binding.gyp b/binding.gyp
index fd4eb2b..6dae20d 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -13,7 +13,10 @@
src/file_wrap.cpp,
src/handler.cpp,
src/location_handler_wrap.cpp,
+src/multipolygon_collector_wrap.cpp,
+src/multipolygon_handler_wrap.cpp,
src/node_osmium.cpp,
+
[pyosmium] branch upstream created (now 3519db6)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository pyosmium. at 3519db6 Imported Upstream version 0.0~20150204-298c708 This branch includes the following new commits: new 3519db6 Imported Upstream version 0.0~20150204-298c708 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/pyosmium.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
