[pyosmium] 01/02: Merge tag 'debian/2.7.1-2' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Jun 8 18:42:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository pyosmium.
commit 22044f6cefa12d9bbb38a9e3b7a5cf713a89531f
Merge: e04a7c1 15f40a6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jun 8 20:26:28 2016 +0200
Merge tag 'debian/2.7.1-2' into jessie-backports
Conflicts:
debian/changelog
.travis.yml | 21 +++
CHANGELOG.md | 16 +-
debian/changelog | 22 +++
debian/control | 4 +-
debian/patches/allows-to-typo.patch | 14 --
debian/patches/series | 2 +-
debian/patches/std_pair_to_python_converter.patch | 14 ++
debian/python-pyosmium.lintian-overrides | 1 +
debian/python3-pyosmium.lintian-overrides | 1 +
debian/rules | 3 +
debian/watch | 2 +-
doc/conf.py | 4 +-
examples/filter_coastlines.py | 2 +-
examples/osm_replication_stats.py | 72 ++++++++
examples/osm_url_stats.py | 41 +++++
lib/generic_handler.hpp | 32 +++-
lib/merged_input.hpp | 74 ++++++++
lib/osm.cc | 1 +
lib/osmium.cc | 30 ++-
lib/replication.cc | 45 +++++
osmium/replication/__init__.py | 1 +
osmium/replication/server.py | 211 ++++++++++++++++++++++
setup.py | 4 +-
23 files changed, 586 insertions(+), 31 deletions(-)
diff --cc debian/changelog
index f1c1b72,03dcc84..fe32131
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
+ pyosmium (2.7.1-2) unstable; urgency=medium
+
+ * Add patch to fix test failure on 32-bit architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 02 Jun 2016 10:11:28 +0200
+
+ pyosmium (2.7.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update watch file to handle more tag conventions in filenamemangle.
+ * Bump minimum required libosmium2-dev to 2.7.1.
+ * Drop allows-to-typo.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 01 Jun 2016 17:19:44 +0200
+
+ pyosmium (2.6.0-2) unstable; urgency=medium
+
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Enable bindnow hardening buildflags.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 05 May 2016 17:16:24 +0200
+
+pyosmium (2.6.0-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 12 Feb 2016 19:52:40 +0100
+
pyosmium (2.6.0-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index 44d1dc7,ce45214..0628be5
--- a/debian/control
+++ b/debian/control
@@@ -21,9 -21,9 +21,9 @@@ Build-Depends: debhelper (>= 9)
python3-nose,
python3-sphinx,
zlib1g-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pyosmium.git/
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pyosmium.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pyosmium.git -b jessie-backports
Homepage: http://osmcode.org/pyosmium/
Package: python-pyosmium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.git
More information about the Pkg-grass-devel
mailing list