Bug#790524: src:gmt: takes over files from several unrelated packages (was: Re: gmt: libgenome-perl in sid already provides /usr/bin/gmt)
Hi, Andreas Tille wrote: > I was able to commit[1] a fix for this bug. I'd like to wait for a > confirmation of a Perl Group member whether this is OK for a team upload > or whether this is to less Perl-ish and rather Debian-Med-ish. Maybe that's partially the case... > [1] > https://anonscm.debian.org/cgit/pkg-perl/packages/libgenome-perl.git/commit/?id=205ec3992bde59d9f59870218e68cf9964d60a1a > There's one thing in this commit which I consider quite ugly and unnecessary: A man page being under /usr/lib/debian-med/share/man/man1/gmt.1.gz and then only symlinked to /usr/share/man/man1/genome-model-tools.1.gz. IMHO that's for two reasons: /usr/lib/debian-med/bin/gmt doesn't need a man page from a policy point of view, only /usr/bin/genome-model-tools does. And then there is a never to be found man page under /usr/lib. (A man page under /usr/lib? Come on! That's an FHS violation. Or rather was until Debian weakend it for the systemd guys.) So rather than moving the man page from /usr/share/man/man1/gmt.1.gz to /usr/lib/debian-med/share/man/man1/gmt.1.gz and then symlinking that to /usr/share/man/man1/genome-model-tools.1.gz, I'd just rename /usr/share/man/man1/gmt.1.gz to /usr/share/man/man1/genome-model-tools.1.gz -- Everything else is IMHO unnecessary complexity with horribly non-standard paths. And you would also spare the explicit gzip call and one of the lines in debian/dirs. Additionally there seems trailing whitespace in debian/links, but the affected line will be gone anyways if the above is fixed as suggested. Further there is a change in debian/control which is not mentioned in the changelog entry nor seems to be related to the rest of the commit: A line "Recommends: med-config (>= 2.1)" has been added. Please add at least an according changelog entry for that or remove it again (if it was committed accidentially). Regards, Axel -- ,''`. | Axel Beckert , http://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `-| 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Forwarded upstream
Processing commands for cont...@bugs.debian.org: > forwarded 748680 https://trac.osgeo.org/grass/ticket/2352 Bug #748680 [grass] Conflicting definitions of db__driver_describe_table Set Bug forwarded-to-address to 'https://trac.osgeo.org/grass/ticket/2352'. > thanks Stopping processing here. Please contact me if you need assistance. -- 748680: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748680 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
liblas_1.8.0-3_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 04 Jul 2015 22:42:30 +0200 Source: liblas Binary: liblas3 liblas-c3 liblas-dev liblas-c-dev liblas-bin python-liblas Architecture: source amd64 all Version: 1.8.0-3 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project Changed-By: Bas Couwenberg Description: liblas-bin - ASPRS LiDAR data translation toolset liblas-c-dev - ASPRS LiDAR data translation library - C development files liblas-c3 - ASPRS LiDAR data translation library - C version liblas-dev - ASPRS LiDAR data translation library - C++ development files liblas3- ASPRS LiDAR data translation library - C++ version python-liblas - Python module to use the ASPRS LiDAR data translation library Changes: liblas (1.8.0-3) unstable; urgency=medium . * Fix upstream version extraction from changelog. * Use multi-line uscan options. * Add boost dependencies to liblas-dev. * Also install cmake files in liblas-dev. * Explicitly remove files not be installed. Checksums-Sha1: 400b4780b9035ce31563e1c8f76216598bc5566f 2553 liblas_1.8.0-3.dsc 7a1a7cf6dda1163aa1b375e13c591df94a7d58e4 32300 liblas_1.8.0-3.debian.tar.xz af2bd5af2be23f0c82245da2ee7666d167386f61 315736 liblas-bin_1.8.0-3_amd64.deb 5465f1a7367ee8f84172440301764756534a9ea6 15152 liblas-c-dev_1.8.0-3_amd64.deb f45985ee3178b1cfae2a7d8ea76d0ec3778551a5 74282 liblas-c3_1.8.0-3_amd64.deb 2effb7aa027bcb1a114ecc6e427222a3ecbf5e1e 91702 liblas-dev_1.8.0-3_amd64.deb fccecbfc9ecc6fdb1d57da067f71736a02887624 281548 liblas3_1.8.0-3_amd64.deb 2b23b0c8a21bc0cb4ef2c70937f93a8766a1fd78 38954 python-liblas_1.8.0-3_all.deb Checksums-Sha256: b7d18f8bef84e1401c5099c25d3b6a85e89c94f43406892dd4efd839e7989462 2553 liblas_1.8.0-3.dsc 670d1c15a14fa7a390cc9c1568a011e1b27fbc0173ece2965f0a0a1ed68e10bf 32300 liblas_1.8.0-3.debian.tar.xz fd8cf4e70b066e62161195bd0a9268a8250f598b73c5fcedd4d60e1b616606ef 315736 liblas-bin_1.8.0-3_amd64.deb 07da4300298791de809cbdae57d1cddef0bbc325a25f732df509d59b61f6a4fd 15152 liblas-c-dev_1.8.0-3_amd64.deb 66cd071e55b67dbbaa681467c2d0e54774ea3649cf0072e7d4659fec7195c109 74282 liblas-c3_1.8.0-3_amd64.deb 1db0aec8a08037d6d1f1d32326433e8e0671b1c5712bd3f7ac69feb36c8df8dd 91702 liblas-dev_1.8.0-3_amd64.deb 4b952d7ad5296d9b2eb0cfd3128741cc353e08ece9f50bff70e7abe5710237f4 281548 liblas3_1.8.0-3_amd64.deb 23318e4bb199e9c309c4bb366cc642e032b69da930116f518bd5b2efa199dd36 38954 python-liblas_1.8.0-3_all.deb Files: 897e64d061d024057cfc1d70e016d008 2553 science optional liblas_1.8.0-3.dsc 6afe2ef46b03708b995da65783863f67 32300 science optional liblas_1.8.0-3.debian.tar.xz 22a88e8a4ca313f5eedf893df9955365 315736 science optional liblas-bin_1.8.0-3_amd64.deb 631da231bf8257cd294a3d4b5b92acb8 15152 libdevel optional liblas-c-dev_1.8.0-3_amd64.deb 88f54bb887ae1b12a841251f9861febf 74282 libs optional liblas-c3_1.8.0-3_amd64.deb 282d6514343c88bcbbb5595b8f4f235e 91702 libdevel optional liblas-dev_1.8.0-3_amd64.deb c75582c667ac491ba616259f7fe2bfac 281548 libs optional liblas3_1.8.0-3_amd64.deb 56c99258286df86a6bbecffae7f37cd3 38954 python optional python-liblas_1.8.0-3_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJVmFRBAAoJEGdQ8QrojUrxWTwQAJZ3Vp9ck9E+xgVWZEbJN85t cRRPii+LjvXrEnXOfcUBV2qz8taLaI0qdk/5xBYy8J1HVE3cCZYK2M+lsOaoEc7U 4I63MBPP4X0x2tCxNek8a6bqovrn5hlzwYYIyIBdymAYi+Gml/9UGyrwK5nFJFMc ltL1LB6rRrI69n47cXhKxMYmvU7mSFu+Q5mB89I/lHyrh5nx123vL4TCM4KRdAMH wFi53+CQN9/S5bE6SK91cOcvWERdwuUd8DzqQQkFwLDRmNf6lqYBHHrEM2IyzJIr eozGeFYKLULlKILIas3QAvzAOkKINfLIJR6lGq1I4vWDevWApSPv1Nsl9BHk/gZk S3qKbQISMnWwQ7Gi3HG589IbMwcGAU7qDMvxzQxcIPRFxB5AY1Ov50ST9AA6JIjO 63jOH6vdXhe8rXxJnxwPsm0NpmnjKEDA0damdd7MtWBn5iqRYK9myua2vApUCPwW uUD6FdW/fbeFi6wE40bbITLXcPwVhrVpD9wIDprUEbRYpqwqLjX1o1rSeufKFJVP V6mc17PiYGSv9/2guXlSPfgpMjshU/b8d0ghO+8KTzIa6t7tWqN3aUIuRlIZ3LJ/ xivSbjNpkrNenIVv2EAS/pnmkeF7jUpr7V2BIuKjNZpkaIEo3KTI8QqbCTP9BICM lAxnm7eSxOOxsUh58hXi =Xl6b -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 liblas_1.8.0-3_amd64.changes
liblas_1.8.0-3_amd64.changes uploaded successfully to localhost along with the files: liblas_1.8.0-3.dsc liblas_1.8.0-3.debian.tar.xz liblas-bin_1.8.0-3_amd64.deb liblas-c-dev_1.8.0-3_amd64.deb liblas-c3_1.8.0-3_amd64.deb liblas-dev_1.8.0-3_amd64.deb liblas3_1.8.0-3_amd64.deb python-liblas_1.8.0-3_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
[liblas] 04/10: Append -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS to fix build with GCC 5.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository liblas. commit d15315701de41db13f3d27ebe19e389b4ec37dad Author: Bas Couwenberg Date: Sun Jun 28 00:18:56 2015 +0200 Append -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS to fix build with GCC 5. --- debian/changelog | 7 +++ debian/rules | 3 +++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 72ac22d..13605c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +liblas (1.8.0-3) UNRELEASED; urgency=medium + + * Append -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS to fix build with GCC 5. +(closes: 777955) + + -- Bas Couwenberg Sun, 28 Jun 2015 00:18:19 +0200 + liblas (1.8.0-2) unstable; urgency=medium * Update symbols for: arm64, armel, armhf, hurd-i386, i386, kfreebsd-i386, diff --git a/debian/rules b/debian/rules index e00a28e..b0c0d98 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date MANPAGES:=$(wildcard debian/man/*.*.xml) +#777955: liblas: ftbfs with GCC-5 +CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 + %: dh $@ --buildsystem cmake \ --with python2,pkgkde_symbolshelper \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 05/10: Disable GCC-5 changes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository liblas. commit 64c03f0971c71ca3701b695dd45be4c1f4a8fd46 Author: Bas Couwenberg Date: Sat Jul 4 22:04:35 2015 +0200 Disable GCC-5 changes. --- debian/changelog | 7 --- debian/patches/series | 2 +- debian/rules | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13605c5..72ac22d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -liblas (1.8.0-3) UNRELEASED; urgency=medium - - * Append -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS to fix build with GCC 5. -(closes: 777955) - - -- Bas Couwenberg Sun, 28 Jun 2015 00:18:19 +0200 - liblas (1.8.0-2) unstable; urgency=medium * Update symbols for: arm64, armel, armhf, hurd-i386, i386, kfreebsd-i386, diff --git a/debian/patches/series b/debian/patches/series index e900c05..ab17c1b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ fix_library_search accommodate-typo -disable-bigfile_boost_iostreams_test.patch +#disable-bigfile_boost_iostreams_test.patch diff --git a/debian/rules b/debian/rules index b0c0d98..f0c21ef 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date MANPAGES:=$(wildcard debian/man/*.*.xml) #777955: liblas: ftbfs with GCC-5 -CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 +#CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 %: dh $@ --buildsystem cmake \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 10/10: 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 liblas. commit a5aebc2cee592af3c8d493c5d5151426edc6732d Author: Bas Couwenberg Date: Sat Jul 4 22:45:49 2015 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 50f35d0..1b5d293 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -liblas (1.8.0-3) UNRELEASED; urgency=medium +liblas (1.8.0-3) unstable; urgency=medium * Fix upstream version extraction from changelog. * Use multi-line uscan options. @@ -6,7 +6,7 @@ liblas (1.8.0-3) UNRELEASED; urgency=medium * Also install cmake files in liblas-dev. * Explicitly remove files not be installed. - -- Bas Couwenberg Sat, 04 Jul 2015 22:04:53 +0200 + -- Bas Couwenberg Sat, 04 Jul 2015 22:42:30 +0200 liblas (1.8.0-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] tag debian/1.8.0-3 created (now a5aebc2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.8.0-3 in repository liblas. at a5aebc2 (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/liblas.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
[liblas] 08/10: Also install cmake files in liblas-dev.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository liblas. commit 2036bb7dfd5b9113fa3516cc91a4e1c6240d94aa Author: Bas Couwenberg Date: Sat Jul 4 23:12:29 2015 +0200 Also install cmake files in liblas-dev. --- debian/changelog | 1 + debian/liblas-dev.install | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 25a85c9..8f3fb9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ liblas (1.8.0-3) UNRELEASED; urgency=medium * Fix upstream version extraction from changelog. * Use multi-line uscan options. * Add boost dependencies to liblas-dev. + * Also install cmake files in liblas-dev. -- Bas Couwenberg Sat, 04 Jul 2015 22:04:53 +0200 diff --git a/debian/liblas-dev.install b/debian/liblas-dev.install index f6e8055..88f40e3 100644 --- a/debian/liblas-dev.install +++ b/debian/liblas-dev.install @@ -1,3 +1,4 @@ usr/lib/liblas.so usr/include usr/bin/liblas-config +usr/share/cmake/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 06/10: Add changelog entries for version extraction & uscan changes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository liblas. commit d548129b3bac819d3d9cb230c9008355c720d0ff Author: Bas Couwenberg Date: Sat Jul 4 22:05:48 2015 +0200 Add changelog entries for version extraction & uscan changes. --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 72ac22d..dda9e8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +liblas (1.8.0-3) UNRELEASED; urgency=medium + + * Fix upstream version extraction from changelog. + * Use multi-line uscan options. + + -- Bas Couwenberg Sat, 04 Jul 2015 22:04:53 +0200 + liblas (1.8.0-2) unstable; urgency=medium * Update symbols for: arm64, armel, armhf, hurd-i386, i386, kfreebsd-i386, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 07/10: Add boost dependencies to liblas-dev.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository liblas.
commit 601dc7d32d647ddba8bab110e2da61f849cef99b
Author: Bas Couwenberg
Date: Sat Jul 4 22:10:40 2015 +0200
Add boost dependencies to liblas-dev.
---
debian/changelog | 1 +
debian/control | 7 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index dda9e8c..25a85c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ liblas (1.8.0-3) UNRELEASED; urgency=medium
* Fix upstream version extraction from changelog.
* Use multi-line uscan options.
+ * Add boost dependencies to liblas-dev.
-- Bas Couwenberg Sat, 04 Jul 2015 22:04:53 +0200
diff --git a/debian/control b/debian/control
index 5edf4ff..9f94f97 100644
--- a/debian/control
+++ b/debian/control
@@ -72,9 +72,14 @@ Package: liblas-dev
Architecture: any
Section: libdevel
Depends: liblas3 (= ${binary:Version}),
- libtiff-dev,
libgeotiff-dev,
libgdal-dev (>= 1.10.0~),
+ libtiff-dev,
+ libboost-dev,
+ libboost-filesystem-dev,
+ libboost-iostreams-dev,
+ libboost-program-options-dev,
+ libboost-thread-dev,
${misc:Depends}
Description: ASPRS LiDAR data translation library - C++ development files
libLAS is a C/C++ library for reading and writing ASPRS LAS versions
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 09/10: Explicitly remove files not be installed.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository liblas. commit 56a6f2ee97404a5b126f41879d338b6fda840dd6 Author: Bas Couwenberg Date: Sat Jul 4 23:15:09 2015 +0200 Explicitly remove files not be installed. --- debian/changelog | 1 + debian/rules | 6 ++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8f3fb9d..50f35d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ liblas (1.8.0-3) UNRELEASED; urgency=medium * Use multi-line uscan options. * Add boost dependencies to liblas-dev. * Also install cmake files in liblas-dev. + * Explicitly remove files not be installed. -- Bas Couwenberg Sat, 04 Jul 2015 22:04:53 +0200 diff --git a/debian/rules b/debian/rules index f0c21ef..d65c6a2 100755 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,12 @@ override_dh_auto_install-indep: dh_auto_install --sourcedirectory python --buildsystem pybuild override_dh_install-arch: + $(RM) debian/*/usr/share/liblas/doc/AUTHORS + $(RM) debian/*/usr/share/liblas/doc/COPYING + $(RM) debian/*/usr/share/liblas/doc/INSTALL + $(RM) debian/*/usr/share/liblas/doc/README.txt + $(RM) debian/*/usr/share/liblas/doc/LICENSE.txt + dh_install --arch --list-missing # remove capi from liblas-dev -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 01/10: Use multi-line uscan options.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository liblas. commit e51aa99c1c3da15a997d79aedd56dfaf850f4aea Author: Bas Couwenberg Date: Fri Jun 26 12:59:45 2015 +0200 Use multi-line uscan options. --- debian/watch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index a5cbb14..7daaa63 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,6 @@ version=3 -opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|b|beta|alpha)\d*)$/$1~$2/ \ +opts=\ +dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|b|beta|alpha)\d*)$/$1~$2/ \ http://download.osgeo.org/liblas/ \ (?:|.*/)libLAS(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 03/10: Add patch to disable bigfile_boost_iostreams_test, fails to build with GCC 5.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository liblas.
commit 6d64f86f8fce369d0f685bcf1aa372abdc7b753f
Author: Bas Couwenberg
Date: Fri Jun 26 16:42:45 2015 +0200
Add patch to disable bigfile_boost_iostreams_test, fails to build with GCC
5.
---
.../disable-bigfile_boost_iostreams_test.patch | 34 ++
debian/patches/series | 1 +
2 files changed, 35 insertions(+)
diff --git a/debian/patches/disable-bigfile_boost_iostreams_test.patch
b/debian/patches/disable-bigfile_boost_iostreams_test.patch
new file mode 100644
index 000..7fbcdb9
--- /dev/null
+++ b/debian/patches/disable-bigfile_boost_iostreams_test.patch
@@ -0,0 +1,34 @@
+Description: Disable bigfile_boost_iostreams_test, fails to build with GCC 5.
+Author: Bas Couwenberg
+Bug-Debian: https://bugs.debian.org/777955
+
+--- a/apps/CMakeLists.txt
b/apps/CMakeLists.txt
+@@ -24,9 +24,9 @@ set(LASBLOCK lasblock )
+ set(BIGFILE_TEST bigfile_test)
+ set(LASINDEX_TEST lasindex_test)
+
+-if(Boost_IOSTREAMS_FOUND)
+- set(BIGFILE_BIO_TEST bigfile_boost_iostreams_test)
+-endif()
++#if(Boost_IOSTREAMS_FOUND)
++# set(BIGFILE_BIO_TEST bigfile_boost_iostreams_test)
++#endif()
+
+ # Set the build type to release if it is not explicitly set by the user and
+ # isn't in the cache yet
+@@ -127,10 +127,10 @@ if (LASINDEX_TEST)
+ target_link_libraries(${LASINDEX_TEST} ${APPS_CPP_DEPENDENCIES})
+ endif()
+
+-if(BIGFILE_BIO_TEST)
+-add_executable(${BIGFILE_BIO_TEST} bigfile_boost_iostreams_test.cpp)
+-target_link_libraries(${BIGFILE_BIO_TEST} ${APPS_CPP_DEPENDENCIES} )
+-endif()
++#if(BIGFILE_BIO_TEST)
++#add_executable(${BIGFILE_BIO_TEST} bigfile_boost_iostreams_test.cpp)
++#target_link_libraries(${BIGFILE_BIO_TEST} ${APPS_CPP_DEPENDENCIES} )
++#endif()
+
+
###
+ # Targets installation
diff --git a/debian/patches/series b/debian/patches/series
index 721cba8..e900c05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix_library_search
accommodate-typo
+disable-bigfile_boost_iostreams_test.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/liblas.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
[liblas] 02/10: Update symbols for amd64.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository liblas. commit 1ec7c54bcae39dc39bffa9142f4c53546f66bb46 Author: Bas Couwenberg Date: Fri Jun 26 13:31:51 2015 +0200 Update symbols for amd64. --- debian/liblas3.symbols | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/liblas3.symbols b/debian/liblas3.symbols index 84975cf..33602fa 100644 --- a/debian/liblas3.symbols +++ b/debian/liblas3.symbols @@ -52,6 +52,7 @@ liblas.so.3 liblas3 #MINVER# (optional=templinst)_ZN5boost11multi_index6detail13ordered_indexINS0_8identityIN6liblas9DimensionEEESt4lessIS5_ENS1_9nth_layerILi1ES5_NS0_10indexed_byINS0_14ordered_uniqueINS0_3tagINS4_8positionEN4mpl_2naESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_EES6_SF_EENS0_13random_accessINSC_INS4_5indexESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_NS0_13hashed_uniqueINSC_INS4_4nameESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_EENS0_13const_mem_funIS5_RKSsXadL [...] (optional=templinst)_ZN5boost11multi_index6detail13ordered_indexINS0_8identityIN6liblas9DimensionEEESt4lessIS5_ENS1_9nth_layerILi1ES5_NS0_10indexed_byINS0_14ordered_uniqueINS0_3tagINS4_8positionEN4mpl_2naESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_EES6_SF_EENS0_13random_accessINSC_INS4_5indexESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_NS0_13hashed_uniqueINSC_INS4_4nameESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_EENS0_13const_mem_funIS5_RKSsXadL [...] (optional=templinst)_ZN5boost11multi_index6detail13ordered_indexINS0_8identityIN6liblas9DimensionEEESt4lessIS5_ENS1_9nth_layerILi1ES5_NS0_10indexed_byINS0_14ordered_uniqueINS0_3tagINS4_8positionEN4mpl_2naESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_EES6_SF_EENS0_13random_accessINSC_INS4_5indexESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_NS0_13hashed_uniqueINSC_INS4_4nameESF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_SF_EENS0_13const_mem_funIS5_RKSsXadL [...] + (optional=templinst|arch=amd64)_ZN5boost11multi_index6detail19random_access_indexINS1_9nth_layerILi2EN6liblas9DimensionENS0_10indexed_byINS0_14ordered_uniqueINS0_3tagINS4_8positionEN4mpl_2naESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_EENS0_8identityIS5_EESB_EENS0_13random_accessINS8_INS4_5indexESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_NS0_13hashed_uniqueINS8_INS4_4nameESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_EENS0_13const_mem_funIS5_RKSsXa [...] (optional=templinst)_ZN5boost11multi_index6detail19random_access_indexINS1_9nth_layerILi2EN6liblas9DimensionENS0_10indexed_byINS0_14ordered_uniqueINS0_3tagINS4_8positionEN4mpl_2naESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_EENS0_8identityIS5_EESB_EENS0_13random_accessINS8_INS4_5indexESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_NS0_13hashed_uniqueINS8_INS4_4nameESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_EENS0_13const_mem_funIS5_RKSsXadL_ZNKS5_7G [...] (optional=templinst)_ZN5boost11multi_index6detail19random_access_indexINS1_9nth_layerILi2EN6liblas9DimensionENS0_10indexed_byINS0_14ordered_uniqueINS0_3tagINS4_8positionEN4mpl_2naESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_EENS0_8identityIS5_EESB_EENS0_13random_accessINS8_INS4_5indexESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_NS0_13hashed_uniqueINS8_INS4_4nameESB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_SB_EENS0_13const_mem_funIS5_RKSsXadL_ZNKS5_7G [...] (optional=templinst)_ZN5boost11multi_index6detail23ordered_index_node_implISaIcEE11rotate_leftEPS4_NS1_34ordered_index_node_compressed_baseIS3_E10parent_refE@Base 1.8.0 @@ -1156,6 +1157,8 @@ liblas.so.3 liblas3 #MINVER# (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjhESt10_Select1stIS2_ESt4lessIjESaIS2_EE7_M_copyEPKSt13_Rb_tree_nodeIS2_EPSA_@Base 1.8.0 (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjhESt10_Select1stIS2_ESt4lessIjESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 1.8.0 (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjhESt10_Select1stIS2_ESt4lessIjESaIS2_EEaSERKS8_@Base 1.8.0 + (optional=templinst|arch=amd64)_ZSt10__pop_heapIN9__gnu_cxx17__normal_iteratorIPN6liblas9DimensionESt6vectorIS3_SaIS3_NS0_5__ops15_Iter_comp_iterIPFbS3_S3_vT_SE_SE_T0_@Base 1.8.0 + (optional=templinst|arch=amd64)_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPN6liblas9DimensionESt6vectorIS3_SaIS3_NS0_5__ops15_Iter_comp_iterIPFbS3_S3_vT_SE_T0_@Base 1.8.0 (optional=templinst|arch=!amd64 !arm64 !ppc64el !s390x)_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIPN6liblas9DimensionESt6vectorIS3_SaIS3_iS3_NS0_5__ops14_Iter_comp_valIPFbS3_S3_vT_T0_SF_T1_T2_@Base 1.8.0 (optional=templinst)_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIPN6liblas9DimensionESt6vectorIS3_SaIS3_lS3_NS0_5__ops14_Iter_comp_valIPFbS3_S3_vT_T0_SF_T1_T2_@Base 1.8.0 (optional=templinst)_ZSt11__remove_ifIN9__gnu_cxx
[liblas] branch master updated (2d1f703 -> a5aebc2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository liblas. from 2d1f703 Fix upstream version extraction from changelog. new e51aa99 Use multi-line uscan options. new 1ec7c54 Update symbols for amd64. new 6d64f86 Add patch to disable bigfile_boost_iostreams_test, fails to build with GCC 5. new d153157 Append -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS to fix build with GCC 5. new 64c03f0 Disable GCC-5 changes. new d548129 Add changelog entries for version extraction & uscan changes. new 601dc7d Add boost dependencies to liblas-dev. new 2036bb7 Also install cmake files in liblas-dev. new 56a6f2e Explicitly remove files not be installed. new a5aebc2 Set distribution to unstable. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 +++ debian/control | 7 - debian/liblas-dev.install | 1 + debian/liblas3.symbols | 3 ++ .../disable-bigfile_boost_iostreams_test.patch | 34 ++ debian/patches/series | 1 + debian/rules | 9 ++ debian/watch | 4 ++- 8 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 debian/patches/disable-bigfile_boost_iostreams_test.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.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
grass_7.0.1~rc1-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 04 Jul 2015 21:23:04 +0200 Source: grass Binary: grass grass-core grass-gui grass-doc grass-dev-doc grass-dev Architecture: source amd64 all Version: 7.0.1~rc1-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS Project Changed-By: Bas Couwenberg Description: grass - Geographic Resources Analysis Support System (GRASS GIS) grass-core - GRASS GIS core components grass-dev - GRASS GIS development files grass-dev-doc - GRASS GIS Programmers' Manual grass-doc - GRASS GIS user documentation grass-gui - GRASS GIS graphical user interfaces Changes: grass (7.0.1~rc1-1~exp1) experimental; urgency=medium . [ Bas Couwenberg ] * Use upstream grass startup script, and install custom x-grass7 as x-grass70. * Add Conflicts/Provides/Replaces on the grass7* packages by upstream. * New upstream release candidate. * Refresh patches and mark as Forwarded. * Add patches for various typos. . [ Francesco Paolo Lovergine ] * Added liblas-dev b-d to support new Lidar modules. * Introduced a separate tag in debian/rules to regenerate debian stuff from templates. Checksums-Sha1: 35f793ae46b8eccd6c8d5bb87e651db3bca9dde7 2781 grass_7.0.1~rc1-1~exp1.dsc 53382f50ef1c77b21eb1b352826ec6891f8153ab 32281377 grass_7.0.1~rc1.orig.tar.gz fe0e1d8090ea1c927eb0c00777f6f3fd82dc55a5 31588 grass_7.0.1~rc1-1~exp1.debian.tar.xz 1c0a87b014f5e83a566c2729992b764de538cf55 7197664 grass-core_7.0.1~rc1-1~exp1_amd64.deb b8811ebcfc74166450173d75a89c2cc610d8c48d 10353102 grass-dev-doc_7.0.1~rc1-1~exp1_all.deb 20fa0a6a9c1edef65f0c477d629462ad4e5e09b3 194210 grass-dev_7.0.1~rc1-1~exp1_amd64.deb 0aec50024cedbd92bfb5ad1aa5b3b227d0ca4b3c 11600974 grass-doc_7.0.1~rc1-1~exp1_all.deb cae4559843b6b9cebccd7f276faf7b7e03fe8ae9 1930278 grass-gui_7.0.1~rc1-1~exp1_amd64.deb cc6565aec0718036d4a6a74a5d8151fa66418bd6 17770 grass_7.0.1~rc1-1~exp1_all.deb Checksums-Sha256: 57d58dc1f5fd3af55e5a25ecd27a6633b6e33b21ade49be6af0bf3d1d5a12bf0 2781 grass_7.0.1~rc1-1~exp1.dsc e49ee3d962e7ca5dc6620a6cd74a5df5e0f3fb1ad8a0aa52764fc49205e8e24b 32281377 grass_7.0.1~rc1.orig.tar.gz ccf450d8ec6c91eda33141349ddb6c96d13c08e393a63ba9772fdb57bdf91ba7 31588 grass_7.0.1~rc1-1~exp1.debian.tar.xz 81637c64ccae7249219f064f7a17333a4670adddeb24913d03a7dfb1968d4c0a 7197664 grass-core_7.0.1~rc1-1~exp1_amd64.deb be19b95b9ff110b404061241ea834cf1c145aa4345539a1fb39465991ccfe537 10353102 grass-dev-doc_7.0.1~rc1-1~exp1_all.deb aefc90e5577beeac6511580bbe1df0e4e9bcd3eaec45a851c2cf00d9650919bd 194210 grass-dev_7.0.1~rc1-1~exp1_amd64.deb 9591fdc916927cbde230451995683ab0d51fd0893ea32d05c5d7b12f90b74e11 11600974 grass-doc_7.0.1~rc1-1~exp1_all.deb 11b0e90ffc6a91b21ed4d0078e5d46e8a2dc25b3705513b23c7f85b475a35591 1930278 grass-gui_7.0.1~rc1-1~exp1_amd64.deb c2ebc68f64ef4a87f40bed9581f88facb4dd285abca773b84c8a2e83cbe84add 17770 grass_7.0.1~rc1-1~exp1_all.deb Files: 2f71a4e5f72a6669fb2bca3c4955443e 2781 science optional grass_7.0.1~rc1-1~exp1.dsc ac41bb7dd2b14a89f92b555de14f9042 32281377 science optional grass_7.0.1~rc1.orig.tar.gz 061df5a95773f3582fafce85786dfa51 31588 science optional grass_7.0.1~rc1-1~exp1.debian.tar.xz a6dad83eea15808dafd7c4c0a6a634b5 7197664 science optional grass-core_7.0.1~rc1-1~exp1_amd64.deb 46ad14a0f93d33c0ba2588c92fed29db 10353102 doc optional grass-dev-doc_7.0.1~rc1-1~exp1_all.deb 4f5729d68ca6ff442b42e794b737430b 194210 devel optional grass-dev_7.0.1~rc1-1~exp1_amd64.deb 7ee3f496acea959003618bac389d4957 11600974 doc optional grass-doc_7.0.1~rc1-1~exp1_all.deb a03529d6e35dc93df16a7aff124c3e67 1930278 science optional grass-gui_7.0.1~rc1-1~exp1_amd64.deb dbd1b140018508197d72289b995126d4 17770 metapackages optional grass_7.0.1~rc1-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIbBAEBCgAGBQJVmDeyAAoJEGdQ8QrojUrxjtUP+JlEEVxLZzslgXK/E75zFqnT kLvVCyMXnOLC9fw51JpLNzH3nF5+3reeHD6aXBvetpymSzq8LnqU4TEHEA2NpSHu OelDkgb+MLGOimvnfb5wbaqJGpvQC317g6OL2f4UueYWocBCNVBErK7+1ZQMfxCj JNFUu9KSFsVZnGVcM0ASVYLcjMQ/fdR6d07y2F3BDmLJgX4Y7z7CssaIwudHswot UMpxIpczbJ9P1Jtq3tpPVDsp/zW1wWw5caMo5zl0uHC8Asj+6Mw85aOQKoFeIJis YT7RLyCbBCeJpVtmZHdeMVibp+prf2q/4q+7mToZ/5vzrkdGF1upDkLGfFJROxsT PVz5l32uc5MczJCMJEf0QfBZ2gXQ3FzGEKFBtTw7nQUjHUtAGM1rpkWm1GG1jQ5u az9gHgdr2U1UyD/ua2S7tcIom6hMiavVeuEpv+AGC8nBO0U3En1Ka63iXT+ktUWT wTDqyGtbIxrbL1kvrXjcDfy+LRi6vM3+UbnV1jZQR0XPLEdJMa/3iO+IC8cU9mC9 JL+iZ7k7UfiRKEwJqw6TkNQmhQcvG0S2qbvk1M4Flu2nGr7SitNlVxMvrJmfO3Ak ZHVWpvGGim6vRinzPt/da0twhNWmY4Fag3OeE+6dm3rQ9uDy4AZPBIMF5slnqzMH vrhorxCTFpxdhHBjLtI= =eJ89 -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
Bug#790524: src:gmt: takes over files from several unrelated packages (was: Re: gmt: libgenome-perl in sid already provides /usr/bin/gmt)
On Sat, 04 Jul 2015 17:26:14 +0200, Andreas Tille wrote: > I was able to commit[1] a fix for this bug. I'd like to wait for a > confirmation of a Perl Group member whether this is OK for a team upload > or whether this is to less Perl-ish and rather Debian-Med-ish. I'm > fine with moving the package to Debian Med or uploading on behalf of the > perl team - whatever you prefer. If this is the preferred way to handle the issue in Debian Med I see no reason not to do it this way. And according to Uploaders, this package is quite Debian-Med-ish anyway :) From my POV, feel free to go ahead with a team upload. Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Muddy Waters: Hoochie Coochie Man signature.asc Description: Digital Signature ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 04/07: Refresh patches and mark as Forwarded.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit e864154f214518531f760c96e90219c82905b0a9
Author: Bas Couwenberg
Date: Fri Jul 3 19:56:32 2015 +0200
Refresh patches and mark as Forwarded.
---
debian/changelog | 1 +
debian/patches/desktop.patch | 3 ++-
debian/patches/instdir | 1 +
debian/patches/pager | 3 ++-
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 325d921..ac657cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grass (7.0.1~rc1-1) UNRELEASED; urgency=medium
* Use upstream grass startup script, and install custom x-grass7 as
x-grass70.
* Add Conflicts/Provides/Replaces on the grass7* packages by upstream.
* New upstream release candidate.
+ * Refresh patches and mark as Forwarded.
[ Francesco Paolo Lovergine ]
* Added liblas-dev b-d to support new Lidar modules.
diff --git a/debian/patches/desktop.patch b/debian/patches/desktop.patch
index 23dc530..356ea70 100644
--- a/debian/patches/desktop.patch
+++ b/debian/patches/desktop.patch
@@ -1,5 +1,6 @@
-Description: Add Keywords, and fix Exec & Icon in desktop file.
+Description: Fix Exec & Icon for Debian.
Author: Bas Couwenberg
+Forwarded: not-needed
--- a/gui/icons/grass.desktop
+++ b/gui/icons/grass.desktop
diff --git a/debian/patches/instdir b/debian/patches/instdir
index 9c9437e..3e0ddb7 100644
--- a/debian/patches/instdir
+++ b/debian/patches/instdir
@@ -1,5 +1,6 @@
Description: Don't include GRASS_VERSION_RELEASE in path.
Author: Francesco Paolo Lovergine
+Forwarded: not-needed
--- a/configure
+++ b/configure
diff --git a/debian/patches/pager b/debian/patches/pager
index efdeda4..e8b5784 100644
--- a/debian/patches/pager
+++ b/debian/patches/pager
@@ -6,10 +6,11 @@ Description: Perfer pager over more.
ported to Python by Bas Couwenberg.
Author: Francesco Paolo Lovergine
Author: Bas Couwenberg
+Forwarded: not-needed
--- a/lib/init/grass.py
+++ b/lib/init/grass.py
-@@ -435,10 +435,12 @@ def find_exe(pgm):
+@@ -439,10 +439,12 @@ def find_exe(pgm):
def set_defaults():
# GRASS_PAGER
if not os.getenv('GRASS_PAGER'):
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.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
[grass] tag debian/7.0.1.rc1-1.exp1 created (now d1ba499)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/7.0.1.rc1-1.exp1 in repository grass. at d1ba499 (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/grass.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
[grass] 06/07: Add patches for various typos.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit e5e263e98ba844fbc30db15302633a0d24692ca1
Author: Bas Couwenberg
Date: Sat Jul 4 20:06:46 2015 +0200
Add patches for various typos.
---
debian/changelog| 1 +
debian/patches/allows-to-typo.patch | 90
debian/patches/length-typo.patch| 438
debian/patches/permit-to-typo.patch | 15 ++
debian/patches/series | 3 +
5 files changed, 547 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ac657cc..48916f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ grass (7.0.1~rc1-1) UNRELEASED; urgency=medium
* Add Conflicts/Provides/Replaces on the grass7* packages by upstream.
* New upstream release candidate.
* Refresh patches and mark as Forwarded.
+ * Add patches for various typos.
[ Francesco Paolo Lovergine ]
* Added liblas-dev b-d to support new Lidar modules.
diff --git a/debian/patches/allows-to-typo.patch
b/debian/patches/allows-to-typo.patch
new file mode 100644
index 000..50865f7
--- /dev/null
+++ b/debian/patches/allows-to-typo.patch
@@ -0,0 +1,90 @@
+Description: Fix 'allows to' typo, replace with 'allows ing'.
+Author: Bas Couwenberg
+Forwarded: https://trac.osgeo.org/grass/ticket/2704
+
+--- a/gui/wxpython/vdigit/g.gui.vdigit.html
b/gui/wxpython/vdigit/g.gui.vdigit.html
+@@ -43,7 +43,7 @@ A new vector map can be easily created f
+ selecting "New vector map" in "Select vector map"
+ combobox. A new vector map is created, added to the current layer tree
+ in Layer Manager and opened for editing. "Select vector map"
+-combobox in the digitizer toolbar also allows to easily switch between
++combobox in the digitizer toolbar also allows easily switching between
+ vector maps to be edited.
+
+ EDITING AN EXISTING VECTOR MAP
+--- a/doc/parms_flags.txt
b/doc/parms_flags.txt
+@@ -64,7 +64,7 @@ Import:
+ Export:
+ * input=name file=name for all raster, sites and vector modules
+ * export modules should *all* have an output= parameter, however they
+- should allow to specify "-" to write to stdout (for unix piping)
++ should allow specifying "-" to write to stdout (for unix piping)
+
+ -> file is external file. Should be read from current directory, not
+within mapset!
+--- a/gui/wxpython/docs/wxGUI.nviz.html
b/gui/wxpython/docs/wxGUI.nviz.html
+@@ -296,7 +296,7 @@ attributes.
+
+ Cutting planes
+
+-Cutting planes allow to cut surfaces along a plane. You can switch
++Cutting planes allow cutting surfaces along a plane. You can switch
+ between six planes; to disable cutting planes switch to None.
+ Initially the plane is vertical, you can change it to horizontal by
+ setting tilt 90 degrees. The X and Y values
+--- a/gui/wxpython/web_services/widgets.py
b/gui/wxpython/web_services/widgets.py
+@@ -964,7 +964,7 @@ class LayersList(TreeListCtrl, listmix.L
+ return sel_layers_dict
+
+ def OnListSelChanging(self, event):
+-"""Do not allow to select items, which cannot be requested from
server.
++"""Do not allow selecting items, which cannot be requested from
server.
+ """
+ def _emitSelected(layer):
+ title = layer.GetLayerData('title')
+--- a/lib/ogsf/gs2.c
b/lib/ogsf/gs2.c
+@@ -1711,7 +1711,7 @@ int GS_load_att_map(int id, const char *
+ tbuff = gs_get_att_typbuff(gs, att, 1);
+
+ /* TODO: Provide mechanism for loading certain attributes at
+- specified sizes, allow to scale or cap, or scale non-zero */
++ specified sizes, allow scaling or capping, or scale non-zero */
+ if (ATT_MASK == att) {
+ atty = ATTY_MASK;
+ }
+@@ -3343,7 +3343,7 @@ int GS_load_3dview(const char *vname, in
+ /*!
+\brief Init viewpoint
+
+- \todo allow to set center?
++ \todo allow setting center?
+ */
+ void GS_init_view(void)
+ {
+--- a/raster/r.null/r.null.html
b/raster/r.null/r.null.html
+@@ -36,7 +36,7 @@ Note that value is restricted to integer
+ r.null and reclassified maps:
+ The problem is, if r.null was run on the reclass raster it would alter the
+ original and any other reclass rasters of the original. Therefore r.null
+-doesn't allow to recode reclassified maps (products of r.reclass).
++doesn't allow recoding reclassified maps (products of r.reclass).
+
+ So, the way to recode such a map is: The user makes a raster out of the
+ reclass that isn't a reclass by copying it:
+--- a/temporal/t.rast.accdetect/t.rast.accdetect.html
b/temporal/t.rast.accdetect/t.rast.accdetect.html
+@@ -24,7 +24,7 @@ The minimum and maximum va
+ process can be set, either by using space time raster datasets or
+ by using fixed values for all raster cells and time steps.
+
+-Using space time raster datasets allow to specify minimum and maximum
++Using space time raster datasets allow
[grass] 05/07: Fix paths for png files in grass-gui.links.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository grass. commit 232d54f0e7815f8b30bdafa3eefe2a1082faff5d Author: Bas Couwenberg Date: Fri Jul 3 20:06:37 2015 +0200 Fix paths for png files in grass-gui.links. Partially reverts ef17bcadf77b05f98660eff31a44f8638433df72. --- debian/grass-gui.links| 4 ++-- debian/grass-gui.links.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/grass-gui.links b/debian/grass-gui.links index ea02ab9..9688789 100644 --- a/debian/grass-gui.links +++ b/debian/grass-gui.links @@ -3,7 +3,7 @@ usr/share/grass70/gui/images usr/lib/grass70/gui/images usr/share/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/share/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg -usr/share/grass70/gui/wxpython/gmodeler/gmodeler_frame.jpg usr/lib/grass70/gui/wxpython/gmodeler/gmodeler_frame.jpg +usr/share/grass70/gui/wxpython/gmodeler/gmodeler_frame.png usr/lib/grass70/gui/wxpython/gmodeler/gmodeler_frame.png usr/share/grass70/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass70/gui/wxpython/iclass/iclass_frame.jpg usr/share/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/share/grass70/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass70/gui/wxpython/psmap/psmap_frame.jpg @@ -15,6 +15,6 @@ usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png usr/lib/g usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.png usr/share/grass70/gui/wxpython/timeline/timeline_2D.jpg usr/lib/grass70/gui/wxpython/timeline/timeline_2D.jpg usr/share/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg usr/lib/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg diff --git a/debian/grass-gui.links.in b/debian/grass-gui.links.in index 9f070d2..6a209d6 100644 --- a/debian/grass-gui.links.in +++ b/debian/grass-gui.links.in @@ -3,7 +3,7 @@ usr/share/grass@VERSION@/gui/images usr/lib/grass@VERSION@/gui/images usr/share/grass@VERSION@/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass@VERSION@/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/share/grass@VERSION@/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/dbmgr/dbmgr_frame.jpg -usr/share/grass@VERSION@/gui/wxpython/gmodeler/gmodeler_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/gmodeler/gmodeler_frame.jpg +usr/share/grass@VERSION@/gui/wxpython/gmodeler/gmodeler_frame.png usr/lib/grass@VERSION@/gui/wxpython/gmodeler/gmodeler_frame.png usr/share/grass@VERSION@/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/iclass/iclass_frame.jpg usr/share/grass@VERSION@/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass@VERSION@/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/share/grass@VERSION@/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/psmap/psmap_frame.jpg @@ -15,6 +15,6 @@ usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_5.png us usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_8.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_8.png -usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg +usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg usr/share/grass@VERSION@/gui/wxpython/timeline/timeline_2D.jpg usr/lib/grass@VERSION@/gui/wxpython/timeline/timeline_2D.jpg usr/share/grass@VERSION@/gui/wxpython/vdigit/vdigit_toolbar.jpg usr/lib/grass@VERSION@/
[grass] annotated tag upstream/7.0.1_rc1 created (now 41f37f2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/7.0.1_rc1 in repository grass. at 41f37f2 (tag) tagging 737976e38822162413ed4b7d762c2a126dcb0092 (commit) replaces upstream/7.0.0 tagged by Bas Couwenberg on Fri Jul 3 19:45:55 2015 +0200 - Log - Upstream version 7.0.1~rc1 Bas Couwenberg (1): Imported Upstream version 7.0.1~rc1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.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
[grass] 07/07: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository grass. commit d1ba4996a5a25177480112607ee9e1a99d0619e8 Author: Bas Couwenberg Date: Sat Jul 4 21:23:55 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48916f1..30d18e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -grass (7.0.1~rc1-1) UNRELEASED; urgency=medium +grass (7.0.1~rc1-1~exp1) experimental; urgency=medium [ Bas Couwenberg ] * Use upstream grass startup script, and install custom x-grass7 as x-grass70. @@ -12,7 +12,7 @@ grass (7.0.1~rc1-1) UNRELEASED; urgency=medium * Introduced a separate tag in debian/rules to regenerate debian stuff from templates. - -- Bas Couwenberg Fri, 03 Jul 2015 19:47:27 +0200 + -- Bas Couwenberg Sat, 04 Jul 2015 21:23:04 +0200 grass (7.0.0-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.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
[grass] branch upstream updated (d9ad57f -> 737976e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository grass. from d9ad57f Imported Upstream version 7.0.0 new 737976e Imported Upstream version 7.0.1~rc1 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: AUTHORS|23 +- ChangeLog_7.0.0.gz | Bin 788043 -> 0 bytes ChangeLog_7.0.1RC1.gz | Bin 0 -> 795603 bytes REQUIREMENTS.html | 8 +- config.guess |27 +- config.sub |13 +- db/db.tables/main.c| 3 + db/drivers/postgres/README | 5 +- demolocation/grassrc.tmpl | 2 - display/d.linegraph/main.c | 2 +- display/d.rast.num/d.rast.num.html |33 +- display/d.rast.num/d_rast_num_zoom.png | Bin 0 -> 147085 bytes display/d.rast.num/main.c | 4 +- display/d.vect.chart/d.vect.chart.html |15 +- display/d.vect.chart/d_vect_chart_pie_2d.png | Bin 0 -> 91184 bytes display/d.vect.chart/main.c| 3 +- display/d.vect.chart/pie.c |14 +- display/d.vect/area.c | 2 +- display/d.vect/lines.c |12 +- display/d.vect/main.c | 2 +- doc/howto_release.txt |15 +- general/g.gui/main.c |92 +- general/g.mapset/main.c|19 +- general/g.mapsets/g.mapsets.html |41 +- general/g.mapsets/g_mapsets_gui.png| Bin 0 -> 17263 bytes general/g.parser/standard_option.c | 2 + gui/wxpython/animation/dialogs.py |12 +- gui/wxpython/animation/g.gui.animation.py |36 +- gui/wxpython/core/render.py| 2 +- gui/wxpython/core/toolboxes.py | 113 +- gui/wxpython/core/treemodel.py | 5 +- gui/wxpython/core/utils.py | 7 - gui/wxpython/dbmgr/base.py |41 +- gui/wxpython/dbmgr/g.gui.dbmgr.py |38 +- gui/wxpython/dbmgr/manager.py |20 +- gui/wxpython/dbmgr/sqlbuilder.py |19 +- gui/wxpython/gcp/g.gui.gcp.py |22 +- gui/wxpython/gmodeler/g.gui.gmodeler.py|25 +- gui/wxpython/gui_core/dialogs.py |33 +- gui/wxpython/gui_core/forms.py | 2 + gui/wxpython/gui_core/goutput.py | 2 +- gui/wxpython/gui_core/widgets.py | 8 +- gui/wxpython/iclass/g.gui.iclass.py|70 +- gui/wxpython/lmgr/frame.py | 4 +- gui/wxpython/lmgr/layertree.py |15 +- gui/wxpython/lmgr/toolbars.py | 4 +- gui/wxpython/mapswipe/g.gui.mapswipe.py|40 +- gui/wxpython/modules/mapsets_picker.py |22 +- gui/wxpython/psmap/frame.py| 4 +- gui/wxpython/psmap/g.gui.psmap.py |20 +- gui/wxpython/rlisetup/g.gui.rlisetup.py|19 +- gui/wxpython/timeline/g.gui.timeline.py|20 +- gui/wxpython/vdigit/g.gui.vdigit.html |79 +- gui/wxpython/vdigit/g.gui.vdigit.py| 103 +- gui/wxpython/vnet/dialogs.py | 9 +- gui/wxpython/web_services/widgets.py | 9 +- gui/wxpython/xml/toolboxes.xml | 4 +- imagery/i.atcorr/i.atcorr.html | 4 +- imagery/i.eb.soilheatflux/i.eb.soilheatflux.html |37 +- include/VERSION| 2 +- include/defs/la.h | 4 + include/defs/vector.h | 7 + include/gis.h | 6 +- include/glocale.h | 4 +- lib/cairodriver/cairodriver.html |30 +- lib/db/dbmi_client/copy_tab.c | 2 +- lib/gis/copy_dir.c |33 +- lib/gis/get_ellipse.c | 2 +- lib/gis/parser_standard_options.c |24 + lib/gis/renamed_options| 4 + lib/gmath/la.c
[grass] branch pristine-tar updated (abfb07b -> 4d6059f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository grass. from abfb07b pristine-tar data for grass_7.0.0.orig.tar.gz new 4d6059f pristine-tar data for grass_7.0.1~rc1.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: grass_7.0.1~rc1.orig.tar.gz.delta | Bin 0 -> 241479 bytes grass_7.0.1~rc1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 grass_7.0.1~rc1.orig.tar.gz.delta create mode 100644 grass_7.0.1~rc1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.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
[grass] 01/01: pristine-tar data for grass_7.0.1~rc1.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 grass. commit 4d6059f696caee42dd1d894f8eedab01a793392f Author: Bas Couwenberg Date: Fri Jul 3 19:45:54 2015 +0200 pristine-tar data for grass_7.0.1~rc1.orig.tar.gz --- grass_7.0.1~rc1.orig.tar.gz.delta | Bin 0 -> 241479 bytes grass_7.0.1~rc1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/grass_7.0.1~rc1.orig.tar.gz.delta b/grass_7.0.1~rc1.orig.tar.gz.delta new file mode 100644 index 000..33ba18c Binary files /dev/null and b/grass_7.0.1~rc1.orig.tar.gz.delta differ diff --git a/grass_7.0.1~rc1.orig.tar.gz.id b/grass_7.0.1~rc1.orig.tar.gz.id new file mode 100644 index 000..8b24cd0 --- /dev/null +++ b/grass_7.0.1~rc1.orig.tar.gz.id @@ -0,0 +1 @@ +31dbc2b5137e838cb6e9ac87b5cbcf177febae4f -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.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
[grass] 02/07: Merge tag 'upstream/7.0.1_rc1' into experimental
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository grass. commit c9d7dc2c7ecd42b3df892b91be3f0571e74ff7ff Merge: ef17bca 737976e Author: Bas Couwenberg Date: Fri Jul 3 19:45:58 2015 +0200 Merge tag 'upstream/7.0.1_rc1' into experimental Upstream version 7.0.1~rc1 AUTHORS|23 +- ChangeLog_7.0.0.gz | Bin 788043 -> 0 bytes ChangeLog_7.0.1RC1.gz | Bin 0 -> 795603 bytes REQUIREMENTS.html | 8 +- config.guess |27 +- config.sub |13 +- db/db.tables/main.c| 3 + db/drivers/postgres/README | 5 +- demolocation/grassrc.tmpl | 2 - display/d.linegraph/main.c | 2 +- display/d.rast.num/d.rast.num.html |33 +- display/d.rast.num/d_rast_num_zoom.png | Bin 0 -> 147085 bytes display/d.rast.num/main.c | 4 +- display/d.vect.chart/d.vect.chart.html |15 +- display/d.vect.chart/d_vect_chart_pie_2d.png | Bin 0 -> 91184 bytes display/d.vect.chart/main.c| 3 +- display/d.vect.chart/pie.c |14 +- display/d.vect/area.c | 2 +- display/d.vect/lines.c |12 +- display/d.vect/main.c | 2 +- doc/howto_release.txt |15 +- general/g.gui/main.c |92 +- general/g.mapset/main.c|19 +- general/g.mapsets/g.mapsets.html |41 +- general/g.mapsets/g_mapsets_gui.png| Bin 0 -> 17263 bytes general/g.parser/standard_option.c | 2 + gui/wxpython/animation/dialogs.py |12 +- gui/wxpython/animation/g.gui.animation.py |36 +- gui/wxpython/core/render.py| 2 +- gui/wxpython/core/toolboxes.py | 113 +- gui/wxpython/core/treemodel.py | 5 +- gui/wxpython/core/utils.py | 7 - gui/wxpython/dbmgr/base.py |41 +- gui/wxpython/dbmgr/g.gui.dbmgr.py |38 +- gui/wxpython/dbmgr/manager.py |20 +- gui/wxpython/dbmgr/sqlbuilder.py |19 +- gui/wxpython/gcp/g.gui.gcp.py |22 +- gui/wxpython/gmodeler/g.gui.gmodeler.py|25 +- gui/wxpython/gui_core/dialogs.py |33 +- gui/wxpython/gui_core/forms.py | 2 + gui/wxpython/gui_core/goutput.py | 2 +- gui/wxpython/gui_core/widgets.py | 8 +- gui/wxpython/iclass/g.gui.iclass.py|70 +- gui/wxpython/lmgr/frame.py | 4 +- gui/wxpython/lmgr/layertree.py |15 +- gui/wxpython/lmgr/toolbars.py | 4 +- gui/wxpython/mapswipe/g.gui.mapswipe.py|40 +- gui/wxpython/modules/mapsets_picker.py |22 +- gui/wxpython/psmap/frame.py| 4 +- gui/wxpython/psmap/g.gui.psmap.py |20 +- gui/wxpython/rlisetup/g.gui.rlisetup.py|19 +- gui/wxpython/timeline/g.gui.timeline.py|20 +- gui/wxpython/vdigit/g.gui.vdigit.html |79 +- gui/wxpython/vdigit/g.gui.vdigit.py| 103 +- gui/wxpython/vnet/dialogs.py | 9 +- gui/wxpython/web_services/widgets.py | 9 +- gui/wxpython/xml/toolboxes.xml | 4 +- imagery/i.atcorr/i.atcorr.html | 4 +- imagery/i.eb.soilheatflux/i.eb.soilheatflux.html |37 +- include/VERSION| 2 +- include/defs/la.h | 4 + include/defs/vector.h | 7 + include/gis.h | 6 +- include/glocale.h | 4 +- lib/cairodriver/cairodriver.html |30 +- lib/db/dbmi_client/copy_tab.c | 2 +- lib/gis/copy_dir.c |33 +- lib/gis/get_ellipse.c | 2 +- lib/gis/parser_standard_options.c |24 + lib/gis/renamed_options| 4 + lib/gmath/la.c | 203 +- lib/init/grass.py |16 +- lib/init/variables.html
[grass] 03/07: New upstream release candidate.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository grass. commit e1857523270c16f7c8b2c7643081bf8c565843ee Author: Bas Couwenberg Date: Fri Jul 3 19:50:21 2015 +0200 New upstream release candidate. --- debian/changelog | 5 +++-- debian/control | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0cbdd31..325d921 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,16 @@ -grass (7.0.0-1~exp2) UNRELEASED; urgency=medium +grass (7.0.1~rc1-1) UNRELEASED; urgency=medium [ Bas Couwenberg ] * Use upstream grass startup script, and install custom x-grass7 as x-grass70. * Add Conflicts/Provides/Replaces on the grass7* packages by upstream. + * New upstream release candidate. [ Francesco Paolo Lovergine ] * Added liblas-dev b-d to support new Lidar modules. * Introduced a separate tag in debian/rules to regenerate debian stuff from templates. - -- Bas Couwenberg Sat, 21 Feb 2015 18:46:48 +0100 + -- Bas Couwenberg Fri, 03 Jul 2015 19:47:27 +0200 grass (7.0.0-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 1856383..628a8eb 100644 --- a/debian/control +++ b/debian/control @@ -106,7 +106,7 @@ Suggests: grass-doc, Breaks: grass (<< 6.4.2-1~) Conflicts: grass70-core, grass7-core -Provides: grass700, +Provides: grass701-1, grass70-core, grass7-core Replaces: grass70-core, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.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
[grass] branch experimental updated (ef17bca -> d1ba499)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch experimental in repository grass. from ef17bca Introduced liblas-dev b-d for lidar tools. new 737976e Imported Upstream version 7.0.1~rc1 new c9d7dc2 Merge tag 'upstream/7.0.1_rc1' into experimental new e185752 New upstream release candidate. new e864154 Refresh patches and mark as Forwarded. new 232d54f Fix paths for png files in grass-gui.links. new e5e263e Add patches for various typos. new d1ba499 Set distribution to experimental. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: AUTHORS|23 +- ChangeLog_7.0.0.gz | Bin 788043 -> 0 bytes ChangeLog_7.0.1RC1.gz | Bin 0 -> 795603 bytes REQUIREMENTS.html | 8 +- config.guess |27 +- config.sub |13 +- db/db.tables/main.c| 3 + db/drivers/postgres/README | 5 +- debian/changelog | 7 +- debian/control | 2 +- debian/grass-gui.links | 4 +- debian/grass-gui.links.in | 4 +- debian/patches/allows-to-typo.patch|90 + debian/patches/desktop.patch | 3 +- debian/patches/instdir | 1 + debian/patches/length-typo.patch | 438 + debian/patches/pager | 3 +- debian/patches/permit-to-typo.patch|15 + debian/patches/series | 3 + demolocation/grassrc.tmpl | 2 - display/d.linegraph/main.c | 2 +- display/d.rast.num/d.rast.num.html |33 +- display/d.rast.num/d_rast_num_zoom.png | Bin 0 -> 147085 bytes display/d.rast.num/main.c | 4 +- display/d.vect.chart/d.vect.chart.html |15 +- display/d.vect.chart/d_vect_chart_pie_2d.png | Bin 0 -> 91184 bytes display/d.vect.chart/main.c| 3 +- display/d.vect.chart/pie.c |14 +- display/d.vect/area.c | 2 +- display/d.vect/lines.c |12 +- display/d.vect/main.c | 2 +- doc/howto_release.txt |15 +- general/g.gui/main.c |92 +- general/g.mapset/main.c|19 +- general/g.mapsets/g.mapsets.html |41 +- general/g.mapsets/g_mapsets_gui.png| Bin 0 -> 17263 bytes general/g.parser/standard_option.c | 2 + gui/wxpython/animation/dialogs.py |12 +- gui/wxpython/animation/g.gui.animation.py |36 +- gui/wxpython/core/render.py| 2 +- gui/wxpython/core/toolboxes.py | 113 +- gui/wxpython/core/treemodel.py | 5 +- gui/wxpython/core/utils.py | 7 - gui/wxpython/dbmgr/base.py |41 +- gui/wxpython/dbmgr/g.gui.dbmgr.py |38 +- gui/wxpython/dbmgr/manager.py |20 +- gui/wxpython/dbmgr/sqlbuilder.py |19 +- gui/wxpython/gcp/g.gui.gcp.py |22 +- gui/wxpython/gmodeler/g.gui.gmodeler.py|25 +- gui/wxpython/gui_core/dialogs.py |33 +- gui/wxpython/gui_core/forms.py | 2 + gui/wxpython/gui_core/goutput.py | 2 +- gui/wxpython/gui_core/widgets.py | 8 +- gui/wxpython/iclass/g.gui.iclass.py|70 +- gui/wxpython/lmgr/frame.py | 4 +- gui/wxpython/lmgr/layertree.py |15 +- gui/wxpython/lmgr/toolbars.py | 4 +- gui/wxpython/mapswipe/g.gui.mapswipe.py|40 +- gui/wxpython/modules/mapsets_picker.py |22 +- gui/wxpython/psmap/frame.py| 4 +- gui/wxpython/psmap/g.gui.psmap.py |20 +- gui/wxpython/rlisetup/g.gui.rlisetup.py|19 +- gui/wxpython/timeline/g.gui.timeline.py|20 +- gui/wxpython/vdigit/g.gui.vdigit.html |79 +- gui/wxpython/vdigit/g.gui.v
Processing of grass_7.0.1~rc1-1~exp1_amd64.changes
grass_7.0.1~rc1-1~exp1_amd64.changes uploaded successfully to localhost along with the files: grass_7.0.1~rc1-1~exp1.dsc grass_7.0.1~rc1.orig.tar.gz grass_7.0.1~rc1-1~exp1.debian.tar.xz grass-core_7.0.1~rc1-1~exp1_amd64.deb grass-dev-doc_7.0.1~rc1-1~exp1_all.deb grass-dev_7.0.1~rc1-1~exp1_amd64.deb grass-doc_7.0.1~rc1-1~exp1_all.deb grass-gui_7.0.1~rc1-1~exp1_amd64.deb grass_7.0.1~rc1-1~exp1_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
pyosmium_2.2.0-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 04 Jul 2015 17:11:47 +0200 Source: pyosmium Binary: python-pyosmium python3-pyosmium pyosmium-doc Architecture: source all amd64 Version: 2.2.0-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project Changed-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.2.0-1) unstable; urgency=medium . * New upstream release. * Handle other extensions in filenamemangle. * Require at least libosmium version 2.2.0. Checksums-Sha1: 69ede8645927e9257df1216cb8afeb30f150170b 2341 pyosmium_2.2.0-1.dsc 58543f1e8a956047c11213aa1a52af5d168fbe65 24729 pyosmium_2.2.0.orig.tar.gz 8b50b612ce03080c4d5abf2b285f3c5f5b8a7328 3920 pyosmium_2.2.0-1.debian.tar.xz 4afc06c952a78489ad6809b1d27e466cdbd6bf4f 38910 pyosmium-doc_2.2.0-1_all.deb 4ac75c4ef3b5874356017d610730ef00cc9f59bb 37 python-pyosmium_2.2.0-1_amd64.deb 980d68801f99baa640541308fc866fdfd305bd09 378280 python3-pyosmium_2.2.0-1_amd64.deb Checksums-Sha256: 92c9514fe296e3d76cfddc29380cc1416c3db3781f5f35d49d79d926f7faa8cb 2341 pyosmium_2.2.0-1.dsc 31d3b11c3d4f14154c698a956dd0b431477e1a95af157d3344d7d72dfa0da1f7 24729 pyosmium_2.2.0.orig.tar.gz 59f01245a82979e499470a6965cf527473e27e7a574a098b85dc7f0a0ac86238 3920 pyosmium_2.2.0-1.debian.tar.xz 73969c8178c991f3779c5cb2bcf4a3d9d81819439f1f5a7e4da8371f961334fa 38910 pyosmium-doc_2.2.0-1_all.deb e566d4ff1c442cdfbd7e62d15ff2c01f22104ff1daad20c25f69b49f28cb8907 37 python-pyosmium_2.2.0-1_amd64.deb 5e56df4519dabb062c93dafaf256f33d4d274adaac0128174fa1d0e0518d168c 378280 python3-pyosmium_2.2.0-1_amd64.deb Files: 5d0ef737202c4b0efc75a23cb9c98105 2341 science optional pyosmium_2.2.0-1.dsc 2a160dfcf92712ae5e44737831b9b732 24729 science optional pyosmium_2.2.0.orig.tar.gz 9e6eee4720e21ada545b4f62ebc119df 3920 science optional pyosmium_2.2.0-1.debian.tar.xz f97cff72a630ae7811a517f7f257b882 38910 doc optional pyosmium-doc_2.2.0-1_all.deb 7a565b93ef22fc8587eaed2e28b83147 37 python optional python-pyosmium_2.2.0-1_amd64.deb 5b5fde5da85ee38ed7d5d42065c2cb3b 378280 python optional python3-pyosmium_2.2.0-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJVmBIIAAoJEGdQ8QrojUrxAvgP/0ppwAISDpVCXUi49A/EdXAl RpAx/XqY/vMg5Wj8mZK3CcYrWzuBbI+8oi8xrNid5hcx/G2U0M0ijyMGzTAHzWDX U7OT1WSZwtiqaAtJIp50kD7VmbYG/84YtRU2mgEfKaY9Ul1XqF2DpWfyTbUZJpH0 xYh55wLLW+ru+5tRS3QubXH4d//c6jFzHW4edzzNWotqufvUOJzVKnzZ4VQ16zet AsbvLTpsCxjbn2nF+OEJh/MQ3LTJsPdb1/7yhYKtI03TBi9Eitwh3Twe6D1cIXoP wGeeig/TXrCAOB9qcXJPVvhK9kg3KRKwH4nh6LuAM0S+Az65srlAdiUFpdJYh6Td gWUZvU2IEJp4magsnnVhrBaeFnw0stm9yspHvTtHs6DT8yViWrywKh81+HNE1PGu py6g/d3c8vk0KjdbeV4IvxiBedGah21kfAPH4rsvWr/oUZo59tnyVBkqGWIrsLZv 3KmBacSa6gRTqDieaSF6+5eN77YDW0L77CrlN1/U31RHPvElO4LU5yBSi0XckNB7 t6bLjiZAL5vZkK8UXbQJQe2fobeHUiX4MVBzcnfmqcICeDXGgWXJyOjHTflG+xoE fXXIxMNunFdxMwGH4vVmXX9XAKBRxTjcyzAHl0u6dXrL7R1XEKjiUknoR5exdJp3 ZME7LhGuWVnuhzIDq1Hq =n3gb -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 pyosmium_2.2.0-1_amd64.changes
pyosmium_2.2.0-1_amd64.changes uploaded successfully to localhost along with the files: pyosmium_2.2.0-1.dsc pyosmium_2.2.0.orig.tar.gz pyosmium_2.2.0-1.debian.tar.xz pyosmium-doc_2.2.0-1_all.deb python-pyosmium_2.2.0-1_amd64.deb python3-pyosmium_2.2.0-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] tag debian/2.2.0-1 created (now 399db68)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.2.0-1 in repository pyosmium. at 399db68 (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] 01/01: pristine-tar data for pyosmium_2.2.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository pyosmium. commit 4e171820039850d02b45df2353c2ca7c1ca3408f Author: Bas Couwenberg Date: Sat Jul 4 16:50:51 2015 +0200 pristine-tar data for pyosmium_2.2.0.orig.tar.gz --- pyosmium_2.2.0.orig.tar.gz.delta | Bin 0 -> 1907 bytes pyosmium_2.2.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/pyosmium_2.2.0.orig.tar.gz.delta b/pyosmium_2.2.0.orig.tar.gz.delta new file mode 100644 index 000..d20d5fb Binary files /dev/null and b/pyosmium_2.2.0.orig.tar.gz.delta differ diff --git a/pyosmium_2.2.0.orig.tar.gz.id b/pyosmium_2.2.0.orig.tar.gz.id new file mode 100644 index 000..07bd04c --- /dev/null +++ b/pyosmium_2.2.0.orig.tar.gz.id @@ -0,0 +1 @@ +6b38adddc1a4580a34e6421d1f151242bd5218e7 -- 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.2.0 created (now 1cbf846)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.2.0 in repository pyosmium. at 1cbf846 (tag) tagging 758d3810aa00929d24e5659c82ce76cf748771dc (commit) replaces upstream/2.1.0 tagged by Bas Couwenberg on Sat Jul 4 16:50:51 2015 +0200 - Log - Upstream version 2.2.0 Bas Couwenberg (1): Imported Upstream version 2.2.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/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 upstream updated (bbbc466 -> 758d381)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository pyosmium. from bbbc466 Imported Upstream version 2.1.0 new 758d381 Imported Upstream version 2.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md| 27 +++ README.md | 2 +- doc/conf.py | 4 ++-- setup.py| 2 +- test/test_io.py | 2 +- 5 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 CHANGELOG.md -- 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 399db68c8edd5095761cb3cc32b3f6b2bbb056dd Author: Bas Couwenberg Date: Sat Jul 4 17:12:02 2015 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b20def4..1570e08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -pyosmium (2.2.0-1) UNRELEASED; urgency=medium +pyosmium (2.2.0-1) unstable; urgency=medium * New upstream release. * Handle other extensions in filenamemangle. * Require at least libosmium version 2.2.0. - -- Bas Couwenberg Sat, 04 Jul 2015 16:51:02 +0200 + -- Bas Couwenberg Sat, 04 Jul 2015 17:11:47 +0200 pyosmium (2.1.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] branch pristine-tar updated (fc26697 -> 4e17182)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository pyosmium. from fc26697 pristine-tar data for pyosmium_2.1.0.orig.tar.gz new 4e17182 pristine-tar data for pyosmium_2.2.0.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: pyosmium_2.2.0.orig.tar.gz.delta | Bin 0 -> 1907 bytes pyosmium_2.2.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 pyosmium_2.2.0.orig.tar.gz.delta create mode 100644 pyosmium_2.2.0.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] 07/08: Add geom library to lintian overrides.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit 0e5b3743320d2d13b2cec6acae712adebe983eab Author: Bas Couwenberg Date: Sat Jul 4 18:41:05 2015 +0200 Add geom library to lintian overrides. --- 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 ffe2c93..4d6b6c0 100644 --- a/debian/python-pyosmium.lintian-overrides +++ b/debian/python-pyosmium.lintian-overrides @@ -6,5 +6,6 @@ # unprotected: read # unprotected: memcpy python-pyosmium: hardening-no-fortify-functions usr/lib/python2*/dist-packages/osmium/_osmium.*.so +python-pyosmium: hardening-no-fortify-functions usr/lib/python2*/dist-packages/osmium/geom/_geom.*.so python-pyosmium: hardening-no-fortify-functions usr/lib/python2*/dist-packages/osmium/io/_io.*.so diff --git a/debian/python3-pyosmium.lintian-overrides b/debian/python3-pyosmium.lintian-overrides index 53f71c4..aba115d 100644 --- a/debian/python3-pyosmium.lintian-overrides +++ b/debian/python3-pyosmium.lintian-overrides @@ -6,5 +6,6 @@ # unprotected: read # unprotected: memcpy python3-pyosmium: hardening-no-fortify-functions usr/lib/python3*/dist-packages/osmium/_osmium.*.so +python3-pyosmium: hardening-no-fortify-functions usr/lib/python3*/dist-packages/osmium/geom/_geom.*.so python3-pyosmium: hardening-no-fortify-functions usr/lib/python3*/dist-packages/osmium/io/_io.*.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] branch master updated (c6ff8f4 -> 399db68)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository pyosmium. from c6ff8f4 Set distribution to unstable. new 758d381 Imported Upstream version 2.2.0 new 28cd15f Merge tag 'upstream/2.2.0' new 5ce6e1c New upstream release. new a23d32b Handle other extensions in filenamemangle. new a5e150d Fix missing newline escape. new c7615de Require at least libosmium version 2.2.0. new 0e5b374 Add geom library to lintian overrides. new 399db68 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: CHANGELOG.md | 27 +++ README.md | 2 +- debian/changelog | 8 debian/control| 2 +- debian/python-pyosmium.lintian-overrides | 1 + debian/python3-pyosmium.lintian-overrides | 1 + debian/rules | 2 +- debian/watch | 2 +- doc/conf.py | 4 ++-- setup.py | 2 +- test/test_io.py | 2 +- 11 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 CHANGELOG.md -- 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: Merge tag 'upstream/2.2.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit 28cd15f435ce712b1bd6b2186b7162e0e899cd5f Merge: c6ff8f4 758d381 Author: Bas Couwenberg Date: Sat Jul 4 16:50:51 2015 +0200 Merge tag 'upstream/2.2.0' Upstream version 2.2.0 CHANGELOG.md| 27 +++ README.md | 2 +- doc/conf.py | 4 ++-- setup.py| 2 +- test/test_io.py | 2 +- 5 files changed, 32 insertions(+), 5 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
[pyosmium] 03/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 5ce6e1cde9636c66b8489e1da683e6ecd133ae50 Author: Bas Couwenberg Date: Sat Jul 4 16:54:06 2015 +0200 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9c4207d..a466897 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyosmium (2.2.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg Sat, 04 Jul 2015 16:51:02 +0200 + pyosmium (2.1.0-2) unstable; urgency=medium * Ignore test failures instead of failing the entire build. -- 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: Handle other extensions 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 a23d32be30e8f22dc0284d912155db367c1b4ea6 Author: Bas Couwenberg Date: Sat Jul 4 17:08:00 2015 +0200 Handle other extensions in filenamemangle. --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a466897..31d8e10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyosmium (2.2.0-1) UNRELEASED; urgency=medium * New upstream release. + * Handle other extensions in filenamemangle. -- Bas Couwenberg Sat, 04 Jul 2015 16:51:02 +0200 diff --git a/debian/watch b/debian/watch index 46ab49d..4593cff 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\.]*)\.tar\.gz/pyosmium-$1.tar.gz/ \ +filenamemangle=s/(?:.*)?v(\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] 06/08: Require at least libosmium version 2.2.0.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit c7615de1079c4f58e8205ed57edb3ddda165cfa2 Author: Bas Couwenberg Date: Sat Jul 4 18:02:04 2015 +0200 Require at least libosmium version 2.2.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 31d8e10..b20def4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pyosmium (2.2.0-1) UNRELEASED; urgency=medium * New upstream release. * Handle other extensions in filenamemangle. + * Require at least libosmium version 2.2.0. -- Bas Couwenberg Sat, 04 Jul 2015 16:51:02 +0200 diff --git a/debian/control b/debian/control index ac76428..426c3c9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), libexpat1-dev, libgdal-dev, libgeos++-dev, - libosmium2-dev, + libosmium2-dev (>= 2.2.0), libosmpbf-dev, libproj-dev, libprotobuf-dev, -- 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: Imported Upstream version 2.2.0
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pyosmium.
commit 758d3810aa00929d24e5659c82ce76cf748771dc
Author: Bas Couwenberg
Date: Sat Jul 4 16:50:50 2015 +0200
Imported Upstream version 2.2.0
---
CHANGELOG.md| 27 +++
README.md | 2 +-
doc/conf.py | 4 ++--
setup.py| 2 +-
test/test_io.py | 2 +-
5 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..893d83f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,27 @@
+
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [unreleased] -
+
+### Added
+
+### Changed
+
+### Fixed
+
+## [2.2.0] - 2015-07-04
+
+### Changed
+
+- Use current libosmium
+
+### Fixed
+
+- Exception not caught in test.
+
+[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/osmcode/pyosmium/compare/v2.1.0...v2.2.0
+
diff --git a/README.md b/README.md
index 3e6a983..494dcc8 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ The suite can be run with:
To build the documentation you need [Sphinx](http://sphinx-doc.org/).
On Debian/Ubuntu install `python-sphinx` or `python3-sphinx`.
-Then run:
+First compile the bindings as described above and then run:
cd doc
make html
diff --git a/doc/conf.py b/doc/conf.py
index 883b890..a21216b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -63,9 +63,9 @@ copyright = '2015, Sarah Hoffmann'
# built documents.
#
# The short X.Y version.
-version = '2.1'
+version = '2.2'
# The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2.2.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index ff55d46..29058ae 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ for ext in ('io', 'osm', 'index', 'geom'):
setup (name = 'pyosmium',
- version = '0.1',
+ version = '2.2.0',
description = 'Provides python bindings for libosmium.',
packages = packages,
ext_modules = extensions)
diff --git a/test/test_io.py b/test/test_io.py
index 91db118..f9435d0 100644
--- a/test/test_io.py
+++ b/test/test_io.py
@@ -43,7 +43,7 @@ class TestReaderFromFile(unittest.TestCase):
rd = o.io.Reader(fn)
with assert_raises(ValueError):
o.apply(rd, o.SimpleHandler())
-rd.close()
+rd.close()
finally:
os.remove(fn)
--
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: Fix missing newline escape.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pyosmium. commit a5e150d5c5676c082060eca3420373f9bf381922 Author: Bas Couwenberg Date: Sat Jul 4 17:58:41 2015 +0200 Fix missing newline escape. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8d381f1..db232d8 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ export PYBUILD_NAME=pyosmium %: dh $@ \ --buildsystem pybuild \ - --with python2,python3 + --with python2,python3 \ --parallel override_dh_clean: -- 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
Bug#790524: src:gmt: takes over files from several unrelated packages (was: Re: gmt: libgenome-perl in sid already provides /usr/bin/gmt)
Am Freitag, 3. Juli 2015, 22:11:49 schrieb Sebastiaan Couwenberg: > > * libpsl-dev > > > > [...] > > > > Filelist libpsl-dev vs. libgmt-dev: > > > > usr/lib/x86_64-linux-gnu/libpsl.so > > The libpsl & gmt packages use different a SONAME. To ensure dependencies > on the GMT libpsl it's bundled with libgmt in the libgmt5 package. > > To resolve the conflict I'm considering renaming the GMT libpsl to > libgmt-psl. > > I've CC'ed the libpsl maintainers, and I would like to ask your opinion > on this conflict too. Hi Sebastiaan. IMO, renaming GMT libpsl to libgmt-psl seems reasonable to me. It is a step towards a cleaner library 'namespacing' regarding GMT. If it comes to renaming the non-GMT file (and/or package), I won't be reluctant. You'll have a good reason than. BTW, I could not CC this mail to Daniel Kahn Gillmor , that's why I took him out of the recipient list. Regards, Tim signature.asc Description: This is a digitally signed message part. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#790524: src:gmt: takes over files from several unrelated packages (was: Re: gmt: libgenome-perl in sid already provides /usr/bin/gmt)
Hi again, I was able to commit[1] a fix for this bug. I'd like to wait for a confirmation of a Perl Group member whether this is OK for a team upload or whether this is to less Perl-ish and rather Debian-Med-ish. I'm fine with moving the package to Debian Med or uploading on behalf of the perl team - whatever you prefer. For those who did not followed the discussion see the link below for an explanation what was done here. Kind regards Andreas. On Sat, Jul 04, 2015 at 04:40:58PM +0200, Andreas Tille wrote: > Hi Bas, > > On Sat, Jul 04, 2015 at 03:02:15PM +0200, Sebastiaan Couwenberg wrote: > OK, I just documented the way to deal with name space pollution in > Blends at > > http://blends.debian.org/blends/ch06.html#namespace > > I hope this might become useful at one day also in other Blends. [1] https://anonscm.debian.org/cgit/pkg-perl/packages/libgenome-perl.git/commit/?id=205ec3992bde59d9f59870218e68cf9964d60a1a -- http://fam-tille.de ___ 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] 11/11: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit e793e68437a1abf0dd07082c37daac1ae53210f8 Author: Bas Couwenberg Date: Sat Jul 4 16:40:55 2015 +0200 New upstream release. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a760ccf..4931278 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -osmium-tool (1.1.0-1) unstable; urgency=medium +osmium-tool (1.1.1-1) UNRELEASED; urgency=medium * New upstream release. * Add license & copyright for RapidJSON includes. @@ -6,7 +6,7 @@ osmium-tool (1.1.0-1) unstable; urgency=medium * Require at least libosmium version 2.2.0. * Add lintian override for license-problem-json-evil false positive. - -- Bas Couwenberg Sat, 04 Jul 2015 16:37:28 +0200 + -- Bas Couwenberg Sat, 04 Jul 2015 16:40:25 +0200 osmium-tool (1.0.1-2) 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] 08/11: 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 4da6501be7053021d9b3ed9830dc8884d5480347 Author: Bas Couwenberg Date: Sat Jul 4 16:37:42 2015 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d29f126..a760ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -osmium-tool (1.1.0-1) UNRELEASED; urgency=medium +osmium-tool (1.1.0-1) unstable; urgency=medium * New upstream release. * Add license & copyright for RapidJSON includes. @@ -6,7 +6,7 @@ osmium-tool (1.1.0-1) UNRELEASED; urgency=medium * Require at least libosmium version 2.2.0. * Add lintian override for license-problem-json-evil false positive. - -- Bas Couwenberg Sat, 04 Jul 2015 15:06:14 +0200 + -- Bas Couwenberg Sat, 04 Jul 2015 16:37:28 +0200 osmium-tool (1.0.1-2) 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] annotated tag upstream/1.1.1 created (now a714186)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.1.1 in repository osmium-tool. at a714186 (tag) tagging 41f01ee0ccb37bf8a0673d11b32660d41993166b (commit) replaces upstream/1.1.0 tagged by Bas Couwenberg on Sat Jul 4 16:39:45 2015 +0200 - Log - Upstream version 1.1.1 Bas Couwenberg (1): Imported Upstream version 1.1.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/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] annotated tag upstream/1.1.0 created (now 6838560)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.1.0 in repository osmium-tool. at 6838560 (tag) tagging f61facd0d9e1c6d105577a856984d708c6a37761 (commit) replaces upstream/1.0.1 tagged by Bas Couwenberg on Sat Jul 4 15:05:59 2015 +0200 - Log - Upstream version 1.1.0 Bas Couwenberg (1): Imported Upstream version 1.1.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/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] 09/11: Imported Upstream version 1.1.1
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit 41f01ee0ccb37bf8a0673d11b32660d41993166b
Author: Bas Couwenberg
Date: Sat Jul 4 16:39:44 2015 +0200
Imported Upstream version 1.1.1
---
CHANGELOG.md | 13 +++-
CMakeLists.txt | 2 +-
src/command_fileinfo.cpp | 4 +-
zsh_completion/_osmium | 162 +--
4 files changed, 85 insertions(+), 96 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c13733..ad77ad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,14 @@ This project adheres to [Semantic
Versioning](http://semver.org/).
### Fixed
+## [1.1.1] - 2015-07-04
+
+### Fixed
+
+- Osmium fileinfo --show-variables didn't work properly.
+- Improved zsh autocompletion
+
+
## [1.1.0] - 2015-07-04
### Added
@@ -47,7 +55,8 @@ This project adheres to [Semantic
Versioning](http://semver.org/).
- Minor updates to documentation and build system
-[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.1.0...HEAD
-[1.0.1]: https://github.com/osmcode/osmium-tool/compare/v1.0.1...v1.1.0
+[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.1.1...HEAD
+[1.1.1]: https://github.com/osmcode/osmium-tool/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/osmcode/osmium-tool/compare/v1.0.1...v1.1.0
[1.0.1]: https://github.com/osmcode/osmium-tool/compare/v1.0.0...v1.0.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc0efa1..8b1c776 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ project(osmium)
set(OSMIUM_VERSION_MAJOR 1)
set(OSMIUM_VERSION_MINOR 1)
-set(OSMIUM_VERSION_PATCH 0)
+set(OSMIUM_VERSION_PATCH 1)
set(OSMIUM_VERSION
${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERSION_PATCH})
diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index 9597232..462c33e 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -506,8 +506,6 @@ bool CommandFileinfo::setup(const std::vector&
arguments) {
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(),
vm);
po::notify(vm);
-setup_input_file(vm);
-
if (vm.count("extended")) {
m_extended = true;
}
@@ -547,6 +545,8 @@ bool CommandFileinfo::setup(const std::vector&
arguments) {
if (vm.count("show-variables")) {
std::copy(known_values.cbegin(), known_values.cend(),
std::ostream_iterator(std::cout, "\n"));
return false;
+} else {
+setup_input_file(vm);
}
if (vm.count("get")) {
diff --git a/zsh_completion/_osmium b/zsh_completion/_osmium
index 6c4615d..d6d4c1c 100644
--- a/zsh_completion/_osmium
+++ b/zsh_completion/_osmium
@@ -33,132 +33,108 @@ _osmium() {
fi
}
+_osmium-common-options() {
+echo '(--verbose)-v[set verbose mode]'
+echo '(-v)--verbose[set verbose mode]'
+}
+
+_osmium-single-input-options() {
+echo '(--input-format)-F[format of input OSM file]:OSM file
format:_osmium_file_formats'
+echo '(-F)--input-format[format of input OSM file]:OSM file
format:_osmium_file_formats'
+echo "1:input OSM files:_files -g ${osmium_file_glob}"
+}
+
+_osmium-multiple-inputs-options() {
+echo '(--input-format)-F[format of input OSM files]:OSM file
format:_osmium_file_formats'
+echo '(-F)--input-format[format of input OSM files]:OSM file
format:_osmium_file_formats'
+echo "*:input OSM files:_files -g ${osmium_file_glob}"
+}
+
+_osmium-output-options() {
+echo '--generator[generator setting for output file header]:generator:'
+echo "(--output)-o[output file name]:output OSM file:_files -g
${osmium_file_glob}"
+echo "(-o)--output[output file name]:output OSM file:_files -g
${osmium_file_glob}"
+echo '(--output-format)-f[format of output OSM file]:OSM file
format:_osmium_file_formats'
+echo '(-f)--output-format[format of output OSM file]:OSM file
format:_osmium_file_formats'
+echo '(--overwrite)-O[allow overwriting of existing output file]'
+echo '(-O)--overwrite[allow overwriting of existing output file]'
+}
+
_osmium-apply-changes() {
_arguments : \
-'--generator[generator setting for output file header]:generator:' \
-'(--input-format)-F[format of input OSM file(s)]:OSM file
format:_osmium_file_formats' \
-'(-F)--input-format[format of input OSM file(s)]:OSM file
format:_osmium_file_formats' \
-"(--output)-o[output file name]:output OSM file:_files -g
${osmium_file_glob}" \
-"(-o)--output[output file name]:output OSM file:_files -g
${osmium_file_glob}" \
-'(--output-format)-f[format of output OSM file]:OSM file
format:_osmium_file_formats' \
-'(-f)--output-format[format of output OSM file]:OSM file
format:_osmium_file_formats' \
-'(--overwrite)-O[allow overwriting of existing output file]' \
-'(-O)--overwrite[allow overwriting of
[osmium-tool] 02/02: pristine-tar data for osmium-tool_1.1.1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository osmium-tool. commit ff7769858cb9e691aa97eca274e35b1a8d8cf1cc Author: Bas Couwenberg Date: Sat Jul 4 16:39:45 2015 +0200 pristine-tar data for osmium-tool_1.1.1.orig.tar.gz --- osmium-tool_1.1.1.orig.tar.gz.delta | Bin 0 -> 5163 bytes osmium-tool_1.1.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osmium-tool_1.1.1.orig.tar.gz.delta b/osmium-tool_1.1.1.orig.tar.gz.delta new file mode 100644 index 000..9fa42c9 Binary files /dev/null and b/osmium-tool_1.1.1.orig.tar.gz.delta differ diff --git a/osmium-tool_1.1.1.orig.tar.gz.id b/osmium-tool_1.1.1.orig.tar.gz.id new file mode 100644 index 000..a92d654 --- /dev/null +++ b/osmium-tool_1.1.1.orig.tar.gz.id @@ -0,0 +1 @@ +d531259fb68df2f7434bf43b9ff10f59f5e15772 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmium-tool] 04/11: Add license & copyright for RapidJSON includes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit bb3b11f27f72065ae9bdff64c092a1a957ab35ef Author: Bas Couwenberg Date: Sat Jul 4 16:02:19 2015 +0200 Add license & copyright for RapidJSON includes. --- debian/changelog | 1 + debian/copyright | 54 ++ 2 files changed, 55 insertions(+) diff --git a/debian/changelog b/debian/changelog index 55b60e1..d3195cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ osmium-tool (1.1.0-1) UNRELEASED; urgency=medium * New upstream release. + * Add license & copyright for RapidJSON includes. -- Bas Couwenberg Sat, 04 Jul 2015 15:06:14 +0200 diff --git a/debian/copyright b/debian/copyright index f296594..6bb82ca 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,6 +7,15 @@ Files: * Copyright: 2013-2015, Jochen Topf License: GPL-3+ +Files: include/rapidjson/* +Copyright: 2015, THL A29 Limited, a Tencent company, and Milo Yip +License: MIT + +Files: include/rapidjson/msinttypes/inttypes.h + include/rapidjson/msinttypes/stdint.h +Copyright: 2006-2013, Alexander Chemeris +License: BSD-3-Clause + Files: debian/* Copyright: © 2015, Bas Couwenberg License: GPL-2+ @@ -44,3 +53,48 @@ License: GPL-3+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + 3. Neither the name of the product nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + -- 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] 10/11: Merge tag 'upstream/1.1.1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 99a9001a9090463299727c29036d07481796a479 Merge: 4da6501 41f01ee Author: Bas Couwenberg Date: Sat Jul 4 16:39:45 2015 +0200 Merge tag 'upstream/1.1.1' Upstream version 1.1.1 CHANGELOG.md | 13 +++- CMakeLists.txt | 2 +- src/command_fileinfo.cpp | 4 +- zsh_completion/_osmium | 162 +-- 4 files changed, 85 insertions(+), 96 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmium-tool] 07/11: Add lintian override for license-problem-json-evil false positive.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 8f900ba0eac9a9cf705099b2bf60ecc4d679321c Author: Bas Couwenberg Date: Sat Jul 4 16:37:10 2015 +0200 Add lintian override for license-problem-json-evil false positive. --- debian/changelog| 1 + debian/source.lintian-overrides | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b30eab..d29f126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ osmium-tool (1.1.0-1) UNRELEASED; urgency=medium * Add license & copyright for RapidJSON includes. * Drop reproducible-build.patch, fixed upstream. * Require at least libosmium version 2.2.0. + * Add lintian override for license-problem-json-evil false positive. -- Bas Couwenberg Sat, 04 Jul 2015 15:06:14 +0200 diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 000..24f1a0a --- /dev/null +++ b/debian/source.lintian-overrides @@ -0,0 +1,3 @@ +# False positive, only the MIT & BSD-3-Clause licensed parts of RapidJSON are +# included in the osmium-tool source. +osmium-tool source: license-problem-json-evil LICENSE-rapidjson.txt -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmium-tool] 05/11: Drop reproducible-build.patch, fixed 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 b378cd179f39a8a260a2e5c2882e7e8fa3aa0c18
Author: Bas Couwenberg
Date: Sat Jul 4 16:11:05 2015 +0200
Drop reproducible-build.patch, fixed upstream.
---
debian/changelog| 1 +
debian/patches/reproducible-build.patch | 17 -
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d3195cc..bc77603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ osmium-tool (1.1.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Add license & copyright for RapidJSON includes.
+ * Drop reproducible-build.patch, fixed upstream.
-- Bas Couwenberg Sat, 04 Jul 2015 15:06:14 +0200
diff --git a/debian/patches/reproducible-build.patch
b/debian/patches/reproducible-build.patch
deleted file mode 100644
index 2564708..000
--- a/debian/patches/reproducible-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Make build reproducible by setting the date embedded in man pages.
-Author: Chris Lamb
-Bug-Debian: https://bugs.debian.org/790087
-Forwarded: not-needed
-
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -101,7 +101,8 @@ endfunction()
- if(PANDOC)
- message(STATUS "Looking for pandoc - found")
- message(STATUS " Manual pages will be built")
--execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE
OUTPUT_STRIP_TRAILING_WHITESPACE)
-+execute_process(COMMAND dpkg-parsechangelog -SDate OUTPUT_VARIABLE
DEBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-+execute_process(COMMAND env LC_ALL=C date --utc --date ${DEBDATE}
"+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(PANDOC_MAN_OPTIONS
- -s
- -t man
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 55077d0..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-reproducible-build.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
[osmium-tool] 06/11: Require at least libosmium version 2.2.0.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 327ab17a5322433d36c099fc8c1e4eabe2f72437 Author: Bas Couwenberg Date: Sat Jul 4 16:16:37 2015 +0200 Require at least libosmium version 2.2.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bc77603..0b30eab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ osmium-tool (1.1.0-1) UNRELEASED; urgency=medium * New upstream release. * Add license & copyright for RapidJSON includes. * Drop reproducible-build.patch, fixed upstream. + * Require at least libosmium version 2.2.0. -- Bas Couwenberg Sat, 04 Jul 2015 15:06:14 +0200 diff --git a/debian/control b/debian/control index 4cd94eb..a7f3edb 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), libboost-program-options-dev, libbz2-dev, libexpat1-dev, - libosmium2-dev, + libosmium2-dev (>= 2.2.0), libosmpbf-dev, libprotobuf-dev, protobuf-compiler, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmium-tool] branch upstream updated (7a5015d -> 41f01ee)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository osmium-tool.
from 7a5015d Imported Upstream version 1.0.1
new f61facd Imported Upstream version 1.1.0
new 41f01ee Imported Upstream version 1.1.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 | 77 +-
.ycm_extra_conf.py |2 +
CHANGELOG.md | 46 +-
CMakeLists.txt | 44 +-
LICENSE-rapidjson.txt| 57 +
appveyor.yml | 42 +-
cmake/FindOsmium.cmake |2 +-
cmake/run_test_compare_output.cmake | 66 +
include/rapidjson/allocators.h | 261 +++
include/rapidjson/document.h | 2039 ++
include/rapidjson/encodedstream.h| 261 +++
include/rapidjson/encodings.h| 625 +++
include/rapidjson/error/en.h | 65 +
include/rapidjson/error/error.h | 146 ++
include/rapidjson/filereadstream.h | 88 +
include/rapidjson/filewritestream.h | 91 +
include/rapidjson/internal/biginteger.h | 280 +++
include/rapidjson/internal/diyfp.h | 247 +++
include/rapidjson/internal/dtoa.h| 217 +++
include/rapidjson/internal/ieee754.h | 77 +
include/rapidjson/internal/itoa.h| 304
include/rapidjson/internal/meta.h| 181 ++
include/rapidjson/internal/pow10.h | 55 +
include/rapidjson/internal/stack.h | 179 ++
include/rapidjson/internal/strfunc.h | 39 +
include/rapidjson/internal/strtod.h | 270 +++
include/rapidjson/memorybuffer.h | 70 +
include/rapidjson/memorystream.h | 61 +
include/rapidjson/msinttypes/inttypes.h | 316
include/rapidjson/msinttypes/stdint.h| 300
include/rapidjson/pointer.h | 1313 ++
include/rapidjson/prettywriter.h | 207 +++
include/rapidjson/rapidjson.h| 654 +++
include/rapidjson/reader.h | 1452 +++
include/rapidjson/stringbuffer.h | 93 +
include/rapidjson/writer.h | 395 +
man/manpage.template |3 +-
man/osmium-check-refs.md | 65 +
man/osmium-fileinfo.md | 61 +-
man/{osmium-merge-changes.md => osmium-getid.md} | 23 +-
man/osmium-renumber.md | 102 ++
scripts/travis_install.sh| 15 +
scripts/travis_script.sh | 31 +
src/command_apply_changes.cpp| 159 +-
src/command_apply_changes.hpp| 15 +-
src/command_cat.cpp | 144 +-
src/command_cat.hpp | 14 +-
src/command_check_refs.cpp | 269 +++
src/{command_help.hpp => command_check_refs.hpp} | 19 +-
src/command_fileinfo.cpp | 577 +-
src/command_fileinfo.hpp |9 +-
src/command_getid.cpp| 187 ++
src/{command_fileinfo.hpp => command_getid.hpp} | 27 +-
src/command_help.cpp | 35 +-
src/command_merge_changes.cpp| 107 +-
src/command_merge_changes.hpp| 16 +-
src/command_renumber.cpp | 244 +++
src/command_renumber.hpp | 76 +
src/command_time_filter.cpp | 146 +-
src/command_time_filter.hpp | 17 +-
src/main.cpp | 11 +-
src/osmc.hpp | 199 ++-
test/CMakeLists.txt | 57 +
test/cat/CMakeLists.txt | 19 +
test/cat/input1.osm |6 +
test/cat/input2.osm |6 +
test/cat/output-cat12.osm|9 +
test/cat/output-cat21.osm|9 +
test/check-refs/CMakeLists.txt | 13 +
test/check-refs/nw-okay.osm | 15 +
test/check-refs/nwr-okay.osm | 15 +
test/fileinfo/CMakeLists.txt | 18 +
test/fileinfo/fi1-result.txt | 27 +
test/filein
[osmium-tool] 01/02: pristine-tar data for osmium-tool_1.1.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository osmium-tool. commit 5b6ac35881fccec82bbfe9cde333031d4850abb5 Author: Bas Couwenberg Date: Sat Jul 4 15:05:59 2015 +0200 pristine-tar data for osmium-tool_1.1.0.orig.tar.gz --- osmium-tool_1.1.0.orig.tar.gz.delta | Bin 0 -> 5137 bytes osmium-tool_1.1.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osmium-tool_1.1.0.orig.tar.gz.delta b/osmium-tool_1.1.0.orig.tar.gz.delta new file mode 100644 index 000..fa02b6f Binary files /dev/null and b/osmium-tool_1.1.0.orig.tar.gz.delta differ diff --git a/osmium-tool_1.1.0.orig.tar.gz.id b/osmium-tool_1.1.0.orig.tar.gz.id new file mode 100644 index 000..546817f --- /dev/null +++ b/osmium-tool_1.1.0.orig.tar.gz.id @@ -0,0 +1 @@ +f7dd933746399aab78d39705478718a73c6dd219 -- 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 pristine-tar updated (415dbac -> ff77698)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository osmium-tool. from 415dbac pristine-tar data for osmium-tool_1.0.1.orig.tar.gz new 5b6ac35 pristine-tar data for osmium-tool_1.1.0.orig.tar.gz new ff77698 pristine-tar data for osmium-tool_1.1.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: osmium-tool_1.1.0.orig.tar.gz.delta | Bin 0 -> 5137 bytes osmium-tool_1.1.0.orig.tar.gz.id| 1 + osmium-tool_1.1.1.orig.tar.gz.delta | Bin 0 -> 5163 bytes osmium-tool_1.1.1.orig.tar.gz.id| 1 + 4 files changed, 2 insertions(+) create mode 100644 osmium-tool_1.1.0.orig.tar.gz.delta create mode 100644 osmium-tool_1.1.0.orig.tar.gz.id create mode 100644 osmium-tool_1.1.1.orig.tar.gz.delta create mode 100644 osmium-tool_1.1.1.orig.tar.gz.id -- 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] 02/11: Merge tag 'upstream/1.1.0'
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit 2067121b7904348878caf2189a6509f675017402
Merge: 4415231 f61facd
Author: Bas Couwenberg
Date: Sat Jul 4 15:05:59 2015 +0200
Merge tag 'upstream/1.1.0'
Upstream version 1.1.0
.travis.yml| 77 +-
.ycm_extra_conf.py |2 +
CHANGELOG.md | 37 +-
CMakeLists.txt | 46 +-
LICENSE-rapidjson.txt | 57 +
appveyor.yml | 42 +-
cmake/FindOsmium.cmake |2 +-
cmake/run_test_compare_output.cmake| 66 +
include/rapidjson/allocators.h | 261 +++
include/rapidjson/document.h | 2039
include/rapidjson/encodedstream.h | 261 +++
include/rapidjson/encodings.h | 625 ++
include/rapidjson/error/en.h | 65 +
include/rapidjson/error/error.h| 146 ++
include/rapidjson/filereadstream.h | 88 +
include/rapidjson/filewritestream.h| 91 +
include/rapidjson/internal/biginteger.h| 280 +++
include/rapidjson/internal/diyfp.h | 247 +++
include/rapidjson/internal/dtoa.h | 217 +++
include/rapidjson/internal/ieee754.h | 77 +
include/rapidjson/internal/itoa.h | 304 +++
include/rapidjson/internal/meta.h | 181 ++
include/rapidjson/internal/pow10.h | 55 +
include/rapidjson/internal/stack.h | 179 ++
include/rapidjson/internal/strfunc.h | 39 +
include/rapidjson/internal/strtod.h| 270 +++
include/rapidjson/memorybuffer.h | 70 +
include/rapidjson/memorystream.h | 61 +
include/rapidjson/msinttypes/inttypes.h| 316 +++
include/rapidjson/msinttypes/stdint.h | 300 +++
include/rapidjson/pointer.h| 1313 +
include/rapidjson/prettywriter.h | 207 ++
include/rapidjson/rapidjson.h | 654 +++
include/rapidjson/reader.h | 1452 ++
include/rapidjson/stringbuffer.h | 93 +
include/rapidjson/writer.h | 395
man/manpage.template |3 +-
man/osmium-check-refs.md | 65 +
man/osmium-fileinfo.md | 61 +-
man/osmium-getid.md| 65 +
man/osmium-renumber.md | 102 +
scripts/travis_install.sh | 15 +
scripts/travis_script.sh | 31 +
src/command_apply_changes.cpp | 159 +-
src/command_apply_changes.hpp | 15 +-
src/command_cat.cpp| 144 +-
src/command_cat.hpp| 14 +-
src/command_check_refs.cpp | 269 +++
...command_fileinfo.hpp => command_check_refs.hpp} | 22 +-
src/command_fileinfo.cpp | 577 +-
src/command_fileinfo.hpp |9 +-
src/command_getid.cpp | 187 ++
src/{command_fileinfo.hpp => command_getid.hpp}| 27 +-
src/command_help.cpp | 35 +-
src/command_merge_changes.cpp | 107 +-
src/command_merge_changes.hpp | 16 +-
src/command_renumber.cpp | 244 +++
src/command_renumber.hpp | 76 +
src/command_time_filter.cpp| 146 +-
src/command_time_filter.hpp| 17 +-
src/main.cpp | 11 +-
src/osmc.hpp | 199 +-
test/CMakeLists.txt| 57 +
test/cat/CMakeLists.txt| 19 +
test/cat/input1.osm|6 +
test/cat/input2.osm|6 +
test/cat/output-cat12.osm |9 +
test/cat/output-cat21.osm |9 +
test/check-refs/CMakeLists.txt | 13 +
test/check-refs/nw-okay.osm| 15 +
test/check-refs/nwr-okay.osm | 15 +
test/fileinfo/CMakeLists.txt | 18 +
test/fileinfo/fi1-result.txt | 27 +
test/fileinfo/fi1.osm |6 +
test/getid/CMakeLists.txt
[osmium-tool] 03/11: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool. commit 332fd75db0c62462d2b910c4052c23734330a3ff Author: Bas Couwenberg Date: Sat Jul 4 15:06:15 2015 +0200 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e619178..55b60e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmium-tool (1.1.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg Sat, 04 Jul 2015 15:06:14 +0200 + osmium-tool (1.0.1-2) unstable; urgency=medium * Add patch by Chris Lamb for reproducible build. -- 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 (4415231 -> e793e68)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository osmium-tool.
from 4415231 Set distribution to unstable.
new f61facd Imported Upstream version 1.1.0
new 2067121 Merge tag 'upstream/1.1.0'
new 332fd75 New upstream release.
new bb3b11f Add license & copyright for RapidJSON includes.
new b378cd1 Drop reproducible-build.patch, fixed upstream.
new 327ab17 Require at least libosmium version 2.2.0.
new 8f900ba Add lintian override for license-problem-json-evil false
positive.
new 4da6501 Set distribution to unstable.
new 41f01ee Imported Upstream version 1.1.1
new 99a9001 Merge tag 'upstream/1.1.1'
new e793e68 New upstream release.
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 77 +-
.ycm_extra_conf.py |2 +
CHANGELOG.md | 46 +-
CMakeLists.txt | 44 +-
LICENSE-rapidjson.txt| 57 +
appveyor.yml | 42 +-
cmake/FindOsmium.cmake |2 +-
cmake/run_test_compare_output.cmake | 66 +
debian/changelog | 10 +
debian/control |2 +-
debian/copyright | 54 +
debian/patches/reproducible-build.patch | 17 -
debian/patches/series|1 -
debian/source.lintian-overrides |3 +
include/rapidjson/allocators.h | 261 +++
include/rapidjson/document.h | 2039 ++
include/rapidjson/encodedstream.h| 261 +++
include/rapidjson/encodings.h| 625 +++
include/rapidjson/error/en.h | 65 +
include/rapidjson/error/error.h | 146 ++
include/rapidjson/filereadstream.h | 88 +
include/rapidjson/filewritestream.h | 91 +
include/rapidjson/internal/biginteger.h | 280 +++
include/rapidjson/internal/diyfp.h | 247 +++
include/rapidjson/internal/dtoa.h| 217 +++
include/rapidjson/internal/ieee754.h | 77 +
include/rapidjson/internal/itoa.h| 304
include/rapidjson/internal/meta.h| 181 ++
include/rapidjson/internal/pow10.h | 55 +
include/rapidjson/internal/stack.h | 179 ++
include/rapidjson/internal/strfunc.h | 39 +
include/rapidjson/internal/strtod.h | 270 +++
include/rapidjson/memorybuffer.h | 70 +
include/rapidjson/memorystream.h | 61 +
include/rapidjson/msinttypes/inttypes.h | 316
include/rapidjson/msinttypes/stdint.h| 300
include/rapidjson/pointer.h | 1313 ++
include/rapidjson/prettywriter.h | 207 +++
include/rapidjson/rapidjson.h| 654 +++
include/rapidjson/reader.h | 1452 +++
include/rapidjson/stringbuffer.h | 93 +
include/rapidjson/writer.h | 395 +
man/manpage.template |3 +-
man/osmium-check-refs.md | 65 +
man/osmium-fileinfo.md | 61 +-
man/{osmium-merge-changes.md => osmium-getid.md} | 23 +-
man/osmium-renumber.md | 102 ++
scripts/travis_install.sh| 15 +
scripts/travis_script.sh | 31 +
src/command_apply_changes.cpp| 159 +-
src/command_apply_changes.hpp| 15 +-
src/command_cat.cpp | 144 +-
src/command_cat.hpp | 14 +-
src/command_check_refs.cpp | 269 +++
src/{command_help.hpp => command_check_refs.hpp} | 19 +-
src/command_fileinfo.cpp | 577 +-
src/command_fileinfo.hpp |9 +-
src/command_getid.cpp| 187 ++
src/{command_fileinfo.hpp => command_getid.hpp} | 27 +-
src/command_help.cpp | 35 +-
src/command_merge_changes.cpp| 107 +-
src/command_merge_changes.hpp| 16 +-
src/command_renumber.cpp | 244 +++
src/command_renumber.hpp | 76 +
src/command_time_f
Bug#790524: src:gmt: takes over files from several unrelated packages (was: Re: gmt: libgenome-perl in sid already provides /usr/bin/gmt)
Hi Bas, On Sat, Jul 04, 2015 at 03:02:15PM +0200, Sebastiaan Couwenberg wrote: > > If you agree to this solution I'll upload it that way. > > Yes, please. OK, I just documented the way to deal with name space pollution in Blends at http://blends.debian.org/blends/ch06.html#namespace I hope this might become useful at one day also in other Blends. > I'm not sure. But I'm a member of the Perl team too, so if you can't > commit yourself I'm willing to do that too. I'll try and let you know. Kind regards Andreas. -- http://fam-tille.de ___ 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.2.0-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 04 Jul 2015 14:28:28 +0200 Source: libosmium Binary: libosmium2-dev libosmium2-doc Architecture: source amd64 all Version: 2.2.0-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project Changed-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.2.0-1) unstable; urgency=medium . * New upstream release. * Drop reproducible-build.patch, applied upstream. Checksums-Sha1: d2d69adb650a20dab818e8a94e336ae30d518ec1 2194 libosmium_2.2.0-1.dsc c66d663f7661119bdeb947a6a1fdc6f5dae2c8e8 366110 libosmium_2.2.0.orig.tar.gz 5f5ff65cbbfa8f6e91befa77f0121c336feaf967 4336 libosmium_2.2.0-1.debian.tar.xz 9df1e73a7e9391f71ed4927c94e6ddc556348165 130332 libosmium2-dev_2.2.0-1_amd64.deb 9f5d195c1842e013fdd71025c385a70cead09be8 32698800 libosmium2-doc_2.2.0-1_all.deb Checksums-Sha256: ee54a4edea18e7196d271d4a1e9a7df59a7d9560fea4b51cb6081c1c449ffb3e 2194 libosmium_2.2.0-1.dsc 5940a8b848b5651b4fe0f958c2947986dc231ce8347cfeb795ac86e973fb0024 366110 libosmium_2.2.0.orig.tar.gz d5879d96e050e3f24a1e2d79d9a8bd3a63cb68b554898fdea59dba1792856228 4336 libosmium_2.2.0-1.debian.tar.xz 8916099771526a8c633f8df0359a1df3167fb1e990b0ef1d174ab3b456cf 130332 libosmium2-dev_2.2.0-1_amd64.deb abe395658ca8f3a566ffb46a57888b0d0538284d57059e4e12ef2e03725db9e4 32698800 libosmium2-doc_2.2.0-1_all.deb Files: 6d0fd9bd1cd30d90cdd1002c9a3c5603 2194 science optional libosmium_2.2.0-1.dsc e26921811af7febd24785557fb07074b 366110 science optional libosmium_2.2.0.orig.tar.gz ac9a21e23871885698299de1a8cbe586 4336 science optional libosmium_2.2.0-1.debian.tar.xz 76cba06ee6607014389ac1fbfd497255 130332 libdevel optional libosmium2-dev_2.2.0-1_amd64.deb dc3da499d4e1af5b08bfc4e17f0f37c4 32698800 doc optional libosmium2-doc_2.2.0-1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJVl9bnAAoJEGdQ8QrojUrxv8MQAMBt3dEcJLUWdezqoqBDoqs8 +gD1znDR5C5C/UZJvr0W2KPaCu+yMVDZ6GwkS2wbFDZDVvNJmuGrlAj7FKgwilM4 pXXmZQgQSJRjl1d8+t10girQqNrdMjoVY3WRVeTp/Vl43KL66jcEN/mNohFLqQhg 9kgkuGZt86mQGNL8/yM4E2/uDswkdN+2N6ha0op4P1my77xjOK/6byyPD7EVe8rm VzDtirCh7FbxFZZeDtaL8ONMECyZCgZOhDgy1GYMrhjLBQ8RQTo2A0kiOH3daXrh Yd5onrG7HBhqE0mEbjla1Dytge0KoRfRXXGnSRF2XJvnmpco/+QNRmXQQfO0im3y hCHLbDcR0IVjzk6eDMJrZ+vgegJlBr5bRzXUtcFQIiB0EuDCzc2s94+YwgTjoUSJ 6ebV5DKaFnXCyvj1CS2MmvsbqsMiZEZOk04Ul89Mc+mNQo/hgToSbUiyWc+gPH8N foSJ7kMzwqEmONvu5ZeeWpkiMKPI8zJjCzwVOXwUpUpa3/k55ONQQmoL/hkPm5QT sNcV0as6nww1RRT6IRmLj4E8TrNNshzxa99HL2Tj1AesO6aZ8yA12eJOineC0Wxh XnFLCDSqi1+9vTIp3s2uYW4HrL1AAVv79jGO9eNc2htplN7E1KRKcDH6rFdiSgRJ phLd9PLZsYnvvx5jmNQ0 =a3gx -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 libosmium_2.2.0-1_amd64.changes
libosmium_2.2.0-1_amd64.changes uploaded successfully to localhost along with the files: libosmium_2.2.0-1.dsc libosmium_2.2.0.orig.tar.gz libosmium_2.2.0-1.debian.tar.xz libosmium2-dev_2.2.0-1_amd64.deb libosmium2-doc_2.2.0-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
Bug#790524: src:gmt: takes over files from several unrelated packages (was: Re: gmt: libgenome-perl in sid already provides /usr/bin/gmt)
Hi Andreas, Thansk for the feedback. On 07/04/2015 02:44 PM, Andreas Tille wrote: > while I have not dealt with the libgenome-perl package before I think > your suggestion to hand over /usr/bin/gmt to the gmt package sounds > reaosnable. The package has a quite low popcon value and in my naive > view the main focus is the Perl module and the accompanying scripts > might (or might not - please correct me if I'm wrong) have a minor > importance. > > So I propose the following solution: > >1. install the gmt script to > /usr/lib/debian-med/bin/gmt >2. ln -s /usr/lib/debian-med/bin/gmt /usr/bin/genome-module-tools >3. suggest users of Debian Med to add in front of PATH > > The last is provided by med-config (>= 2.1). This is the same solution > as it is done in plink 1.07-6 which was just uploaded to unstable > (formerly tested in experimental). Users are informed about this in > NEWS.Debian. > > If you agree to this solution I'll upload it that way. Yes, please. Based on the popcon scores my preference is also to rename the binary in libgnome-perl. The GMT upstream authors also argue that since they've been using the name since the 1980s they use has set precedence. > BTW, has Debian > Perl team set ACLs to enable me commiting the changes in Git? I'm not sure. But I'm a member of the Perl team too, so if you can't commit yourself I'm willing to do that too. > Kind regards > > Andreas. Kind Regards, Bas > On Fri, Jul 03, 2015 at 10:11:49PM +0200, Sebastiaan Couwenberg wrote: >> Control: forwarded -1 https://gmt.soest.hawaii.edu/issues/723 >> >> Hi Andreas, >> >> Thanks for the comprehensive followup. >> >> I've uploaded a new revision of gmt to experimental that addresses some >> of the issues. >> >> On 06/30/2015 02:16 AM, Andreas Beckmann wrote: >>> * libgenome-perl >>> >>> Filelist libgenome-perl vs. gmt: >>> >>> usr/bin/gmt >>> >>> Filelist libgenome-perl vs. gmt-common: >>> >>> usr/share/man/man1/gmt.1.gz >> >> This is the most serious conflict to resolve. I've contacted the >> libgenome-perl maintainers [1], but I've not received a reply yet. >> >> I've put debian-med@ in the CC as they seem the most interested in the >> libgenome-perl package. Please share your opinion on this conflict. >> >> I've also contacted the GMT upstream developers to raise the issue of >> these conflicts between GMT 5 and other projects. [2] >> >> [1] https://lists.debian.org/debian-gis/2015/06/msg00119.html >> [2] https://gmt.soest.hawaii.edu/issues/723 >> >>> * libpsl-dev >>> >>> [...] >>> >>> Filelist libpsl-dev vs. libgmt-dev: >>> >>> usr/lib/x86_64-linux-gnu/libpsl.so >> >> The libpsl & gmt packages use different a SONAME. To ensure dependencies >> on the GMT libpsl it's bundled with libgmt in the libgmt5 package. >> >> To resolve the conflict I'm considering renaming the GMT libpsl to >> libgmt-psl. >> >> I've CC'ed the libpsl maintainers, and I would like to ask your opinion >> on this conflict too. >> >>> * turnin-ng >>> >>> [...] >>> >>> Filelist turnin-ng vs. gmt-common: >>> >>> usr/share/man/man1/project.1.g >>> >>> * pslib-dev >>> >>> [...] >>> >>> Filelist pslib-dev vs. gmt-common: >>> >>> usr/share/man/man3/pslib.3.gz >> >> These man page issues should be resolved with the Conflicts that were >> added in gmt (5.1.2+dfsg1-1~exp5). >> >> Kind Regards, >> >> Bas >> >> -- >> GPG Key ID: 4096R/6750F10AE88D4AF1 >> Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 >> >> >> -- >> To UNSUBSCRIBE, email to debian-med-requ...@lists.debian.org >> with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org >> Archive: https://lists.debian.org/5596ec85.4070...@xs4all.nl >> >> > -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] 02/05: Merge tag 'upstream/2.2.0'
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libosmium.
commit c1b49446dc66cd8668932b1fd165d33465e69fa2
Merge: 374778a c64b95a
Author: Bas Couwenberg
Date: Sat Jul 4 14:19:14 2015 +0200
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
.travis.yml| 79 +--
CHANGELOG.md | 44 +-
CMakeLists.txt | 65 +-
appveyor.yml | 70 +-
benchmarks/osmium_benchmark_count.cpp | 7 +-
benchmarks/osmium_benchmark_count_tag.cpp | 5 +-
cmake/FindOsmium.cmake | 2 +-
doc/CMakeLists.txt | 2 -
doc/Doxyfile.in| 4 +-
doc/README.md | 2 +-
examples/osmium_count.cpp | 7 +-
examples/osmium_create_node_cache.cpp | 3 +-
examples/osmium_serdump.cpp| 3 +-
examples/osmium_use_node_cache.cpp | 3 +-
include/mmap_for_windows.hpp | 103 ---
include/osmium/area/assembler.hpp | 24 +-
include/osmium/area/detail/segment_list.hpp| 2 +-
include/osmium/area/multipolygon_collector.hpp | 24 +-
include/osmium/builder/builder.hpp | 4 +-
include/osmium/builder/osm_object_builder.hpp | 14 +-
include/osmium/geom/factory.hpp| 164 +++--
include/osmium/geom/geos.hpp | 49 +-
include/osmium/geom/haversine.hpp | 2 +-
include/osmium/geom/mercator_projection.hpp| 1 +
include/osmium/geom/rapid_geojson.hpp | 190 ++
include/osmium/geom/tile.hpp | 101 +++
include/osmium/geom/wkb.hpp| 2 +-
include/osmium/handler/dump.hpp| 2 +-
.../mmap_vector_anon.hpp => bool_vector.hpp} | 59 +-
include/osmium/index/detail/mmap_vector_anon.hpp | 21 +-
include/osmium/index/detail/mmap_vector_base.hpp | 82 ++-
include/osmium/index/detail/mmap_vector_file.hpp | 26 +-
include/osmium/index/detail/typed_mmap.hpp | 229 ---
include/osmium/index/detail/vector_map.hpp | 10 +-
include/osmium/index/detail/vector_multimap.hpp| 34 +
include/osmium/index/index.hpp | 2 +-
include/osmium/index/map.hpp | 16 +-
include/osmium/index/map/sparse_mem_table.hpp | 4 +-
include/osmium/io/bzip2_compression.hpp| 2 +-
include/osmium/io/detail/pbf.hpp | 31 -
include/osmium/io/detail/pbf_input_format.hpp | 3 +-
include/osmium/io/detail/pbf_output_format.hpp | 64 +-
include/osmium/io/detail/pbf_parser.hpp| 25 +-
include/osmium/io/detail/pbf_stringtable.hpp | 2 +-
.../io/detail/{pbf.hpp => pbf_type_conv.hpp} | 31 +-
include/osmium/io/detail/read_write.hpp| 2 +-
include/osmium/io/detail/xml_input_format.hpp | 1 +
include/osmium/io/detail/xml_output_format.hpp | 2 +-
include/osmium/io/gzip_compression.hpp | 2 +-
include/osmium/io/reader.hpp | 2 +-
include/osmium/memory/buffer.hpp | 18 +
include/osmium/memory/item.hpp | 2 +-
include/osmium/osm/changeset.hpp | 1 +
include/osmium/osm/diff_object.hpp | 29 +-
include/osmium/osm/item_type.hpp | 20 +
include/osmium/osm/node_ref.hpp| 2 +-
include/osmium/osm/object.hpp | 1 +
include/osmium/osm/relation.hpp| 7 +-
include/osmium/osm/timestamp.hpp | 15 +
include/osmium/osm/types.hpp | 21 -
include/osmium/osm/types_from_string.hpp | 116
include/osmium/relations/collector.hpp | 4 +-
include/osmium/thread/pool.hpp | 3 +-
include/osmium/thread/queue.hpp| 31 +-
include/osmium/thread/sorted_queue.hpp | 4 +-
include/osmium/util/cast.hpp | 3 +-
include/osmium/util/data_file.hpp | 192 ++
.../detail/mmap_vector_anon.hpp => util/delta.hpp} | 71 +-
include/osmium/util/file.hpp | 118
include/osmium/util/memory_mapping.hpp | 723 +
include/osmium/util/minmax.hpp | 123
include/osmium/util/string.hpp | 42 +-
include/osmium/util/verbose_output.hpp | 2 +-
scripts/travis_install.sh | 26 +
scripts/travis_script.sh | 31 +
test/CMakeLists.txt| 96
[libosmium] 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 libosmium. commit 43d3d8939159bd460bf8c3847cc1c90342b9dec8 Author: Bas Couwenberg Date: Sat Jul 4 14:28:38 2015 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3604c3..f957249 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libosmium (2.2.0-1) UNRELEASED; urgency=medium +libosmium (2.2.0-1) unstable; urgency=medium * New upstream release. * Drop reproducible-build.patch, applied upstream. - -- Bas Couwenberg Sat, 04 Jul 2015 14:19:28 +0200 + -- Bas Couwenberg Sat, 04 Jul 2015 14:28:28 +0200 libosmium (2.1.0-4) 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] annotated tag upstream/2.2.0 created (now 4a5fabd)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.2.0 in repository libosmium. at 4a5fabd (tag) tagging c64b95a55d1335fadfbc70d9f829bfa31fbc8d01 (commit) replaces upstream/2.1.0 tagged by Bas Couwenberg on Sat Jul 4 14:19:13 2015 +0200 - Log - Upstream version 2.2.0 Bas Couwenberg (1): Imported Upstream version 2.2.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/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 (25f004d -> c64b95a)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository libosmium.
from 25f004d Imported Upstream version 2.1.0
new c64b95a Imported Upstream version 2.2.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml| 79 +--
CHANGELOG.md | 44 +-
CMakeLists.txt | 65 +-
appveyor.yml | 70 +-
benchmarks/osmium_benchmark_count.cpp | 7 +-
benchmarks/osmium_benchmark_count_tag.cpp | 5 +-
cmake/FindOsmium.cmake | 2 +-
doc/CMakeLists.txt | 2 -
doc/Doxyfile.in| 4 +-
doc/README.md | 2 +-
examples/osmium_count.cpp | 7 +-
examples/osmium_create_node_cache.cpp | 3 +-
examples/osmium_serdump.cpp| 3 +-
examples/osmium_use_node_cache.cpp | 3 +-
include/mmap_for_windows.hpp | 103 ---
include/osmium/area/assembler.hpp | 24 +-
include/osmium/area/detail/segment_list.hpp| 2 +-
include/osmium/area/multipolygon_collector.hpp | 24 +-
include/osmium/builder/builder.hpp | 4 +-
include/osmium/builder/osm_object_builder.hpp | 14 +-
include/osmium/geom/factory.hpp| 164 +++--
include/osmium/geom/geos.hpp | 49 +-
include/osmium/geom/haversine.hpp | 2 +-
include/osmium/geom/mercator_projection.hpp| 1 +
include/osmium/geom/rapid_geojson.hpp | 190 ++
include/osmium/geom/tile.hpp | 101 +++
include/osmium/geom/wkb.hpp| 2 +-
include/osmium/handler/dump.hpp| 2 +-
.../mmap_vector_anon.hpp => bool_vector.hpp} | 59 +-
include/osmium/index/detail/mmap_vector_anon.hpp | 21 +-
include/osmium/index/detail/mmap_vector_base.hpp | 82 ++-
include/osmium/index/detail/mmap_vector_file.hpp | 26 +-
include/osmium/index/detail/typed_mmap.hpp | 229 ---
include/osmium/index/detail/vector_map.hpp | 10 +-
include/osmium/index/detail/vector_multimap.hpp| 34 +
include/osmium/index/index.hpp | 2 +-
include/osmium/index/map.hpp | 16 +-
include/osmium/index/map/sparse_mem_table.hpp | 4 +-
include/osmium/io/bzip2_compression.hpp| 2 +-
include/osmium/io/detail/pbf.hpp | 31 -
include/osmium/io/detail/pbf_input_format.hpp | 3 +-
include/osmium/io/detail/pbf_output_format.hpp | 64 +-
include/osmium/io/detail/pbf_parser.hpp| 25 +-
include/osmium/io/detail/pbf_stringtable.hpp | 2 +-
.../io/detail/{pbf.hpp => pbf_type_conv.hpp} | 31 +-
include/osmium/io/detail/read_write.hpp| 2 +-
include/osmium/io/detail/xml_input_format.hpp | 1 +
include/osmium/io/detail/xml_output_format.hpp | 2 +-
include/osmium/io/gzip_compression.hpp | 2 +-
include/osmium/io/reader.hpp | 2 +-
include/osmium/memory/buffer.hpp | 18 +
include/osmium/memory/item.hpp | 2 +-
include/osmium/osm/changeset.hpp | 1 +
include/osmium/osm/diff_object.hpp | 29 +-
include/osmium/osm/item_type.hpp | 20 +
include/osmium/osm/node_ref.hpp| 2 +-
include/osmium/osm/object.hpp | 1 +
include/osmium/osm/relation.hpp| 7 +-
include/osmium/osm/timestamp.hpp | 15 +
include/osmium/osm/types.hpp | 21 -
include/osmium/osm/types_from_string.hpp | 116
include/osmium/relations/collector.hpp | 4 +-
include/osmium/thread/pool.hpp | 3 +-
include/osmium/thread/queue.hpp| 31 +-
include/osmium/thread/sorted_queue.hpp | 4 +-
include/osmium/util/cast.hpp | 3 +-
include/osmium/util/data_file.hpp | 192 ++
.../osmium/{diff_handler.hpp => util/delta.hpp}| 60 +-
include/osmium/util/file.hpp | 118
include/osmium/util/memory_mapping.hpp | 723 +
include/osmium/util/minmax.hpp | 123
include/osmium/util/string.hpp | 42 +-
include/osmium/util/verbose_output.hpp | 2 +-
scripts/tra
[libosmium] 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 libosmium. commit 8de23409ad58de439374b80d9b2d593886783f2c Author: Bas Couwenberg Date: Sat Jul 4 14:19:30 2015 +0200 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 95c89cc..4426a2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmium (2.2.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg Sat, 04 Jul 2015 14:19:28 +0200 + libosmium (2.1.0-4) unstable; urgency=medium * Add patch to make build reproducible. -- 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/05: Drop reproducible-build.patch, applied upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium. commit f554ba578c67ab2cc39b14e88fe0ae5fa446db91 Author: Bas Couwenberg Date: Sat Jul 4 14:26:29 2015 +0200 Drop reproducible-build.patch, applied upstream. --- debian/changelog| 1 + debian/patches/reproducible-build.patch | 15 --- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4426a2a..c3604c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libosmium (2.2.0-1) UNRELEASED; urgency=medium * New upstream release. + * Drop reproducible-build.patch, applied upstream. -- Bas Couwenberg Sat, 04 Jul 2015 14:19:28 +0200 diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch deleted file mode 100644 index 95a2baf..000 --- a/debian/patches/reproducible-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Make build reproducible by disabling Doxygen HTML timestamps. -Author: Bas Couwenberg -Forwarded: not-needed - a/doc/Doxyfile.in -+++ b/doc/Doxyfile.in -@@ -1128,7 +1128,7 @@ HTML_COLORSTYLE_GAMMA = 80 - # The default value is: YES. - # This tag requires that the tag GENERATE_HTML is set to YES. - --HTML_TIMESTAMP = YES -+HTML_TIMESTAMP = NO - - # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML - # documentation will contain sections that can be hidden and shown after the diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 55077d0..000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -reproducible-build.patch -- 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 (374778a -> 43d3d89)
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository libosmium.
from 374778a Set distribution to unstable.
new c64b95a Imported Upstream version 2.2.0
new c1b4944 Merge tag 'upstream/2.2.0'
new 8de2340 New upstream release.
new f554ba5 Drop reproducible-build.patch, applied upstream.
new 43d3d89 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:
.travis.yml| 79 +--
CHANGELOG.md | 44 +-
CMakeLists.txt | 65 +-
appveyor.yml | 70 +-
benchmarks/osmium_benchmark_count.cpp | 7 +-
benchmarks/osmium_benchmark_count_tag.cpp | 5 +-
cmake/FindOsmium.cmake | 2 +-
debian/changelog | 7 +
debian/patches/reproducible-build.patch| 15 -
debian/patches/series | 1 -
doc/CMakeLists.txt | 2 -
doc/Doxyfile.in| 4 +-
doc/README.md | 2 +-
examples/osmium_count.cpp | 7 +-
examples/osmium_create_node_cache.cpp | 3 +-
examples/osmium_serdump.cpp| 3 +-
examples/osmium_use_node_cache.cpp | 3 +-
include/mmap_for_windows.hpp | 103 ---
include/osmium/area/assembler.hpp | 24 +-
include/osmium/area/detail/segment_list.hpp| 2 +-
include/osmium/area/multipolygon_collector.hpp | 24 +-
include/osmium/builder/builder.hpp | 4 +-
include/osmium/builder/osm_object_builder.hpp | 14 +-
include/osmium/geom/factory.hpp| 164 +++--
include/osmium/geom/geos.hpp | 49 +-
include/osmium/geom/haversine.hpp | 2 +-
include/osmium/geom/mercator_projection.hpp| 1 +
include/osmium/geom/rapid_geojson.hpp | 190 ++
include/osmium/geom/tile.hpp | 101 +++
include/osmium/geom/wkb.hpp| 2 +-
include/osmium/handler/dump.hpp| 2 +-
.../mmap_vector_anon.hpp => bool_vector.hpp} | 59 +-
include/osmium/index/detail/mmap_vector_anon.hpp | 21 +-
include/osmium/index/detail/mmap_vector_base.hpp | 82 ++-
include/osmium/index/detail/mmap_vector_file.hpp | 26 +-
include/osmium/index/detail/typed_mmap.hpp | 229 ---
include/osmium/index/detail/vector_map.hpp | 10 +-
include/osmium/index/detail/vector_multimap.hpp| 34 +
include/osmium/index/index.hpp | 2 +-
include/osmium/index/map.hpp | 16 +-
include/osmium/index/map/sparse_mem_table.hpp | 4 +-
include/osmium/io/bzip2_compression.hpp| 2 +-
include/osmium/io/detail/pbf.hpp | 31 -
include/osmium/io/detail/pbf_input_format.hpp | 3 +-
include/osmium/io/detail/pbf_output_format.hpp | 64 +-
include/osmium/io/detail/pbf_parser.hpp| 25 +-
include/osmium/io/detail/pbf_stringtable.hpp | 2 +-
.../io/detail/{pbf.hpp => pbf_type_conv.hpp} | 31 +-
include/osmium/io/detail/read_write.hpp| 2 +-
include/osmium/io/detail/xml_input_format.hpp | 1 +
include/osmium/io/detail/xml_output_format.hpp | 2 +-
include/osmium/io/gzip_compression.hpp | 2 +-
include/osmium/io/reader.hpp | 2 +-
include/osmium/memory/buffer.hpp | 18 +
include/osmium/memory/item.hpp | 2 +-
include/osmium/osm/changeset.hpp | 1 +
include/osmium/osm/diff_object.hpp | 29 +-
include/osmium/osm/item_type.hpp | 20 +
include/osmium/osm/node_ref.hpp| 2 +-
include/osmium/osm/object.hpp | 1 +
include/osmium/osm/relation.hpp| 7 +-
include/osmium/osm/timestamp.hpp | 15 +
include/osmium/osm/types.hpp | 21 -
include/osmium/osm/types_from_string.hpp | 116
include/osmium/relations/collector.hpp | 4 +-
include/osmium/thread/pool.hpp | 3 +-
include/osmium/thread/queue.hpp| 31 +-
include/osmium/thread/sorted_queue.hpp | 4 +-
include/osmium/util/cast.hpp | 3 +-
include/osmium/util/data_file.hpp | 192 ++
.../osmi
[libosmium] branch pristine-tar updated (42d6e9b -> a8b862d)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository libosmium. from 42d6e9b pristine-tar data for libosmium_2.1.0.orig.tar.gz new a8b862d pristine-tar data for libosmium_2.2.0.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: libosmium_2.2.0.orig.tar.gz.delta | Bin 0 -> 11103 bytes libosmium_2.2.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 libosmium_2.2.0.orig.tar.gz.delta create mode 100644 libosmium_2.2.0.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libosmium] tag debian/2.2.0-1 created (now 43d3d89)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.2.0-1 in repository libosmium. at 43d3d89 (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/01: pristine-tar data for libosmium_2.2.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libosmium. commit a8b862dc80554adf5f40ca3c1ba84673b59df283 Author: Bas Couwenberg Date: Sat Jul 4 14:19:13 2015 +0200 pristine-tar data for libosmium_2.2.0.orig.tar.gz --- libosmium_2.2.0.orig.tar.gz.delta | Bin 0 -> 11103 bytes libosmium_2.2.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libosmium_2.2.0.orig.tar.gz.delta b/libosmium_2.2.0.orig.tar.gz.delta new file mode 100644 index 000..4e0a375 Binary files /dev/null and b/libosmium_2.2.0.orig.tar.gz.delta differ diff --git a/libosmium_2.2.0.orig.tar.gz.id b/libosmium_2.2.0.orig.tar.gz.id new file mode 100644 index 000..8c92831 --- /dev/null +++ b/libosmium_2.2.0.orig.tar.gz.id @@ -0,0 +1 @@ +fd32096ad6107f0cfbb3746e8f7334e3726f7bc7 -- 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
Bug#790524: src:gmt: takes over files from several unrelated packages (was: Re: gmt: libgenome-perl in sid already provides /usr/bin/gmt)
Hi Bas, while I have not dealt with the libgenome-perl package before I think your suggestion to hand over /usr/bin/gmt to the gmt package sounds reaosnable. The package has a quite low popcon value and in my naive view the main focus is the Perl module and the accompanying scripts might (or might not - please correct me if I'm wrong) have a minor importance. So I propose the following solution: 1. install the gmt script to /usr/lib/debian-med/bin/gmt 2. ln -s /usr/lib/debian-med/bin/gmt /usr/bin/genome-module-tools 3. suggest users of Debian Med to add in front of PATH The last is provided by med-config (>= 2.1). This is the same solution as it is done in plink 1.07-6 which was just uploaded to unstable (formerly tested in experimental). Users are informed about this in NEWS.Debian. If you agree to this solution I'll upload it that way. BTW, has Debian Perl team set ACLs to enable me commiting the changes in Git? Kind regards Andreas. On Fri, Jul 03, 2015 at 10:11:49PM +0200, Sebastiaan Couwenberg wrote: > Control: forwarded -1 https://gmt.soest.hawaii.edu/issues/723 > > Hi Andreas, > > Thanks for the comprehensive followup. > > I've uploaded a new revision of gmt to experimental that addresses some > of the issues. > > On 06/30/2015 02:16 AM, Andreas Beckmann wrote: > > * libgenome-perl > > > > Filelist libgenome-perl vs. gmt: > > > > usr/bin/gmt > > > > Filelist libgenome-perl vs. gmt-common: > > > > usr/share/man/man1/gmt.1.gz > > This is the most serious conflict to resolve. I've contacted the > libgenome-perl maintainers [1], but I've not received a reply yet. > > I've put debian-med@ in the CC as they seem the most interested in the > libgenome-perl package. Please share your opinion on this conflict. > > I've also contacted the GMT upstream developers to raise the issue of > these conflicts between GMT 5 and other projects. [2] > > [1] https://lists.debian.org/debian-gis/2015/06/msg00119.html > [2] https://gmt.soest.hawaii.edu/issues/723 > > > * libpsl-dev > > > > [...] > > > > Filelist libpsl-dev vs. libgmt-dev: > > > > usr/lib/x86_64-linux-gnu/libpsl.so > > The libpsl & gmt packages use different a SONAME. To ensure dependencies > on the GMT libpsl it's bundled with libgmt in the libgmt5 package. > > To resolve the conflict I'm considering renaming the GMT libpsl to > libgmt-psl. > > I've CC'ed the libpsl maintainers, and I would like to ask your opinion > on this conflict too. > > > * turnin-ng > > > > [...] > > > > Filelist turnin-ng vs. gmt-common: > > > > usr/share/man/man1/project.1.g > > > > * pslib-dev > > > > [...] > > > > Filelist pslib-dev vs. gmt-common: > > > > usr/share/man/man3/pslib.3.gz > > These man page issues should be resolved with the Conflicts that were > added in gmt (5.1.2+dfsg1-1~exp5). > > Kind Regards, > > Bas > > -- > GPG Key ID: 4096R/6750F10AE88D4AF1 > Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 > > > -- > To UNSUBSCRIBE, email to debian-med-requ...@lists.debian.org > with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org > Archive: https://lists.debian.org/5596ec85.4070...@xs4all.nl > > -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
