[proj] branch master updated (8c0be10 -> 768c802)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository proj. from 8c0be10 Set distribution to unstable. new 768c802 Mark manpage-improvements.patch as Applied-Upstream. 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/manpage-improvements.patch | 1 + 1 file changed, 1 insertion(+) -- 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
[proj] 01/01: Mark manpage-improvements.patch as Applied-Upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository proj. commit 768c80267d7f11441b69d475373af7d466fe94a3 Author: Bas CouwenbergDate: Wed Jun 1 21:59:19 2016 +0200 Mark manpage-improvements.patch as Applied-Upstream. --- debian/patches/manpage-improvements.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/manpage-improvements.patch b/debian/patches/manpage-improvements.patch index fdeaacb..a2460a6 100644 --- a/debian/patches/manpage-improvements.patch +++ b/debian/patches/manpage-improvements.patch @@ -2,6 +2,7 @@ Description: Add BUGS section to manpages & update old URLs. Author: Bas Couwenberg Bug-Debian: https://bugs.debian.org/809690 Forwarded: https://github.com/OSGeo/proj.4/pull/382 +Applied-Upstream: https://github.com/OSGeo/proj.4/commit/933eaf7d86fea02b2cb9c0c5728ac3c82c6657a0 --- a/man/man1/cs2cs.1 +++ b/man/man1/cs2cs.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
pyosmium_2.7.1-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 01 Jun 2016 17:19:44 +0200 Source: pyosmium Binary: python-pyosmium python3-pyosmium pyosmium-doc Architecture: source all amd64 Version: 2.7.1-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: pyosmium-doc - Osmium library bindings for Python - Documentation python-pyosmium - Osmium library bindings for Python python3-pyosmium - Osmium library bindings for Python 3 Changes: 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. Checksums-Sha1: 0c5937cd9c4a0302b853fb10d20e0e3d7215deae 2303 pyosmium_2.7.1-1.dsc d687dc653f5053bf6fa249bb9cd49ab424125677 35926 pyosmium_2.7.1.orig.tar.gz e248d4c7940419d93cd42cf05930aa00f94c9ddd 4324 pyosmium_2.7.1-1.debian.tar.xz dd210b46e78dd59d9e682ae3726cc6df42deec20 41582 pyosmium-doc_2.7.1-1_all.deb d22906d72626df677efc038165bd5a8ef07e774f 5903874 python-pyosmium-dbgsym_2.7.1-1_amd64.deb 74406c73a45076ac16436aced3688ace42585a28 452318 python-pyosmium_2.7.1-1_amd64.deb 1128e758aa1ccf6dc936bda68a9f8ccb93f132eb 5919958 python3-pyosmium-dbgsym_2.7.1-1_amd64.deb a3f1e84b3fe875223ae26826b2dcddea966b3dbf 450616 python3-pyosmium_2.7.1-1_amd64.deb Checksums-Sha256: 65cb128d349d1dd0a569cac7893f582a43dcc94148fc8b2f5e75b392b1ccf488 2303 pyosmium_2.7.1-1.dsc 11d573902f2b2445c1b0dc2fea5db154b8b67bbb6e1d3f337a92bf228c38723f 35926 pyosmium_2.7.1.orig.tar.gz 87fdc3f975ffeefd0bf43ec08cf63ef169ac98c3281b54f9f737660f701cc4d4 4324 pyosmium_2.7.1-1.debian.tar.xz 7470d430c300a0ac7cb411fe31db3b98d1581b07456623252e5fca3031d15879 41582 pyosmium-doc_2.7.1-1_all.deb 89ee21372784fa2b4317e1067e22718d0928b6e28b3a4dcd5932d3be3cc0688d 5903874 python-pyosmium-dbgsym_2.7.1-1_amd64.deb 416ef18d655a1eda096d73c637d25349a7959637ceb131f26e0525ba27d1df5f 452318 python-pyosmium_2.7.1-1_amd64.deb 92f454702853d78d8ee234262999087ce7dc8245821594d3d32f5192627a46ce 5919958 python3-pyosmium-dbgsym_2.7.1-1_amd64.deb b3c1b6bb23901ed02f312d769b64aa01df145f94792941e0f5904de2dcff 450616 python3-pyosmium_2.7.1-1_amd64.deb Files: 603b517162a5fbc76f62347aff0ff1de 2303 science optional pyosmium_2.7.1-1.dsc e79195655bf3ebdd25736baf1d1451e8 35926 science optional pyosmium_2.7.1.orig.tar.gz 41843dba31198510ae4931f727b3ed22 4324 science optional pyosmium_2.7.1-1.debian.tar.xz d0cdfaa3dd3fba23d9dde5d7fc3822fd 41582 doc optional pyosmium-doc_2.7.1-1_all.deb b10422b3156c5e6194607730b01092c7 5903874 debug extra python-pyosmium-dbgsym_2.7.1-1_amd64.deb fecbc4814206b677d7208788ddecfc3e 452318 python optional python-pyosmium_2.7.1-1_amd64.deb 8aa03d874a28b886d8a9182da1dd0176 5919958 debug extra python3-pyosmium-dbgsym_2.7.1-1_amd64.deb 63318d0a0bff3b11f4678f15668bdb38 450616 python optional python3-pyosmium_2.7.1-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXTwKPAAoJEGdQ8QrojUrxc90QAJjlYY9wXq5klDjsdDMMPGa7 q4aNIK4KW8tBC+EgU6+IRtjBgi/G34+DkqSFx87LgXcTtkyObQO2+Whz2CrLOaKA 46hJn7kOklAxdjsnhVbA2vwkmlwh88uPhTvojCFTpOmVd2d2ZmOTDtCC2JK31ZQx cmMWWgZL6K87C/99nMnCIbFExK/e0FH1SiB9WYU2a7wqFHc55+dACIsoQWwcE2Yn ucBKhXvRxIUwjFrTiE1h4Uf7PeufXzj4qqQhqC84HewDz27LmtIXa5YeDddJvG8n 6OHTdqfCmE+uY19twfIscJQzwGeE19/j7iGSuEsBPfmo2N3zNu148wjgtEh77qvg zrugEkO2/qYreCc+tue1gNTqWhq+OeONJpVWTeAPEkFToI43V1ByhAtoKaYH5lj1 ipxqFCuLHcWdK5zL9DCUk4oLAOMvGPEwZNtNR6HcNaXIP/K9dXru1F2YiljPP+2k NeYf+DQng48LemucdFLeNOWJKktyWsQJSwpxQn5ZnpqS7AHQRNlZlUxcSy8LiSlO BKe8QAgAePn4LTxDvs4fokO2HNjdOjoxhkq3DCZYc88HbKUL7KLpbbKR2zRwx0mv xUnZLf8ANN5K5JiN/Vo3lSFr/Z5TDGmNZF3pHi+VXi8QUL8xtk1E7zhPSXk6wF03 RU5gxVQC7KlZZkba5OQS =qqAi -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ 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_2.1.3-2_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 01 Jun 2016 17:58:26 +0200 Source: osmcoastline Binary: osmcoastline Architecture: source amd64 Version: 2.1.3-2 Distribution: unstable Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: osmcoastline - Extract coastline data from OpenStreetMap planet file Changes: osmcoastline (2.1.3-2) unstable; urgency=medium . * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. Checksums-Sha1: 67f34f9d70d25a29976e58e1fa7c45595f85d07f 2092 osmcoastline_2.1.3-2.dsc 5c2e0b2ea9c3995d93a6873da5628f71557fcc7c 3328 osmcoastline_2.1.3-2.debian.tar.xz e0460e3e554da45f6babcf149534436f6753e66c 3238262 osmcoastline-dbgsym_2.1.3-2_amd64.deb 8e6d40d64d8829a1fd2d27814e4d431bb4f63dc4 244834 osmcoastline_2.1.3-2_amd64.deb Checksums-Sha256: dea6beff0d48d9a64046be3152ff1d09c2cd113f95bd0d759f338b0ee0d1438b 2092 osmcoastline_2.1.3-2.dsc 36989cf73d6d4ef0fc47021288ceadf747a010b5dbb863a0c784dd03f7386477 3328 osmcoastline_2.1.3-2.debian.tar.xz 45f2059323c3bbb989a53bc370de7376ebbfe00ab30c6fdc789f56871d6339c4 3238262 osmcoastline-dbgsym_2.1.3-2_amd64.deb 8af6f29e04029837a3b83a31ed425df5fb86f86a17b09a2ddd994bb095d52977 244834 osmcoastline_2.1.3-2_amd64.deb Files: dcb7f1bc99e258af955ca0cb3ca0e26f 2092 science optional osmcoastline_2.1.3-2.dsc c0574594c2c9ab8db58735da14b3c417 3328 science optional osmcoastline_2.1.3-2.debian.tar.xz aea97e4cfabc89cd5e2dac608932ae23 3238262 debug extra osmcoastline-dbgsym_2.1.3-2_amd64.deb e5fa8afbf694ba3a538f0c1425acf99e 244834 utils optional osmcoastline_2.1.3-2_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXTwfZAAoJEGdQ8QrojUrxMNkP/3oq9jVqj0B30DdnyEwi2TtX Mwc7TigDIAwX/abe+bTYE3yUa3JntcdD31kjKr5JZ7sgfPVIUcvvQo7pUwiBtryC +hw7nXqxEDyF9g55/LgvLCbuhmxxyLldg5zVzMu1D0U96kkyWhTeTMAy4fzlhi/n 6U4OispxKAnKbPy1f675UDUKTvDS1kxHs7RvPncAfKzJXDibenIiTY+/+WHyWq60 EfpbwWDU0BZrlXzSRJyU+esirbGf0YEAff7sOmjvqFOR2ve6/DpQjUjbq+2VqBUJ 99EIl0F7pUl3qEn2Fn7giesiZG6PP/PaqrCFRr1GIvdnDujTML6nwbuBA1LNutp0 mtwuHrDX/ZNoAc6t6Phg/MQYwrOIFgxBzBlpsYk7/Py+VE4Fkl1+ti0Y9qDzttKn 6K6UA8nbm3m7hC4bwi/YAj5IAHhQG4kdL1wDIK/SC/UHa4nDq5DHb6difay7hlVz wswtIJhKKoYPYFh3n5XUhNA85m7Uf3CJXQQt7MQNAzkJ7ZV4HsF09rIChpJ9dRh0 f6cMtzjwZdUJ4z1kzwfCLXBQJxGKjgFoNoN5h3zw4dhim203JwHPF/RkyQ46oikT traOENz+7kzEFxoKtpwe/agQl3ccfaQPT1+NGtmZR536aTL9fvPJvYOldrHV2uyW r5A7FJ/RcVz2oJlWlEwC =1lY+ -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ 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_1.3.0-2_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 01 Jun 2016 17:44:22 +0200 Source: osmium-tool Binary: osmium-tool Architecture: source amd64 Version: 1.3.0-2 Distribution: unstable Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: osmium-tool - Command line tool for working with OpenStreetMap data Changes: osmium-tool (1.3.0-2) unstable; urgency=medium . * Update Vcs-Git URL to use HTTPS. * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. * Enable all hardening buildflags. * Add patch to fix spelling errors. Checksums-Sha1: 8f5ca81a9cefce12039052a3b887a4efee41e9ee 2050 osmium-tool_1.3.0-2.dsc 8de005714b5d5a0bfa7d9b1fca073fb8b2a0eaba 5316 osmium-tool_1.3.0-2.debian.tar.xz 1106edb820beb6e269daa4a774026dae74ad3dca 9754582 osmium-tool-dbgsym_1.3.0-2_amd64.deb a9f9f2517e4c691121e94e3cd07d4e5c5542dd03 265036 osmium-tool_1.3.0-2_amd64.deb Checksums-Sha256: 93b1328ba93929685681fcc19315d4797973068648196c9b42a0843c00452b45 2050 osmium-tool_1.3.0-2.dsc 81c7af0523af345461f30c3bfbe5971ca5ed7c0d1ac7b4263eda05405b8b7e7a 5316 osmium-tool_1.3.0-2.debian.tar.xz dc8c4ae42d6747de13df60374118c09d9958d867b838de58b9abe3f45826ade2 9754582 osmium-tool-dbgsym_1.3.0-2_amd64.deb c9f1ca03c699a9c432bba739a4e30f0eb3c70e5391bf2e5298770349e03fd741 265036 osmium-tool_1.3.0-2_amd64.deb Files: aa4944a38fe68be51173bf2e040303f9 2050 science optional osmium-tool_1.3.0-2.dsc 41107d6eb84f2785b1a2412ce5ab63a8 5316 science optional osmium-tool_1.3.0-2.debian.tar.xz 8ab9c5d04b4becfc61bd847553ce95de 9754582 debug extra osmium-tool-dbgsym_1.3.0-2_amd64.deb eca8fb803959fb71c1ff5c1d73175ca6 265036 utils optional osmium-tool_1.3.0-2_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXTwWMAAoJEGdQ8QrojUrxX4EP/1Pug1Lg9vzVR11kWLfuOYLk xHdfvfRB4zt+Rkh4QLOCyGobfTD0o9CnTN2N9wAs5u78lRmMpyzPnL6U/mvZ4kG5 4qFwQaq0CaX5pxNp3WaK2e6WSSP6ZS7HcAZx108ipGmrazZIdfsGGQcnAnqj39u6 R1RPdk/9TdAuMGW0X/A6g9peJOcVdnHcLSHrVJzmNe60A3WEadhVyVrbVjA7iZVW pMGTDa5RdzdgnzeS+dmv4WeRd4hVRXigTAoL6xjRZXrMbbzepv+bFuus8EW0WxbY eG81aJckXKiGlOCpKWpxZn++pUHLvD/VYHWn+pUkFUPe089Fz9v2Te1Ss/MtNohf iT5759FramkcI9Y4R7M3eZhA7BFzoudhtHWoqIDtIaT9htewIWUTJKFQbW52Hzwg npsKI0L2dRAHQEFxYU7LvWaoEv8BtkpfDVxiQNdzQenxAOFeo4woXzfkHmtoLk0R IzVxh/RiqAr2kRQtvIU8wrY/cXWKVyVBnKo2yBoMDnE0Vo3oXDzxHI1ADQ2f+4FH l7DDI1FtedJpK91ioAe8BxNzTdYujZ4jdGO6YUEJYrrixSHO0niMOTjd5xPkMADC SDWa2bhMgDjwNcEogXcdBs1mUKAWsuclOK+JTj8gPshts+R+7NaH3L1rCa/qQupF npiYzTky/IJsl54ecwe8 =lFD0 -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ 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_2.7.1-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 01 Jun 2016 17:09:14 +0200 Source: libosmium Binary: libosmium2-dev libosmium2-doc Architecture: source amd64 all Version: 2.7.1-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: libosmium2-dev - C++ framework for working with OSM data files libosmium2-doc - C++ framework for working with OSM data files - documentation Changes: libosmium (2.7.1-1) unstable; urgency=medium . * New upstream release. * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. Checksums-Sha1: 60e76e53a8148c23ce93d93d02ad7e92bb3b3ecd 2183 libosmium_2.7.1-1.dsc a2879d23f200d3cb3275bd5a36e0a5c0f7de0392 386351 libosmium_2.7.1.orig.tar.gz eec58e95469e6c22369d4194e86c679b5731ba5c 5840 libosmium_2.7.1-1.debian.tar.xz 8a7cae69809efe749be06d04d9312142ba89014f 155824 libosmium2-dev_2.7.1-1_amd64.deb 4bc105d290b2ef853701c1839e0ed8464ab98b00 40250240 libosmium2-doc_2.7.1-1_all.deb Checksums-Sha256: 3f9563067a4e5a75760a6e4c3b020f9b8c4f7386920cf116b703add13f139c96 2183 libosmium_2.7.1-1.dsc 171e20b3e823fcd08b2412f49ff5652f9dc4647e691d0ae9ff043db1fbd1aced 386351 libosmium_2.7.1.orig.tar.gz c95f732a7146616f77558f4703062bc6654347b5f7188a9a8e1fa0237c434719 5840 libosmium_2.7.1-1.debian.tar.xz f3af60a0c84259004cb160eaab592c94214aeac0e391cdca830f504f9645b0fa 155824 libosmium2-dev_2.7.1-1_amd64.deb 3895674cc6b88595a528e42618bd5adda0632f39bf4fbe72b4af94a269fd7d54 40250240 libosmium2-doc_2.7.1-1_all.deb Files: 372f9bc8439f73d098c8e53bdc0381d5 2183 science optional libosmium_2.7.1-1.dsc c7a2e7447783c22f2b7a347e740239d6 386351 science optional libosmium_2.7.1.orig.tar.gz bb18dac844bd7118b6ca294afb808b80 5840 science optional libosmium_2.7.1-1.debian.tar.xz f03dec84c13e587c2c46c9991890ebfb 155824 libdevel optional libosmium2-dev_2.7.1-1_amd64.deb 639a7130d33937bc4f8cc8e9b079a375 40250240 doc optional libosmium2-doc_2.7.1-1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXTvzNAAoJEGdQ8QrojUrxZ+8QANSSfnZgjpcKf3ZO6UIoPMWu Q5Z90OwdCBo8nZ2PwnalqgNQF9tyhKBP1xVlr6mFqvnXk3rW+AV+KblBXjitjNWg AiC3uemV42oK460ED/1juG4CvFBzgnBcTwTYodgyXqFxp4Fiso4+dsWTeHupKru2 Vl2KijmZVPpYQQDW9isB2oedMF6majadJ+i7oYbXrNEYpgX83Sc57zdgpiIcxLYi KALLjAkT8KgNyRe27BAIJq+oxrrNEfHNEkkJuTrNiFyqyaFmG0HVMB4tBeDtEgZf rA/Uphi5AFNRD4UrwLo6L6Ni1duTaCxrI9nAVTB9JxndCTpAVex395FWXvp6Ox2z NOBhzLOIa+he79J7EBNXfnNiR/xqS0KtYZyHj1mwrmzXrEeAfz0g3X1hM01Ygle6 u0neSNrQFv8w6CfAncG5B5wvjfv3zvZShnzrP0wOKXN2q3pHVbeVuANQKqkmvvji dDnw7kNalRbx1Pw8cqhAzACoENT2S3NC9omzIzOU1iL/+ViU9k0NQT90/Nk4Lbod JCsSoSzxSFV3AZkJ8ys9CEg5iOt3BecKcID23W5mvXXz2Z69In3jjt8UTtpIiAtB NT4km/F5/CJVSyGax8p6sLpszcQZleqXnh3krNzWJoQvQdDEtiuMV0mGKCaJ6jEm RSe4t3exF+/mCYUJTgzM =UxM2 -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ 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 (776f702 -> 1a8b799)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmium-tool. from 776f702 Set distribution to unstable. new 1a8b799 Mark spelling-errors.patch as Applied-Upstream. 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/spelling-errors.patch | 1 + 1 file changed, 1 insertion(+) -- 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/01: Mark spelling-errors.patch as Applied-Upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 1a8b7998e75842207846ccf66e88476e604c1ed3 Author: Bas CouwenbergDate: Wed Jun 1 18:50:10 2016 +0200 Mark spelling-errors.patch as Applied-Upstream. --- debian/patches/spelling-errors.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch index 2ea9dbf..1cbfb3e 100644 --- a/debian/patches/spelling-errors.patch +++ b/debian/patches/spelling-errors.patch @@ -2,6 +2,7 @@ Description: Fix spelling errors. thats -> that's Author: Bas Couwenberg Forwarded: https://github.com/osmcode/osmium-tool/pull/27 +Applied-Upstream: https://github.com/osmcode/osmium-tool/commit/2f2991993d21994998871d2207cc41c9c7c711a9 --- a/CHANGELOG.md +++ b/CHANGELOG.md -- 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
Processing of osmcoastline_2.1.3-2_amd64.changes
osmcoastline_2.1.3-2_amd64.changes uploaded successfully to localhost along with the files: osmcoastline_2.1.3-2.dsc osmcoastline_2.1.3-2.debian.tar.xz osmcoastline-dbgsym_2.1.3-2_amd64.deb osmcoastline_2.1.3-2_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ 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] 03/03: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmcoastline. commit 64cce398130895cc34d7f4219082c680c64ecb37 Author: Bas CouwenbergDate: Wed Jun 1 17:58:37 2016 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ce178e..6008684 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -osmcoastline (2.1.3-2) UNRELEASED; urgency=medium +osmcoastline (2.1.3-2) unstable; urgency=medium * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. - -- Bas Couwenberg Tue, 03 May 2016 17:28:20 +0200 + -- Bas Couwenberg Wed, 01 Jun 2016 17:58:26 +0200 osmcoastline (2.1.3-1) unstable; urgency=medium -- 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/03: Bump Standards-Version to 3.9.8, no changes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmcoastline. commit 879a7f7f103ee4ae1279dcdded1304dd8a9f6134 Author: Bas CouwenbergDate: Tue May 3 17:28:31 2016 +0200 Bump Standards-Version to 3.9.8, no changes. --- debian/changelog | 6 ++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ed64e62..46489cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmcoastline (2.1.3-2) UNRELEASED; urgency=medium + + * Bump Standards-Version to 3.9.8, no changes. + + -- Bas Couwenberg Tue, 03 May 2016 17:28:20 +0200 + osmcoastline (2.1.3-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 3e4c895..69333da 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), pandoc, sqlite3, zlib1g-dev -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmcoastline.git/ Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmcoastline.git Homepage: http://osmcode.org/osmcoastline/ -- 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] tag debian/2.1.3-2 created (now 64cce39)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.1.3-2 in repository osmcoastline. at 64cce39 (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/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 master updated (32c3907 -> 64cce39)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmcoastline. from 32c3907 Set distribution to unstable. new 879a7f7 Bump Standards-Version to 3.9.8, no changes. new 7852100 Update watch file to handle more tag conventions in filenamemangle. new 64cce39 Set distribution to unstable. 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/changelog | 7 +++ debian/control | 2 +- debian/watch | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) -- 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] 02/03: Update watch file to handle more tag conventions in filenamemangle.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmcoastline. commit 7852100aaff7aa862604e180671cee23337fff56 Author: Bas CouwenbergDate: Wed Jun 1 14:33:06 2016 +0200 Update watch file to handle more tag conventions in filenamemangle. --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 46489cb..9ce178e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ osmcoastline (2.1.3-2) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.8, no changes. + * Update watch file to handle more tag conventions in filenamemangle. -- Bas Couwenberg Tue, 03 May 2016 17:28:20 +0200 diff --git a/debian/watch b/debian/watch index 111f005..b2be7a7 100644 --- a/debian/watch +++ b/debian/watch @@ -2,6 +2,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\.]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osmcoastline-$1.$2/ \ +filenamemangle=s/(?:.*\/)?(?:rel|v|osmcoastline)[\-\_]?(\d[\d\-\.]+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osmcoastline-$1.$2/ \ https://github.com/osmcode/osmcoastline/releases \ (?:.*/)?(?:rel|v|osmcoastline)[\-\_]?(\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/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
[osmium-tool] 02/07: Bump Standards-Version to 3.9.7, no changes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 658b4865a665f07b4614c4d00e529eae4b30aea4 Author: Bas CouwenbergDate: Tue Feb 16 23:28:45 2016 +0100 Bump Standards-Version to 3.9.7, no changes. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77ed15b..7743c3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ osmium-tool (1.3.0-2) UNRELEASED; urgency=medium * Update Vcs-Git URL to use HTTPS. + * Bump Standards-Version to 3.9.7, no changes. -- Bas Couwenberg Tue, 16 Feb 2016 23:27:41 +0100 diff --git a/debian/control b/debian/control index 82c235a..6684599 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9), libosmium2-dev (>= 2.5.3), pandoc, zlib1g-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/ Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmium-tool.git Homepage: http://osmcode.org/osmium/ -- 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
Processing of osmium-tool_1.3.0-2_amd64.changes
osmium-tool_1.3.0-2_amd64.changes uploaded successfully to localhost along with the files: osmium-tool_1.3.0-2.dsc osmium-tool_1.3.0-2.debian.tar.xz osmium-tool-dbgsym_1.3.0-2_amd64.deb osmium-tool_1.3.0-2_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ 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/07: Update watch file to handle more tag conventions in filenamemangle.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 1cf8a8135720f00d38e7761c707af7859f2badb5 Author: Bas CouwenbergDate: Wed Jun 1 14:33:54 2016 +0200 Update watch file to handle more tag conventions in filenamemangle. --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7743c3d..53608cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ osmium-tool (1.3.0-2) UNRELEASED; urgency=medium * Update Vcs-Git URL to use HTTPS. * Bump Standards-Version to 3.9.7, no changes. + * Update watch file to handle more tag conventions in filenamemangle. -- Bas Couwenberg Tue, 16 Feb 2016 23:27:41 +0100 diff --git a/debian/watch b/debian/watch index 7779d29..61f631c 100644 --- a/debian/watch +++ b/debian/watch @@ -2,6 +2,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\.]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osmium-tool-$1.$2/ \ +filenamemangle=s/(?:.*\/)?(?:rel|v|osmium-tool)[\-\_]?(\d[\d\-\.]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osmium-tool-$1.$2/ \ 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] 01/07: Add changelog entry for Vcs-Git URL change.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 624d5210af9f531723c2c7cc74023fd8075ac49a Author: Bas CouwenbergDate: Tue Feb 16 23:27:56 2016 +0100 Add changelog entry for Vcs-Git URL change. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9a6e924..77ed15b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmium-tool (1.3.0-2) UNRELEASED; urgency=medium + + * Update Vcs-Git URL to use HTTPS. + + -- Bas Couwenberg Tue, 16 Feb 2016 23:27:41 +0100 + osmium-tool (1.3.0-1) unstable; urgency=medium * Move from experimental to unstable. -- 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/07: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 776f7029de37d90448d4cc3e2bf74d59e61f5d35 Author: Bas CouwenbergDate: Wed Jun 1 17:44:40 2016 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 68b60e6..7e42623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -osmium-tool (1.3.0-2) UNRELEASED; urgency=medium +osmium-tool (1.3.0-2) unstable; urgency=medium * Update Vcs-Git URL to use HTTPS. * Bump Standards-Version to 3.9.8, no changes. @@ -6,7 +6,7 @@ osmium-tool (1.3.0-2) UNRELEASED; urgency=medium * Enable all hardening buildflags. * Add patch to fix spelling errors. - -- Bas Couwenberg Tue, 16 Feb 2016 23:27:41 +0100 + -- Bas Couwenberg Wed, 01 Jun 2016 17:44:22 +0200 osmium-tool (1.3.0-1) unstable; urgency=medium -- 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/07: Enable all hardening buildflags.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit e08151c4fbbaaa15ca8321120c896052d42f7cae Author: Bas CouwenbergDate: Wed Jun 1 14:41:08 2016 +0200 Enable all hardening buildflags. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7d74a6e..766a66e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ osmium-tool (1.3.0-2) UNRELEASED; urgency=medium * Update Vcs-Git URL to use HTTPS. * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. + * Enable all hardening buildflags. -- Bas Couwenberg Tue, 16 Feb 2016 23:27:41 +0100 diff --git a/debian/rules b/debian/rules index 2b8debf..360e0aa 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# Enable hardening build flags +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + # Verbose make output export VERBOSE=1 -- 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/07: Bump Standards-Version to 3.9.8, no changes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit d2ec6ae24e312ba4dc7e6009b43392d4efe16cbb Author: Bas CouwenbergDate: Wed Jun 1 14:34:18 2016 +0200 Bump Standards-Version to 3.9.8, no changes. --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53608cd..7d74a6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ osmium-tool (1.3.0-2) UNRELEASED; urgency=medium * Update Vcs-Git URL to use HTTPS. - * Bump Standards-Version to 3.9.7, no changes. + * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. -- Bas Couwenberg Tue, 16 Feb 2016 23:27:41 +0100 diff --git a/debian/control b/debian/control index 6684599..7d4 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9), libosmium2-dev (>= 2.5.3), pandoc, zlib1g-dev -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/ Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmium-tool.git Homepage: http://osmcode.org/osmium/ -- 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] tag debian/1.3.0-2 created (now 776f702)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.3.0-2 in repository osmium-tool. at 776f702 (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/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] 06/07: Add patch to fix spelling errors.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 4f68d12812c831048d7dbdadab89539bdf870487 Author: Bas CouwenbergDate: Wed Jun 1 14:43:55 2016 +0200 Add patch to fix spelling errors. --- debian/changelog | 1 + debian/patches/series| 1 + debian/patches/spelling-errors.patch | 27 +++ 3 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index 766a66e..68b60e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ osmium-tool (1.3.0-2) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. * Enable all hardening buildflags. + * Add patch to fix spelling errors. -- Bas Couwenberg Tue, 16 Feb 2016 23:27:41 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..38edaa7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +spelling-errors.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch new file mode 100644 index 000..2ea9dbf --- /dev/null +++ b/debian/patches/spelling-errors.patch @@ -0,0 +1,27 @@ +Description: Fix spelling errors. + thats -> that's +Author: Bas Couwenberg +Forwarded: https://github.com/osmcode/osmium-tool/pull/27 + +--- a/CHANGELOG.md b/CHANGELOG.md +@@ -58,7 +58,7 @@ This project adheres to [Semantic Versio + + ### Fixed + +-- Remove license thats not applicable from LICENSE-rapidjson.txt. ++- Remove license that's not applicable from LICENSE-rapidjson.txt. + - Renumbering didn't work properly in some cases. + - Fix error checking in renumber command. + +--- a/man/osmium-check-refs.md b/man/osmium-check-refs.md +@@ -21,7 +21,7 @@ good. + + This command will do the check in one pass through the input data. It needs + enough main memory to store all temporary data. Largest memory need will be +-1 bit for each node ID, thats roughly 500 MB these days (Summer 2015). ++1 bit for each node ID, that's roughly 500 MB these days (Summer 2015). + + If the option -r is not given, this command will only check if all nodes + references in ways are in the file, with the option, relations will also be -- 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 (f0001cd -> 776f702)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osmium-tool. from f0001cd Update Vcs-Git URL to use HTTPS. new 624d521 Add changelog entry for Vcs-Git URL change. new 658b486 Bump Standards-Version to 3.9.7, no changes. new 1cf8a81 Update watch file to handle more tag conventions in filenamemangle. new d2ec6ae Bump Standards-Version to 3.9.8, no changes. new e08151c Enable all hardening buildflags. new 4f68d12 Add patch to fix spelling errors. new 776f702 Set distribution to unstable. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 ++ debian/control | 2 +- debian/patches/series| 1 + debian/patches/spelling-errors.patch | 27 +++ debian/rules | 3 +++ debian/watch | 2 +- 6 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 debian/patches/series create mode 100644 debian/patches/spelling-errors.patch -- 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
Processing of pyosmium_2.7.1-1_amd64.changes
pyosmium_2.7.1-1_amd64.changes uploaded successfully to localhost along with the files: pyosmium_2.7.1-1.dsc pyosmium_2.7.1.orig.tar.gz pyosmium_2.7.1-1.debian.tar.xz pyosmium-doc_2.7.1-1_all.deb python-pyosmium-dbgsym_2.7.1-1_amd64.deb python-pyosmium_2.7.1-1_amd64.deb python3-pyosmium-dbgsym_2.7.1-1_amd64.deb python3-pyosmium_2.7.1-1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ 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 upstream updated (fdbfe20 -> 54e7a8c)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository pyosmium. from fdbfe20 Imported Upstream version 2.6.0 new 54e7a8c Imported Upstream version 2.7.1 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: .travis.yml| 21 ++ CHANGELOG.md | 16 +- doc/conf.py| 4 +- examples/filter_coastlines.py | 2 +- ...{osm_diff_stats.py => osm_replication_stats.py} | 24 ++- examples/{osm_file_stats.py => osm_url_stats.py} | 14 +- 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 +- 14 files changed, 456 insertions(+), 23 deletions(-) copy examples/{osm_diff_stats.py => osm_replication_stats.py} (58%) copy examples/{osm_file_stats.py => osm_url_stats.py} (65%) create mode 100644 lib/merged_input.hpp create mode 100644 lib/replication.cc create mode 100644 osmium/replication/__init__.py create mode 100644 osmium/replication/server.py -- 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
[pyosmium] 06/08: Drop allows-to-typo.patch, applied upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit 7f34d07c52bb562de6a6937663c3a72048982bac Author: Bas CouwenbergDate: Wed Jun 1 13:50:03 2016 +0200 Drop allows-to-typo.patch, applied upstream. --- debian/changelog| 1 + debian/patches/allows-to-typo.patch | 14 -- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index f334297..ecd1092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pyosmium (2.7.1-1) UNRELEASED; 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 Wed, 01 Jun 2016 13:44:12 +0200 diff --git a/debian/patches/allows-to-typo.patch b/debian/patches/allows-to-typo.patch deleted file mode 100644 index 13f80f1..000 --- a/debian/patches/allows-to-typo.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix 'allows to ' typo, replace with 'allows ing'. -Author: Bas Couwenberg - a/lib/osmium.cc -+++ b/lib/osmium.cc -@@ -109,7 +109,7 @@ BOOST_PYTHON_MODULE(_osmium) - "exists. The file type to output is determined from the file extension. " - "The second (optional) parameter is the buffer size. osmium caches the " - "output data in an internal memory buffer before writing it on disk. This " --"parameter allows to change the default buffer size of 4MB. Larger buffers " -+"parameter allows changing the default buffer size of 4MB. Larger buffers " - "are normally better but you should be aware that there are normally multiple " - "buffers in use during the write process.", - init()) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a3b4f01..000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -allows-to-typo.patch -- 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
[pyosmium] 07/08: Update lintian overrides for replication library.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit ca66c29ec03c274f69fd842ce3bc4d7a4ca58649 Author: Bas CouwenbergDate: Wed Jun 1 17:31:13 2016 +0200 Update lintian overrides for replication library. --- debian/python-pyosmium.lintian-overrides | 1 + debian/python3-pyosmium.lintian-overrides | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/python-pyosmium.lintian-overrides b/debian/python-pyosmium.lintian-overrides index a54dfa4..ec4987e 100644 --- a/debian/python-pyosmium.lintian-overrides +++ b/debian/python-pyosmium.lintian-overrides @@ -7,4 +7,5 @@ # unprotected: memcpy python-pyosmium: hardening-no-fortify-functions usr/lib/python2*/dist-packages/osmium/geom.*.so python-pyosmium: hardening-no-fortify-functions usr/lib/python2*/dist-packages/osmium/io.*.so +python-pyosmium: hardening-no-fortify-functions usr/lib/python2*/dist-packages/osmium/replication/_replication.*.so diff --git a/debian/python3-pyosmium.lintian-overrides b/debian/python3-pyosmium.lintian-overrides index 8f6fdb3..7a981ca 100644 --- a/debian/python3-pyosmium.lintian-overrides +++ b/debian/python3-pyosmium.lintian-overrides @@ -7,4 +7,5 @@ # unprotected: memcpy python3-pyosmium: hardening-no-fortify-functions usr/lib/python3*/dist-packages/osmium/geom.*.so python3-pyosmium: hardening-no-fortify-functions usr/lib/python3*/dist-packages/osmium/io.*.so +python3-pyosmium: hardening-no-fortify-functions usr/lib/python3*/dist-packages/osmium/replication/_replication.*.so -- 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
[pyosmium] tag debian/2.7.1-1 created (now d123b7a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.7.1-1 in repository pyosmium. at d123b7a (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/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
[pyosmium] annotated tag upstream/2.7.1 created (now b18370b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.7.1 in repository pyosmium. at b18370b (tag) tagging 54e7a8caad772f5c46d3725c2bf05e0c998f9a3d (commit) replaces upstream/2.6.0 tagged by Bas Couwenberg on Wed Jun 1 13:44:04 2016 +0200 - Log - Upstream version 2.7.1 Bas Couwenberg (1): Imported Upstream version 2.7.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/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
[pyosmium] 05/08: Bump minimum required libosmium2-dev to 2.7.1.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit 9e01380fb926338063fb767b08de55a33ea4d43c Author: Bas CouwenbergDate: Wed Jun 1 13:45:05 2016 +0200 Bump minimum required libosmium2-dev to 2.7.1. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d323472..f334297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pyosmium (2.7.1-1) UNRELEASED; urgency=medium * New upstream release. * Update watch file to handle more tag conventions in filenamemangle. + * Bump minimum required libosmium2-dev to 2.7.1. -- Bas Couwenberg Wed, 01 Jun 2016 13:44:12 +0200 diff --git a/debian/control b/debian/control index 0142503..ce45214 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), libexpat1-dev, libgdal-dev, libgeos++-dev, - libosmium2-dev (>= 2.6.0), + libosmium2-dev (>= 2.7.1), libsparsehash-dev, python-all-dev, python-setuptools, -- 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
[pyosmium] branch pristine-tar updated (e37d079 -> 7fe36d9)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository pyosmium. from e37d079 pristine-tar data for pyosmium_2.6.0.orig.tar.gz new 7fe36d9 pristine-tar data for pyosmium_2.7.1.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: pyosmium_2.7.1.orig.tar.gz.delta | Bin 0 -> 2361 bytes pyosmium_2.7.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 pyosmium_2.7.1.orig.tar.gz.delta create mode 100644 pyosmium_2.7.1.orig.tar.gz.id -- 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
[pyosmium] 01/01: pristine-tar data for pyosmium_2.7.1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository pyosmium. commit 7fe36d9e067d757a4c166a3bc3ecdddb658064ce Author: Bas CouwenbergDate: Wed Jun 1 13:44:04 2016 +0200 pristine-tar data for pyosmium_2.7.1.orig.tar.gz --- pyosmium_2.7.1.orig.tar.gz.delta | Bin 0 -> 2361 bytes pyosmium_2.7.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/pyosmium_2.7.1.orig.tar.gz.delta b/pyosmium_2.7.1.orig.tar.gz.delta new file mode 100644 index 000..8d10099 Binary files /dev/null and b/pyosmium_2.7.1.orig.tar.gz.delta differ diff --git a/pyosmium_2.7.1.orig.tar.gz.id b/pyosmium_2.7.1.orig.tar.gz.id new file mode 100644 index 000..8a09eca --- /dev/null +++ b/pyosmium_2.7.1.orig.tar.gz.id @@ -0,0 +1 @@ +33096bf1ab22f931280d5dcc118fd0bf760d84f7 -- 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
[pyosmium] 08/08: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit d123b7a2527674ae2f95060e5f9acc0e2d3494dc Author: Bas CouwenbergDate: Wed Jun 1 17:19:54 2016 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ecd1092..973d339 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -pyosmium (2.7.1-1) UNRELEASED; urgency=medium +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 Wed, 01 Jun 2016 13:44:12 +0200 + -- Bas Couwenberg Wed, 01 Jun 2016 17:19:44 +0200 pyosmium (2.6.0-2) unstable; urgency=medium -- 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
[pyosmium] 01/08: Update watch file to handle more tag conventions in filenamemangle.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit fa820d20005dd2de273f7b1ed3845dd42c73ac90 Author: Bas CouwenbergDate: Wed Jun 1 13:43:33 2016 +0200 Update watch file to handle more tag conventions in filenamemangle. --- debian/changelog | 6 ++ debian/watch | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4f56e0c..2211a04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyosmium (2.6.0-3) UNRELEASED; urgency=medium + + * Update watch file to handle more tag conventions in filenamemangle. + + -- Bas Couwenberg Wed, 01 Jun 2016 13:43:27 +0200 + pyosmium (2.6.0-2) unstable; urgency=medium * Bump Standards-Version to 3.9.8, no changes. diff --git a/debian/watch b/debian/watch index 4593cff..08a8cfc 100644 --- a/debian/watch +++ b/debian/watch @@ -2,6 +2,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\.]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/pyosmium-$1.$2/ \ +filenamemangle=s/(?:.*\/)?(?:rel|v|pyosmium)[\-\_]?(\d[\d\-\.]+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/pyosmium-$1.$2/ \ https://github.com/osmcode/pyosmium/releases \ (?:.*/)?(?:rel|v|pyosmium)[\-\_]?(\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/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
[pyosmium] branch master updated (1f09872 -> d123b7a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository pyosmium. from 1f09872 Set distribution to unstable. new fa820d2 Update watch file to handle more tag conventions in filenamemangle. new 54e7a8c Imported Upstream version 2.7.1 new a78ba69 Merge tag 'upstream/2.7.1' new b286953 New upstream release. new 9e01380 Bump minimum required libosmium2-dev to 2.7.1. new 7f34d07 Drop allows-to-typo.patch, applied upstream. new ca66c29 Update lintian overrides for replication library. new d123b7a Set distribution to unstable. 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: .travis.yml| 21 ++ CHANGELOG.md | 16 +- debian/changelog | 9 + debian/control | 2 +- debian/patches/allows-to-typo.patch| 14 -- debian/patches/series | 1 - debian/python-pyosmium.lintian-overrides | 1 + debian/python3-pyosmium.lintian-overrides | 1 + debian/watch | 2 +- doc/conf.py| 4 +- examples/filter_coastlines.py | 2 +- ...{osm_diff_stats.py => osm_replication_stats.py} | 24 ++- examples/{osm_file_stats.py => osm_url_stats.py} | 14 +- 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 +- 21 files changed, 469 insertions(+), 40 deletions(-) delete mode 100644 debian/patches/allows-to-typo.patch delete mode 100644 debian/patches/series copy examples/{osm_diff_stats.py => osm_replication_stats.py} (58%) copy examples/{osm_file_stats.py => osm_url_stats.py} (65%) create mode 100644 lib/merged_input.hpp create mode 100644 lib/replication.cc create mode 100644 osmium/replication/__init__.py create mode 100644 osmium/replication/server.py -- 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
[pyosmium] 04/08: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit b2869532e7e488b79ce0595c08ad56d880fff192 Author: Bas CouwenbergDate: Wed Jun 1 13:44:23 2016 +0200 New upstream release. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2211a04..d323472 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -pyosmium (2.6.0-3) UNRELEASED; urgency=medium +pyosmium (2.7.1-1) UNRELEASED; urgency=medium + * New upstream release. * Update watch file to handle more tag conventions in filenamemangle. - -- Bas Couwenberg Wed, 01 Jun 2016 13:43:27 +0200 + -- Bas Couwenberg Wed, 01 Jun 2016 13:44:12 +0200 pyosmium (2.6.0-2) unstable; urgency=medium -- 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
[pyosmium] 02/08: Imported Upstream version 2.7.1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit 54e7a8caad772f5c46d3725c2bf05e0c998f9a3d Author: Bas CouwenbergDate: Wed Jun 1 13:44:03 2016 +0200 Imported Upstream version 2.7.1 --- .travis.yml | 21 CHANGELOG.md | 16 ++- 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 +- 14 files changed, 541 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37dda0a..4535dbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,22 @@ matrix: - os: linux compiler: gcc env: USE_PYTHON_VERSION=3 +- os: osx + osx_image: xcode6.4 + compiler: clang + env: USE_PYTHON_VERSION=2 PYTHON_SUFFIX= BOOST_PYTHON_OPTION= +- os: osx + osx_image: xcode6.4 + compiler: clang + env: USE_PYTHON_VERSION=3 PYTHON_SUFFIX=3 BOOST_PYTHON_OPTION="--with-python3 --without-python" +- os: osx + osx_image: xcode7 + compiler: clang + env: USE_PYTHON_VERSION=2 PYTHON_SUFFIX= BOOST_PYTHON_OPTION= +- os: osx + osx_image: xcode7 + compiler: clang + env: USE_PYTHON_VERSION=3 PYTHON_SUFFIX=3 BOOST_PYTHON_OPTION="--with-python3 --without-python" # http://docs.travis-ci.com/user/apt/ addons: @@ -42,6 +58,11 @@ addons: install: - git clone --quiet --depth 1 https://github.com/osmcode/libosmium.git ../libosmium +- if [ "$TRAVIS_OS_NAME" = 'osx' ]; then + brew install python$PYTHON_SUFFIX google-sparsehash; + brew install boost-python $BOOST_PYTHON_OPTION; + pip$PYTHON_SUFFIX install -q nose; + fi script: - if [ "${CXX}" = 'g++' ]; then diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c82122..400a09f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,19 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +## [2.7.1] - 2016-06-01 + +### Added + +- `apply_buffer()` for handling in-memory data +- MergeInputReader for reading and sorting multiple input files +- Functions using replication change files to update an OSM file or database. + +### Changed + +- Use current libosmium + + ## [2.6.0] - 2016-02-04 ### Added @@ -66,7 +79,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Exception not caught in test. -[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.6.0...HEAD +[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.7.1...HEAD +[2.7.1]: https://github.com/osmcode/pyosmium/compare/v2.6.0...v2.7.1 [2.6.0]: https://github.com/osmcode/pyosmium/compare/v2.5.4...v2.6.0 [2.5.4]: https://github.com/osmcode/pyosmium/compare/v2.5.3...v2.5.4 [2.5.3]: https://github.com/osmcode/pyosmium/compare/v2.4.1...v2.5.3 diff --git a/doc/conf.py b/doc/conf.py index f100bbc..73e23b2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -63,9 +63,9 @@ copyright = '2015-2016, Sarah Hoffmann' # built documents. # # The short X.Y version. -version = '2.6' +version = '2.7' # The full version, including alpha/beta/rc tags. -release = '2.6.0' +release = '2.7.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/examples/filter_coastlines.py b/examples/filter_coastlines.py index ced0ce3..4fda1d7 100644 --- a/examples/filter_coastlines.py +++ b/examples/filter_coastlines.py @@ -46,7 +46,7 @@ if __name__ == '__main__': # go through the ways to find all relevant nodes -ways = WayFilter(writer) +ways = WayFilter() ways.apply_file(sys.argv[1]) # go through the file again and write out the data diff --git a/examples/osm_replication_stats.py b/examples/osm_replication_stats.py new file mode 100644 index 000..00edc33 --- /dev/null +++ b/examples/osm_replication_stats.py @@ -0,0 +1,72 @@ +""" +Simple example that counts the number of changes on a replication server +starting from a given timestamp for a maximum of n hours. + +Shows how to detect the different kind of modifications. +""" +import osmium as o +import sys +import datetime as dt +import osmium.replication.server as rserv + +class Stats(object): + +def __init__(self): +self.added = 0 +self.modified = 0 +self.deleted = 0 + +def add(self, o): +
[pyosmium] 03/08: Merge tag 'upstream/2.7.1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit a78ba694a92c57e58e43eb84469440a0631bf4c5 Merge: fa820d2 54e7a8c Author: Bas CouwenbergDate: Wed Jun 1 13:44:04 2016 +0200 Merge tag 'upstream/2.7.1' Upstream version 2.7.1 .travis.yml | 21 CHANGELOG.md | 16 ++- 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 +- 14 files changed, 541 insertions(+), 13 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
Processing of libosmium_2.7.1-1_amd64.changes
libosmium_2.7.1-1_amd64.changes uploaded successfully to localhost along with the files: libosmium_2.7.1-1.dsc libosmium_2.7.1.orig.tar.gz libosmium_2.7.1-1.debian.tar.xz libosmium2-dev_2.7.1-1_amd64.deb libosmium2-doc_2.7.1-1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ 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] tag debian/2.7.1-1 created (now cf1d9eb)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.7.1-1 in repository libosmium. at cf1d9eb (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/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/02: pristine-tar data for libosmium_2.7.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 dc4905cde03473e265254a725c60b9e011c495e8 Author: Bas CouwenbergDate: Wed Jun 1 13:32:10 2016 +0200 pristine-tar data for libosmium_2.7.0.orig.tar.gz --- libosmium_2.7.0.orig.tar.gz.delta | Bin 0 -> 13238 bytes libosmium_2.7.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libosmium_2.7.0.orig.tar.gz.delta b/libosmium_2.7.0.orig.tar.gz.delta new file mode 100644 index 000..eb00b34 Binary files /dev/null and b/libosmium_2.7.0.orig.tar.gz.delta differ diff --git a/libosmium_2.7.0.orig.tar.gz.id b/libosmium_2.7.0.orig.tar.gz.id new file mode 100644 index 000..45592f1 --- /dev/null +++ b/libosmium_2.7.0.orig.tar.gz.id @@ -0,0 +1 @@ +b6caae7a831368ed000ffbe82d421d7fb3a947e9 -- 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/06: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 9c03aa3c28532780513340687038d24d1e133e3f Author: Bas CouwenbergDate: Wed Jun 1 13:32:37 2016 +0200 New upstream release. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 75aad61..ac238c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -libosmium (2.6.1-2) UNRELEASED; urgency=medium +libosmium (2.7.1-1) UNRELEASED; urgency=medium + * New upstream release. * Bump Standards-Version to 3.9.8, no changes. - -- Bas Couwenberg Sun, 17 Apr 2016 16:53:17 +0200 + -- Bas Couwenberg Wed, 01 Jun 2016 13:32:23 +0200 libosmium (2.6.1-1) unstable; urgency=medium -- 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/02: pristine-tar data for libosmium_2.7.1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libosmium. commit 8cbd0b4a5abd4c5efe7c39a6f09d5802a3d5d7b0 Author: Bas CouwenbergDate: Wed Jun 1 13:32:18 2016 +0200 pristine-tar data for libosmium_2.7.1.orig.tar.gz --- libosmium_2.7.1.orig.tar.gz.delta | Bin 0 -> 12860 bytes libosmium_2.7.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libosmium_2.7.1.orig.tar.gz.delta b/libosmium_2.7.1.orig.tar.gz.delta new file mode 100644 index 000..96b1c4c Binary files /dev/null and b/libosmium_2.7.1.orig.tar.gz.delta differ diff --git a/libosmium_2.7.1.orig.tar.gz.id b/libosmium_2.7.1.orig.tar.gz.id new file mode 100644 index 000..801831e --- /dev/null +++ b/libosmium_2.7.1.orig.tar.gz.id @@ -0,0 +1 @@ +2ef7da764f0dbe4051aba2a85105a249dbc59370 -- 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 (e770995 -> 4f7a594)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository libosmium. from e770995 Imported Upstream version 2.6.1 new 5a6d9f8 Imported Upstream version 2.7.0 new 4f7a594 Imported Upstream version 2.7.1 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: .travis.yml|3 +- CHANGELOG.md | 54 +- CMakeLists.txt |2 +- include/gdalcpp.hpp| 91 +- include/osmium/area/assembler.hpp | 1530 +++- include/osmium/area/detail/node_ref_segment.hpp| 309 ++-- include/osmium/area/detail/proto_ring.hpp | 235 ++- include/osmium/area/detail/segment_list.hpp| 164 ++- include/osmium/area/detail/vector.hpp | 120 ++ include/osmium/area/multipolygon_collector.hpp | 26 +- include/osmium/area/problem_reporter.hpp | 76 +- include/osmium/area/problem_reporter_exception.hpp | 30 +- include/osmium/area/problem_reporter_ogr.hpp | 143 +- include/osmium/area/problem_reporter_stream.hpp| 33 +- include/osmium/area/stats.hpp | 128 ++ include/osmium/builder/osm_object_builder.hpp | 12 +- include/osmium/diff_iterator.hpp |8 +- include/osmium/dynamic_handler.hpp |2 +- include/osmium/geom/factory.hpp| 18 +- include/osmium/geom/geojson.hpp| 10 +- include/osmium/geom/geos.hpp | 10 +- include/osmium/geom/ogr.hpp| 35 +- include/osmium/geom/rapid_geojson.hpp | 10 +- include/osmium/geom/wkb.hpp| 13 +- include/osmium/geom/wkt.hpp| 10 +- include/osmium/handler/chain.hpp |2 +- include/osmium/handler/disk_store.hpp |2 +- include/osmium/handler/node_locations_for_ways.hpp | 16 +- include/osmium/handler/object_relations.hpp|2 +- include/osmium/index/detail/mmap_vector_base.hpp | 31 +- include/osmium/index/detail/mmap_vector_file.hpp | 17 +- include/osmium/index/detail/vector_map.hpp | 16 +- include/osmium/index/detail/vector_multimap.hpp|8 +- include/osmium/index/map.hpp | 12 +- include/osmium/index/map/sparse_mem_map.hpp|2 +- include/osmium/index/multimap.hpp |8 +- include/osmium/index/multimap/hybrid.hpp | 14 +- .../osmium/index/multimap/sparse_mem_multimap.hpp | 11 +- include/osmium/io/compression.hpp | 14 +- include/osmium/io/detail/debug_output_format.hpp | 38 + include/osmium/io/detail/input_format.hpp | 14 +- include/osmium/io/detail/opl_output_format.hpp | 38 +- include/osmium/io/detail/output_format.hpp |4 +- include/osmium/io/detail/pbf_decoder.hpp | 24 +- include/osmium/io/detail/pbf_output_format.hpp | 35 +- include/osmium/io/detail/protobuf_tags.hpp |4 +- include/osmium/io/detail/queue_util.hpp| 19 +- include/osmium/io/detail/string_table.hpp | 13 +- include/osmium/io/detail/xml_input_format.hpp | 126 +- include/osmium/io/detail/xml_output_format.hpp | 30 +- include/osmium/io/input_iterator.hpp | 20 +- include/osmium/io/output_iterator.hpp |8 +- include/osmium/memory/buffer.hpp | 10 + include/osmium/memory/collection.hpp | 16 +- include/osmium/memory/item.hpp |2 +- include/osmium/memory/item_iterator.hpp| 110 +- include/osmium/object_pointer_collection.hpp |4 +- include/osmium/osm/area.hpp| 33 +- include/osmium/osm/changeset.hpp | 18 +- include/osmium/osm/crc.hpp |1 + include/osmium/osm/entity_bits.hpp | 18 +- include/osmium/osm/location.hpp| 42 +- include/osmium/osm/object.hpp | 68 +- include/osmium/osm/object_comparisons.hpp | 26 +- include/osmium/osm/relation.hpp|2 +- include/osmium/osm/tag.hpp | 59 +- include/osmium/osm/types.hpp | 20 +- include/osmium/osm/types_from_string.hpp | 18 +- include/osmium/relations/collector.hpp | 32 +- include/osmium/relations/detail/member_meta.hpp|2 +- include/osmium/relations/detail/relation_meta.hpp |4 +-
[libosmium] annotated tag upstream/2.7.1 created (now 8a26807)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.7.1 in repository libosmium. at 8a26807 (tag) tagging 4f7a5944ad02694e8af50801d8221486e2081938 (commit) replaces upstream/2.7.0 tagged by Bas Couwenberg on Wed Jun 1 13:32:18 2016 +0200 - Log - Upstream version 2.7.1 Bas Couwenberg (1): Imported Upstream version 2.7.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] branch pristine-tar updated (f167ae3 -> 8cbd0b4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository libosmium. from f167ae3 pristine-tar data for libosmium_2.6.1.orig.tar.gz new dc4905c pristine-tar data for libosmium_2.7.0.orig.tar.gz new 8cbd0b4 pristine-tar data for libosmium_2.7.1.orig.tar.gz 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: libosmium_2.7.0.orig.tar.gz.delta | Bin 0 -> 13238 bytes libosmium_2.7.0.orig.tar.gz.id| 1 + libosmium_2.7.1.orig.tar.gz.delta | Bin 0 -> 12860 bytes libosmium_2.7.1.orig.tar.gz.id| 1 + 4 files changed, 2 insertions(+) create mode 100644 libosmium_2.7.0.orig.tar.gz.delta create mode 100644 libosmium_2.7.0.orig.tar.gz.id create mode 100644 libosmium_2.7.1.orig.tar.gz.delta create mode 100644 libosmium_2.7.1.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] annotated tag upstream/2.7.0 created (now ead9a68)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.7.0 in repository libosmium. at ead9a68 (tag) tagging 5a6d9f85bb898ee2ac047ec8732477b15d75fbb9 (commit) replaces upstream/2.6.1 tagged by Bas Couwenberg on Wed Jun 1 13:32:10 2016 +0200 - Log - Upstream version 2.7.0 Bas Couwenberg (1): Imported Upstream version 2.7.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] 06/06: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit cf1d9eb65280a2bc4ecc15c84e57a0a2fd3bc1fc Author: Bas CouwenbergDate: Wed Jun 1 17:09:27 2016 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e39832..a67cfba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libosmium (2.7.1-1) UNRELEASED; urgency=medium +libosmium (2.7.1-1) unstable; urgency=medium * New upstream release. * Bump Standards-Version to 3.9.8, no changes. * Update watch file to handle more tag conventions in filenamemangle. - -- Bas Couwenberg Wed, 01 Jun 2016 13:32:23 +0200 + -- Bas Couwenberg Wed, 01 Jun 2016 17:09:14 +0200 libosmium (2.6.1-1) unstable; urgency=medium -- 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/06: Merge tag 'upstream/2.7.1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 2d42d2016fed9259ff98e6ca5b531bd9db9f5a63 Merge: 768b40c 4f7a594 Author: Bas CouwenbergDate: Wed Jun 1 13:32:18 2016 +0200 Merge tag 'upstream/2.7.1' Upstream version 2.7.1 .travis.yml|3 +- CHANGELOG.md | 54 +- CMakeLists.txt |2 +- include/gdalcpp.hpp| 91 +- include/osmium/area/assembler.hpp | 1530 +++- include/osmium/area/detail/node_ref_segment.hpp| 309 ++-- include/osmium/area/detail/proto_ring.hpp | 235 ++- include/osmium/area/detail/segment_list.hpp| 164 ++- include/osmium/area/detail/vector.hpp | 120 ++ include/osmium/area/multipolygon_collector.hpp | 26 +- include/osmium/area/problem_reporter.hpp | 76 +- include/osmium/area/problem_reporter_exception.hpp | 30 +- include/osmium/area/problem_reporter_ogr.hpp | 143 +- include/osmium/area/problem_reporter_stream.hpp| 33 +- include/osmium/area/stats.hpp | 128 ++ include/osmium/builder/osm_object_builder.hpp | 12 +- include/osmium/diff_iterator.hpp |8 +- include/osmium/dynamic_handler.hpp |2 +- include/osmium/geom/factory.hpp| 18 +- include/osmium/geom/geojson.hpp| 10 +- include/osmium/geom/geos.hpp | 10 +- include/osmium/geom/ogr.hpp| 35 +- include/osmium/geom/rapid_geojson.hpp | 10 +- include/osmium/geom/wkb.hpp| 13 +- include/osmium/geom/wkt.hpp| 10 +- include/osmium/handler/chain.hpp |2 +- include/osmium/handler/disk_store.hpp |2 +- include/osmium/handler/node_locations_for_ways.hpp | 16 +- include/osmium/handler/object_relations.hpp|2 +- include/osmium/index/detail/mmap_vector_base.hpp | 31 +- include/osmium/index/detail/mmap_vector_file.hpp | 17 +- include/osmium/index/detail/vector_map.hpp | 16 +- include/osmium/index/detail/vector_multimap.hpp|8 +- include/osmium/index/map.hpp | 12 +- include/osmium/index/map/sparse_mem_map.hpp|2 +- include/osmium/index/multimap.hpp |8 +- include/osmium/index/multimap/hybrid.hpp | 14 +- .../osmium/index/multimap/sparse_mem_multimap.hpp | 11 +- include/osmium/io/compression.hpp | 14 +- include/osmium/io/detail/debug_output_format.hpp | 38 + include/osmium/io/detail/input_format.hpp | 14 +- include/osmium/io/detail/opl_output_format.hpp | 38 +- include/osmium/io/detail/output_format.hpp |4 +- include/osmium/io/detail/pbf_decoder.hpp | 24 +- include/osmium/io/detail/pbf_output_format.hpp | 35 +- include/osmium/io/detail/protobuf_tags.hpp |4 +- include/osmium/io/detail/queue_util.hpp| 19 +- include/osmium/io/detail/string_table.hpp | 13 +- include/osmium/io/detail/xml_input_format.hpp | 126 +- include/osmium/io/detail/xml_output_format.hpp | 30 +- include/osmium/io/input_iterator.hpp | 20 +- include/osmium/io/output_iterator.hpp |8 +- include/osmium/memory/buffer.hpp | 10 + include/osmium/memory/collection.hpp | 16 +- include/osmium/memory/item.hpp |2 +- include/osmium/memory/item_iterator.hpp| 110 +- include/osmium/object_pointer_collection.hpp |4 +- include/osmium/osm/area.hpp| 33 +- include/osmium/osm/changeset.hpp | 18 +- include/osmium/osm/crc.hpp |1 + include/osmium/osm/entity_bits.hpp | 18 +- include/osmium/osm/location.hpp| 42 +- include/osmium/osm/object.hpp | 68 +- include/osmium/osm/object_comparisons.hpp | 26 +- include/osmium/osm/relation.hpp|2 +- include/osmium/osm/tag.hpp | 59 +- include/osmium/osm/types.hpp | 20 +- include/osmium/osm/types_from_string.hpp | 18 +- include/osmium/relations/collector.hpp | 32 +- include/osmium/relations/detail/member_meta.hpp|2 +- include/osmium/relations/detail/relation_meta.hpp |4 +- include/osmium/tags/filter.hpp | 18 +- include/osmium/tags/regex_filter.hpp |2 +- include/osmium/thread/pool.hpp |4 +-
[libosmium] 05/06: Update watch file to handle more tag conventions in filenamemangle.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 55920541861a17e678a175073aee7de244824200 Author: Bas CouwenbergDate: Wed Jun 1 13:42:12 2016 +0200 Update watch file to handle more tag conventions in filenamemangle. --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ac238c2..3e39832 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libosmium (2.7.1-1) UNRELEASED; urgency=medium * New upstream release. * Bump Standards-Version to 3.9.8, no changes. + * Update watch file to handle more tag conventions in filenamemangle. -- Bas Couwenberg Wed, 01 Jun 2016 13:32:23 +0200 diff --git a/debian/watch b/debian/watch index 4bccfd3..f172b18 100644 --- a/debian/watch +++ b/debian/watch @@ -2,6 +2,6 @@ version=3 opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\ -filenamemangle=s/(?:.*)?v(\d[\d\.]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/libosmium-$1.$2/ \ +filenamemangle=s/(?:.*\/)?(?:rel|v|libosmium)[\-\_]?(\d[\d\-\.]+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/libosmium-$1.$2/ \ 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] 02/06: Imported Upstream version 2.7.1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit 4f7a5944ad02694e8af50801d8221486e2081938 Author: Bas CouwenbergDate: Wed Jun 1 13:32:17 2016 +0200 Imported Upstream version 2.7.1 --- CHANGELOG.md | 7 +++ CMakeLists.txt | 2 +- include/osmium/version.hpp | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d60b548..cd9a861 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,13 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +## [2.7.1] - 2016-06-01 + +### Fixes + +- Update version number in version.hpp. + + ## [2.7.0] - 2016-06-01 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f74fab..7434fb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ project(libosmium) set(LIBOSMIUM_VERSION_MAJOR 2) set(LIBOSMIUM_VERSION_MINOR 7) -set(LIBOSMIUM_VERSION_PATCH 0) +set(LIBOSMIUM_VERSION_PATCH 1) set(LIBOSMIUM_VERSION "${LIBOSMIUM_VERSION_MAJOR}.${LIBOSMIUM_VERSION_MINOR}.${LIBOSMIUM_VERSION_PATCH}") diff --git a/include/osmium/version.hpp b/include/osmium/version.hpp index ac2765c..a0851f1 100644 --- a/include/osmium/version.hpp +++ b/include/osmium/version.hpp @@ -34,9 +34,9 @@ DEALINGS IN THE SOFTWARE. */ #define LIBOSMIUM_VERSION_MAJOR 2 -#define LIBOSMIUM_VERSION_MINOR 6 +#define LIBOSMIUM_VERSION_MINOR 7 #define LIBOSMIUM_VERSION_PATCH 1 -#define LIBOSMIUM_VERSION_STRING "2.6.1" +#define LIBOSMIUM_VERSION_STRING "2.7.1" #endif // OSMIUM_VERSION_HPP -- 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 (768b40c -> cf1d9eb)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository libosmium. from 768b40c Bump Standards-Version to 3.9.8, no changes. new 5a6d9f8 Imported Upstream version 2.7.0 new 4f7a594 Imported Upstream version 2.7.1 new 2d42d20 Merge tag 'upstream/2.7.1' new 9c03aa3 New upstream release. new 5592054 Update watch file to handle more tag conventions in filenamemangle. new cf1d9eb Set distribution to unstable. The 6 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: .travis.yml|3 +- CHANGELOG.md | 54 +- CMakeLists.txt |2 +- debian/changelog |6 +- debian/watch |2 +- include/gdalcpp.hpp| 91 +- include/osmium/area/assembler.hpp | 1530 +++- include/osmium/area/detail/node_ref_segment.hpp| 309 ++-- include/osmium/area/detail/proto_ring.hpp | 235 ++- include/osmium/area/detail/segment_list.hpp| 164 ++- include/osmium/area/detail/vector.hpp | 120 ++ include/osmium/area/multipolygon_collector.hpp | 26 +- include/osmium/area/problem_reporter.hpp | 76 +- include/osmium/area/problem_reporter_exception.hpp | 30 +- include/osmium/area/problem_reporter_ogr.hpp | 143 +- include/osmium/area/problem_reporter_stream.hpp| 33 +- include/osmium/area/stats.hpp | 128 ++ include/osmium/builder/osm_object_builder.hpp | 12 +- include/osmium/diff_iterator.hpp |8 +- include/osmium/dynamic_handler.hpp |2 +- include/osmium/geom/factory.hpp| 18 +- include/osmium/geom/geojson.hpp| 10 +- include/osmium/geom/geos.hpp | 10 +- include/osmium/geom/ogr.hpp| 35 +- include/osmium/geom/rapid_geojson.hpp | 10 +- include/osmium/geom/wkb.hpp| 13 +- include/osmium/geom/wkt.hpp| 10 +- include/osmium/handler/chain.hpp |2 +- include/osmium/handler/disk_store.hpp |2 +- include/osmium/handler/node_locations_for_ways.hpp | 16 +- include/osmium/handler/object_relations.hpp|2 +- include/osmium/index/detail/mmap_vector_base.hpp | 31 +- include/osmium/index/detail/mmap_vector_file.hpp | 17 +- include/osmium/index/detail/vector_map.hpp | 16 +- include/osmium/index/detail/vector_multimap.hpp|8 +- include/osmium/index/map.hpp | 12 +- include/osmium/index/map/sparse_mem_map.hpp|2 +- include/osmium/index/multimap.hpp |8 +- include/osmium/index/multimap/hybrid.hpp | 14 +- .../osmium/index/multimap/sparse_mem_multimap.hpp | 11 +- include/osmium/io/compression.hpp | 14 +- include/osmium/io/detail/debug_output_format.hpp | 38 + include/osmium/io/detail/input_format.hpp | 14 +- include/osmium/io/detail/opl_output_format.hpp | 38 +- include/osmium/io/detail/output_format.hpp |4 +- include/osmium/io/detail/pbf_decoder.hpp | 24 +- include/osmium/io/detail/pbf_output_format.hpp | 35 +- include/osmium/io/detail/protobuf_tags.hpp |4 +- include/osmium/io/detail/queue_util.hpp| 19 +- include/osmium/io/detail/string_table.hpp | 13 +- include/osmium/io/detail/xml_input_format.hpp | 126 +- include/osmium/io/detail/xml_output_format.hpp | 30 +- include/osmium/io/input_iterator.hpp | 20 +- include/osmium/io/output_iterator.hpp |8 +- include/osmium/memory/buffer.hpp | 10 + include/osmium/memory/collection.hpp | 16 +- include/osmium/memory/item.hpp |2 +- include/osmium/memory/item_iterator.hpp| 110 +- include/osmium/object_pointer_collection.hpp |4 +- include/osmium/osm/area.hpp| 33 +- include/osmium/osm/changeset.hpp | 18 +- include/osmium/osm/crc.hpp |1 + include/osmium/osm/entity_bits.hpp | 18 +- include/osmium/osm/location.hpp| 42 +- include/osmium/osm/object.hpp | 68 +- include/osmium/osm/object_comparisons.hpp | 26 +- include/osmium/osm/relation.hpp|2 +-
nik4_1.6-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 01 Jun 2016 10:34:00 +0200 Source: nik4 Binary: nik4 Architecture: source amd64 Version: 1.6-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: nik4 - Mapnik to image export Changes: nik4 (1.6-1) unstable; urgency=medium . * New upstream release. * Drop python3.patch, applied upstream. Checksums-Sha1: bd8a3dda59f26e7c8205c12127d238f21b2c9f13 1927 nik4_1.6-1.dsc dfa0de890f0b883b0a851748f3a8021d7544c2bb 581855 nik4_1.6.orig.tar.gz 05b7436a1729d5691b17b85422ec0376395f2f73 6544 nik4_1.6-1.debian.tar.xz c4a8fba1d24b713898132a26dce3f4d617b7eb9c 583384 nik4_1.6-1_amd64.deb Checksums-Sha256: 5b045a7d1adededa56538663cf98ee090aec126012ed78bb6c1558ad7ffb08bd 1927 nik4_1.6-1.dsc 6f912cfc8f627b79aa8464d2859992012aa2323982fb12a10339f42facb555d1 581855 nik4_1.6.orig.tar.gz b1b6536bc09ed8d79c4f207c009c275f81b41d494f2fde0f0545ec32090a43ec 6544 nik4_1.6-1.debian.tar.xz c0c9f15c0c1c8ff328ca03a32bf55869272608557a1526ed8a548f8027aea5db 583384 nik4_1.6-1_amd64.deb Files: 8fadc8c986738e01a391b250952db5ff 1927 utils optional nik4_1.6-1.dsc 9f18c68ec44865ad54ff2a93d4b1872b 581855 utils optional nik4_1.6.orig.tar.gz 9c61ac7b59b3e286a252507ecc8bb246 6544 utils optional nik4_1.6-1.debian.tar.xz cb129f0f3a29b4c69291b5e20c777801 583384 utils optional nik4_1.6-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXTp+NAAoJEGdQ8QrojUrxDcgP/RG8BJZrOcV1Z/4SReE+SY7z quoN1+XiLAwyo1tsFi1UouL8PjICp6X3KuZCwyF37rOETM0iPxnq7L0j7EZW5G1Q I3MOC3coAe2tz0eOnQJLOewlWDX8/Ujm+waksEy1cB4v/FpYJcsjdC5KUdMh37JB Mg3AftfYhNG8o4cCw6PBTgic8mEUKtY+ghML9RMAh7VTINsWmhathCYSILI5iAMo KWUOKh/2g7REVPmJgUJydp9FNoLbmm/nlEyAtuSDwuW2+eQbI5J21Cc5yfZPVX8R S6zHirVv+KozA4qCURRME3aXlrVHCJdHUd6rdiQzOTq+WbA+pQz6ZXZPNyESCfPm nHarwA+tix29geAi1S537oHwxywvUkgMhq6W2pzbC24//zEyVJmIGxAzw1rkkV+x w94cqSyEv1otsANHFh1SHxmmhU8s8c0l5M3Ts/F51lWtwHOqZTrTQxlM21DwfUcZ JHS1aYLSh88brevmgmDcDwimgcB7KLThGBLLxuzkqLi6XIBxGnTvrVI/CsSArmXt O5K9Aqsnr25mcw54nQPXTgYR0uI4Vofss/gTid1m1AVHXtD13WeE/fNwvuk+GH43 C3JU8Y5cdJUQPM56KKfFcWm4rIDrCxghB4Trb3oOIJpi9NtcYZhZH8xsiWKSfSoS rkB2u/P4SzHokP/gCaOk =Fd1t -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of nik4_1.6-1_amd64.changes
nik4_1.6-1_amd64.changes uploaded successfully to localhost along with the files: nik4_1.6-1.dsc nik4_1.6.orig.tar.gz nik4_1.6-1.debian.tar.xz nik4_1.6-1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[nik4] annotated tag upstream/1.6 created (now 993da31)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.6 in repository nik4. at 993da31 (tag) tagging bb3b900c6006eff02a44cc808b68cbe0991c959e (commit) replaces upstream/1.5.2 tagged by Bas Couwenberg on Wed Jun 1 10:32:31 2016 +0200 - Log - Upstream version 1.6 Bas Couwenberg (1): Imported Upstream version 1.6 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] tag debian/1.6-1 created (now 7642d06)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.6-1 in repository nik4. at 7642d06 (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/nik4.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
[nik4] 01/01: pristine-tar data for nik4_1.6.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 nik4. commit 8c8f1cfe132f19915167d1274cf56fdeb0940b1d Author: Bas CouwenbergDate: Wed Jun 1 10:32:31 2016 +0200 pristine-tar data for nik4_1.6.orig.tar.gz --- nik4_1.6.orig.tar.gz.delta | Bin 0 -> 1135 bytes nik4_1.6.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/nik4_1.6.orig.tar.gz.delta b/nik4_1.6.orig.tar.gz.delta new file mode 100644 index 000..8dd5eec Binary files /dev/null and b/nik4_1.6.orig.tar.gz.delta differ diff --git a/nik4_1.6.orig.tar.gz.id b/nik4_1.6.orig.tar.gz.id new file mode 100644 index 000..919bb0d --- /dev/null +++ b/nik4_1.6.orig.tar.gz.id @@ -0,0 +1 @@ +8339bd3845e81dc48a5ad94b503dcb69f97a88e0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] branch upstream updated (20c2e8f -> bb3b900)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository nik4. from 20c2e8f Imported Upstream version 1.5.2 new bb3b900 Imported Upstream version 1.6 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: CHANGELOG.md | 3 ++- nik4.py | 22 +++--- setup.py | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] 05/05: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository nik4. commit 7642d06ff0147f4900540be9efc41c3f2e751e9e Author: Bas CouwenbergDate: Wed Jun 1 10:34:16 2016 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7af24ca..07c0831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -nik4 (1.6-1) UNRELEASED; urgency=medium +nik4 (1.6-1) unstable; urgency=medium * New upstream release. * Drop python3.patch, applied upstream. - -- Bas Couwenberg Wed, 01 Jun 2016 10:32:35 +0200 + -- Bas Couwenberg Wed, 01 Jun 2016 10:34:00 +0200 nik4 (1.5.2-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] branch pristine-tar updated (8e7fe69 -> 8c8f1cf)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository nik4. from 8e7fe69 pristine-tar data for nik4_1.5.2.orig.tar.gz new 8c8f1cf pristine-tar data for nik4_1.6.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: nik4_1.6.orig.tar.gz.delta | Bin 0 -> 1135 bytes nik4_1.6.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 nik4_1.6.orig.tar.gz.delta create mode 100644 nik4_1.6.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] 04/05: Drop python3.patch, applied upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository nik4. commit 67c03fa2351dc3e84d2112b570baeb72a0ff48ab Author: Bas CouwenbergDate: Wed Jun 1 10:33:28 2016 +0200 Drop python3.patch, applied upstream. --- debian/changelog | 1 + debian/patches/python3.patch | 50 debian/patches/series| 1 - 3 files changed, 1 insertion(+), 51 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9687f74..7af24ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ nik4 (1.6-1) UNRELEASED; urgency=medium * New upstream release. + * Drop python3.patch, applied upstream. -- Bas Couwenberg Wed, 01 Jun 2016 10:32:35 +0200 diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch deleted file mode 100644 index e9fe942..000 --- a/debian/patches/python3.patch +++ /dev/null @@ -1,50 +0,0 @@ -Description: Add support for Python 3. -Author: Bas Couwenberg -Forwarded: https://github.com/Zverik/Nik4/issues/23 - a/nik4.py -+++ b/nik4.py -@@ -376,12 +376,12 @@ if __name__ == "__main__": - select_layers(m, options.add_layers.split(',') if options.add_layers else [], options.hide_layers.split(',') if options.hide_layers else []) - - if options.debug: -- print 'scale={}'.format(scale) -- print 'scale_factor={}'.format(scale_factor) -- print 'size={},{}'.format(size[0], size[1]) -- print 'bbox={}'.format(bbox) -- print 'bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None) -- print 'layers=' + ','.join([l.name for l in m.layers if l.active]) -+ print('scale={}'.format(scale)) -+ print('scale_factor={}'.format(scale_factor)) -+ print('size={},{}'.format(size[0], size[1])) -+ print('bbox={}'.format(bbox)) -+ print('bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None)) -+ print('layers=' + ','.join([l.name for l in m.layers if l.active])) - - # generate metadata - if options.ozi: -@@ -424,14 +424,14 @@ if __name__ == "__main__": - m.buffer_size = TILE_BUFFER - tile_cnt = [int(math.ceil(1.0 * size[0] / width)), int(math.ceil(1.0 * size[1] / height))] - if options.debug: -- print 'tile_count={},{}'.format(tile_cnt[0], tile_cnt[1]) -- print 'tile_size={},{}'.format(width, height) -+ print('tile_count={},{}'.format(tile_cnt[0], tile_cnt[1])) -+ print('tile_size={},{}'.format(width, height)) - tmp_tile = '{:02d}_{:02d}_{}' - tile_files = [] - for row in range(0, tile_cnt[1]): - for column in range(0, tile_cnt[0]): - if options.debug: -- print 'tile={},{}'.format(row, column) -+ print('tile={},{}'.format(row, column)) - tile_bbox = mapnik.Box2d(bbox.minx + 1.0 * width * scale * column, bbox.maxy - 1.0 * height * scale * row, bbox.minx + 1.0 * width * scale * (column + 1), bbox.maxy - 1.0 * height * scale * (row + 1)) - tile_size = [width if column < tile_cnt[0] - 1 else size[0] - width * (tile_cnt[0] - 1), height if row < tile_cnt[1] - 1 else size[1] - height * (tile_cnt[1] - 1)] - m.zoom_to_box(tile_bbox) -@@ -465,5 +465,5 @@ if __name__ == "__main__": - msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) - - outfile.seek(0) -- print outfile.read() -+ print(outfile.read()) - outfile.close() diff --git a/debian/patches/series b/debian/patches/series index b67d390..6d07762 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -python3.patch nik4.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] 01/05: Imported Upstream version 1.6
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository nik4. commit bb3b900c6006eff02a44cc808b68cbe0991c959e Author: Bas CouwenbergDate: Wed Jun 1 10:32:30 2016 +0200 Imported Upstream version 1.6 --- CHANGELOG.md | 3 ++- nik4.py | 22 +++--- setup.py | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebbadbb..8f627ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # Nik4 Change History -## *master* +## 1.6, 1.06.2016 * `--version` option. * Added `--fonts` option for registering additional fonts. [#16](https://github.com/Zverik/Nik4/issues/16) * Fixed `--center` with `--scale` error. [#18](https://github.com/Zverik/Nik4/issues/18) * Swapped sizes 4A0 and 2A0. [#17](https://github.com/Zverik/Nik4/issues/17) +* Support Python 3. [#23](https://github.com/Zverik/Nik4/issues/23) ## 1.5, 7.12.2014 diff --git a/nik4.py b/nik4.py index 4b8326b..79295c5 100755 --- a/nik4.py +++ b/nik4.py @@ -14,7 +14,7 @@ try: except ImportError: HAS_CAIRO = False -VERSION = '1.5.2' +VERSION = '1.6' TILE_BUFFER = 128 IM_MONTAGE = 'montage' @@ -376,12 +376,12 @@ if __name__ == "__main__": select_layers(m, options.add_layers.split(',') if options.add_layers else [], options.hide_layers.split(',') if options.hide_layers else []) if options.debug: - print 'scale={}'.format(scale) - print 'scale_factor={}'.format(scale_factor) - print 'size={},{}'.format(size[0], size[1]) - print 'bbox={}'.format(bbox) - print 'bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None) - print 'layers=' + ','.join([l.name for l in m.layers if l.active]) + print('scale={}'.format(scale)) + print('scale_factor={}'.format(scale_factor)) + print('size={},{}'.format(size[0], size[1])) + print('bbox={}'.format(bbox)) + print('bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None)) + print('layers=' + ','.join([l.name for l in m.layers if l.active])) # generate metadata if options.ozi: @@ -424,14 +424,14 @@ if __name__ == "__main__": m.buffer_size = TILE_BUFFER tile_cnt = [int(math.ceil(1.0 * size[0] / width)), int(math.ceil(1.0 * size[1] / height))] if options.debug: - print 'tile_count={},{}'.format(tile_cnt[0], tile_cnt[1]) - print 'tile_size={},{}'.format(width, height) + print('tile_count={},{}'.format(tile_cnt[0], tile_cnt[1])) + print('tile_size={},{}'.format(width, height)) tmp_tile = '{:02d}_{:02d}_{}' tile_files = [] for row in range(0, tile_cnt[1]): for column in range(0, tile_cnt[0]): if options.debug: - print 'tile={},{}'.format(row, column) + print('tile={},{}'.format(row, column)) tile_bbox = mapnik.Box2d(bbox.minx + 1.0 * width * scale * column, bbox.maxy - 1.0 * height * scale * row, bbox.minx + 1.0 * width * scale * (column + 1), bbox.maxy - 1.0 * height * scale * (row + 1)) tile_size = [width if column < tile_cnt[0] - 1 else size[0] - width * (tile_cnt[0] - 1), height if row < tile_cnt[1] - 1 else size[1] - height * (tile_cnt[1] - 1)] m.zoom_to_box(tile_bbox) @@ -465,5 +465,5 @@ if __name__ == "__main__": msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) outfile.seek(0) - print outfile.read() + print(outfile.read()) outfile.close() diff --git a/setup.py b/setup.py index 55359cf..9e92e6c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup( name='Nik4', - version='1.5.2', + version='1.6.0', license='WTFPL', description='Command-line interface to a Mapnik rendering toolkit', long_description=""" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] 03/05: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository nik4. commit e6de8be9781e5c384f149851eef09ead1ad687d9 Author: Bas CouwenbergDate: Wed Jun 1 10:32:45 2016 +0200 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 405a3ec..9687f74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nik4 (1.6-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg Wed, 01 Jun 2016 10:32:35 +0200 + nik4 (1.5.2-1) unstable; urgency=medium * Import tagged upstream release. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] 02/05: Merge tag 'upstream/1.6'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository nik4. commit cef1fa672d4d539469b227b554ed57e353a52df1 Merge: e08f65b bb3b900 Author: Bas CouwenbergDate: Wed Jun 1 10:32:31 2016 +0200 Merge tag 'upstream/1.6' Upstream version 1.6 CHANGELOG.md | 3 ++- nik4.py | 22 +++--- setup.py | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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
[nik4] branch master updated (e08f65b -> 7642d06)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository nik4. from e08f65b Set distribution to unstable. new bb3b900 Imported Upstream version 1.6 new cef1fa6 Merge tag 'upstream/1.6' new e6de8be New upstream release. new 67c03fa Drop python3.patch, applied upstream. new 7642d06 Set distribution to unstable. 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: CHANGELOG.md | 3 ++- debian/changelog | 7 +++ debian/patches/python3.patch | 50 debian/patches/series| 1 - nik4.py | 22 +-- setup.py | 2 +- 6 files changed, 21 insertions(+), 64 deletions(-) delete mode 100644 debian/patches/python3.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.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