merkaartor_0.18.2-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Fri, 18 Sep 2015 20:25:30 +0200 Source: merkaartor Binary: merkaartor Architecture: source amd64 Version: 0.18.2-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: merkaartor - map editor for OpenStreetMap.org Closes: 731118 759128 784494 Changes: merkaartor (0.18.2-1~exp1) experimental; urgency=medium . * New upstream release. * Move package to Debian GIS team, changes: - Move Maintainer to Uploaders - Set Debian GIS Project as Maintainer - Update Vcs-* URLs for git repository on Alioth - Add myself to Uploaders * Bump debhelper compatibility to 9. * Updates for new upstream development by the OpenStreetMap community: - Update watch file for move to GitHub. - Update Homepage URL to www.merkaartor.be. (closes: #731118) * Switch to source format 3.0 (quilt). * Use minimal dh rules. - Enable parallel builds (closes: #759128) * Drop patches applied upstream. * Update copyright file using copyright-format 1.0. * Restructure control file with cme. * Update Vcs-Browser URL to use HTTPS. * Override dh_install to use --list-missing. * Rename old style config sections in gbp.conf. * Add patch to fix version detection for tarball releases. * Switch to Qt5. (closes: #784494) * Disable zbar, is Qt4-only. * Use dh_auto_* commands in overrides. * Disable SpatiaLite support, causes FTBFS. * Add patch to fix various typos. * Add patch to add hardening buildflags to qmake build. * Don't create empty usr/sbin directory. * Add patch to add Keywords to merkaartor.desktop. * Bump Standards-Version to 3.9.6, changes: - canonical Vcs-* URLs - copyright-format 1.0 Checksums-Sha1: 373c2fb1cb5af8b590844d23bb569aca96411e21 2265 merkaartor_0.18.2-1~exp1.dsc 5c6e7f39960ddd81232f12811d91d32d05f6e5c5 6267866 merkaartor_0.18.2.orig.tar.gz c2a28fa9e43f2e30e8cc61607ce192e58d339642 29320 merkaartor_0.18.2-1~exp1.debian.tar.xz 5a37d60a1037593aa89e0b457067cc09b892ca35 2280796 merkaartor_0.18.2-1~exp1_amd64.deb Checksums-Sha256: 344ff6130f78db3454e7ebbc4f689b1fc837452399dba13fd8e932ff558fe25a 2265 merkaartor_0.18.2-1~exp1.dsc 9e04d554ebc4fd0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 6267866 merkaartor_0.18.2.orig.tar.gz 7a962d2fd3da10a64229c389c35ae3e7e2048a9536ba968331f9cc40d717ab5d 29320 merkaartor_0.18.2-1~exp1.debian.tar.xz f6405dc7f1d736a4a3a4dbbea63714e40e4955bc98b163000c7b93f1a008a39a 2280796 merkaartor_0.18.2-1~exp1_amd64.deb Files: 342a7d2d9bceb2fc38cbc49ec2c5163e 2265 science extra merkaartor_0.18.2-1~exp1.dsc 20bbcc08ae0b36819a73f7754a44c5fe 6267866 science extra merkaartor_0.18.2.orig.tar.gz e07c21bfe0760de17a8c8ca4c74a7e91 29320 science extra merkaartor_0.18.2-1~exp1.debian.tar.xz 573ae71d60d7c8ab0f748bb7bc4ceb1a 2280796 science extra merkaartor_0.18.2-1~exp1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV/FlqAAoJEGdQ8QrojUrx6K0QAKUwVsA2JJ9q3vFkwlIGZpcI QkMaksbM/qWAN2ZWMcs33o7z2nuMORalQcI7Ru+6baLkGNxYW9hakLwWh3fp99Ru t2dU8HTRqroNtUh5IlKycug+RkCfiZK1IZAPz1rd37Q/eXJKBougIxPp5/Pl36Qm Ae7DKXbDVUb1URSNF/cxjGSGYzfGqyFP2X4DXiwvXXsaFzBGim9pll/WFJx92q5U QIfbNteQo1Axs0mcUsTrTNtrpRlkCk2d0svjqVHzj1lsVvvI/TJaE6rFsE1hrkK8 ZaU0OAOpvIUTOnjGSHk6PQc5C+20CQHemGcYKLLIwr+KkXXO/G1tYrGz3wQ1Jaf+ DB0Su7ianHG2O15C75yqe6xpvi0GVWhxlw9YlYZyOBZqlC+wR5gFvxnAnRjS7OtI 0lv7ozl/byor1S/+BZxB4TvrUzJiUO+GaqnsKx603A9IksdOsbKr9J3kkCb2KoYd 7HK+mJejbNZLCjKuEEFeRhEK8JAaBh0rE358p7JyY7mgegu8f+Uzil3UXpIAtLVu Px7UHO9p4IlF5DSvn1zACOIN69JbQmHbIDCjAVork2Pp3zEm1FTd+xGS+hY1wdL9 VHK16F310GOhGtR8CV82w8hZanKBLnVYme2Pz1wIudyJPosUgNlqAiy/4QzqKJY/ U7sDvScSuud/v4Rv7QPO =ZGTD -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#799394: h5utils: Hardcodes dependency on liboctave3, which is being replaced by liboctave3v5
Package: h5utils Version: 1.12.1-3 Severity: serious Hi, While working on completing the GCC-5 related transitions, we noticed that h5utils is hardcoding a dependency on liboctave3. However, liboctave3 has been renamed to liboctave3v5 as a part of the GCC-5 transition. Being hardcoded, we cannot binNMU h5utils to get rid of this dependency and instead require a sourceful upload to fix it. Thanks, ~Niels ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 19/23: Bump Standards-Version to 3.9.6.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 9570880b3507a53ef203f5a411097f7b542b9abc Author: Bas CouwenbergDate: Fri Sep 18 18:52:53 2015 +0200 Bump Standards-Version to 3.9.6. Changes: - canonical Vcs-* URLs - copyright-format 1.0 --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e3836c4..407b2fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,9 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Add patch to add hardening buildflags to qmake build. * Don't create empty usr/sbin directory. * Add patch to add Keywords to merkaartor.desktop. + * Bump Standards-Version to 3.9.6, changes: +- canonical Vcs-* URLs +- copyright-format 1.0 -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/control b/debian/control index 0c3ddb3..704b32b 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 9), qttools5-dev-tools, sharutils, zlib1g-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.6 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/merkaartor.git Vcs-Git: git://anonscm.debian.org/pkg-grass/merkaartor.git Homepage: http://www.merkaartor.be/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] branch upstream updated (b2f92c8 -> e920a8f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository merkaartor. from b2f92c8 Merge tag '0.18.1' into upstream new e920a8f Imported Upstream version 0.18.2 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|17 + .../examples/loader/main.cpp | 8 +- .../examples/trivial/main.cpp | 2 +- .../qtsingleapplication.pro| 1 + .../src/qtlocalpeer.cpp| 7 +- .../src/qtlockedfile_win.cpp | 3 + .../src/qtsingleapplication.cpp| 4 +- .../src/qtsingleapplication.h | 4 +- .../src/qtsingleapplication.pri| 2 +- .../qttoolbardialog-2.2_1-opensource/INSTALL.TXT | 254 - .../LGPL_EXCEPTION.txt |23 - .../qttoolbardialog-2.2_1-opensource/LICENSE.GPL3 | 674 -- .../qttoolbardialog-2.2_1-opensource/LICENSE.LGPL | 504 - .../qttoolbardialog-2.2_1-opensource/README.TXT| 7 - .../buildlib/buildlib.pro |13 - .../qttoolbardialog-2.2_1-opensource/common.pri| 6 - .../qttoolbardialog-2.2_1-opensource/configure | 112 - .../doc/html/classic.css | 139 - .../doc/html/images/qt-logo.png| Bin 4075 -> 0 bytes .../doc/html/images/qttoolbardialog.png| Bin 12323 -> 0 bytes .../doc/html/index.html|41 - .../doc/html/qttoolbardialog-members.html | 371 - .../doc/html/qttoolbardialog.dcf |29 - .../doc/html/qttoolbardialog.html |89 - .../doc/html/qttoolbardialog.index |54 - .../doc/html/qttoolbardialog.qch | Bin 50176 -> 0 bytes .../doc/html/qttoolbardialog.qhp |46 - .../doc/html/qttoolbarmanager-members.html |85 - .../doc/html/qttoolbarmanager.html | 102 - .../doc/images/qt-logo.png | Bin 4075 -> 0 bytes .../doc/images/qttoolbardialog.png | Bin 12323 -> 0 bytes .../doc/index.qdoc |37 - .../examples/examples.pro | 7 - .../examples/simple/images/copy.png| Bin 1338 -> 0 bytes .../examples/simple/images/cut.png | Bin 1323 -> 0 bytes .../examples/simple/images/new.png | Bin 852 -> 0 bytes .../examples/simple/images/open.png| Bin 2073 -> 0 bytes .../examples/simple/images/paste.png | Bin 1745 -> 0 bytes .../examples/simple/images/save.png| Bin 1187 -> 0 bytes .../examples/simple/main.cpp |59 - .../examples/simple/mainwindow.cpp | 455 - .../examples/simple/mainwindow.h | 122 - .../examples/simple/simple.pro |11 - .../examples/simple/simple.qrc |10 - .../qttoolbardialog.pro| 5 - .../src/QtToolBarDialog| 1 - .../src/QtToolBarManager | 1 - .../src/qttoolbardialog.cpp| 1892 .../src/qttoolbardialog.h | 144 - .../src/qttoolbardialog.pri|17 - .../src/qttoolbardialog.qrc|10 - 3rdparty/quazip-0.7/CMakeLists.txt |54 + 3rdparty/quazip-0.7/COPYING| 458 + 3rdparty/quazip-0.7/Doxyfile | 1722 +++ 3rdparty/quazip-0.7/FindQuaZip.cmake |40 + 3rdparty/quazip-0.7/NEWS.txt | 149 + 3rdparty/quazip-0.7/README.txt |66 + .../quazip-0.7/doc/html/JlCompress_8h_source.html | 131 + 3rdparty/quazip-0.7/doc/html/annotated.html|78 + 3rdparty/quazip-0.7/doc/html/bc_s.png | Bin 0 -> 676 bytes 3rdparty/quazip-0.7/doc/html/bdwn.png | Bin 0 -> 147 bytes .../doc/html/classJlCompress-members.html |69 + 3rdparty/quazip-0.7/doc/html/classJlCompress.html | 475 + .../doc/html/classQuaAdler32-members.html |67 + 3rdparty/quazip-0.7/doc/html/classQuaAdler32.html | 194 + .../doc/html/classQuaAdler32__coll__graph.map | 3 + .../doc/html/classQuaAdler32__coll__graph.md5 | 1 + .../doc/html/classQuaAdler32__coll__graph.png | Bin 0 -> 3849 bytes .../doc/html/classQuaAdler32__inherit__graph.map | 3 +
[merkaartor] 23/23: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 9750a34f36fdfe2d1a424d51be17f1efa4db477c Author: Bas CouwenbergDate: Fri Sep 18 20:25:51 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 ce7f137..2ca700f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -merkaartor (0.18.2-1) UNRELEASED; urgency=medium +merkaartor (0.18.2-1~exp1) experimental; urgency=medium * New upstream release. * Move package to Debian GIS team, changes: @@ -35,7 +35,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium - canonical Vcs-* URLs - copyright-format 1.0 - -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 + -- Bas Couwenberg Fri, 18 Sep 2015 20:25:30 +0200 merkaartor (0.18.1-3) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[proj] 01/02: Merge remote-tracking branch 'origin/master' into ubuntu/precise
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch ubuntu/trusty in repository proj. commit 4ba2b96058f7052b8ee29222ccab9e2526fc10e3 Merge: 01d926b 296b8ac Author: Johan Van de WauwDate: Fri Sep 18 20:21:55 2015 +0200 Merge remote-tracking branch 'origin/master' into ubuntu/precise Conflicts: config.guess config.sub debian/changelog AUTHORS| 4 + CMakeLists.txt |111 + ChangeLog |386 +- Makefile.am| 4 +- Makefile.in|416 +- NEWS |156 +- aclocal.m4 | 9194 +- cmake/CMakeLists.txt | 29 + cmake/Makefile.am | 14 + {jniwrap/org/proj4 => cmake}/Makefile.in |143 +- cmake/Proj4Config.cmake| 41 + cmake/Proj4InstallPath.cmake | 67 + cmake/Proj4Mac.cmake | 24 + cmake/Proj4SystemInfo.cmake| 83 + cmake/Proj4Test.cmake | 32 + cmake/Proj4Utilities.cmake |456 + cmake/Proj4Version.cmake | 47 + cmake/policies.cmake | 5 + src/proj_config.h.in => cmake/proj_config.cmake.in | 48 +- cmake/project-config-version.cmake.in | 48 + cmake/project-config.cmake.in | 31 + compile|347 + config.guess |759 +- config.sub |397 +- configure | 1962 +- configure.in | 21 +- debian/README.source | 2 +- debian/TODO| 10 - debian/changelog |206 +- debian/compat | 2 +- debian/control | 84 +- debian/copyright |189 +- debian/datumgrids-ch.list | 3 + debian/datumgrids-ch.shar | 340463 +- debian/datumgrids.list | 28 +- debian/datumgrids.shar | 81298 +++-- debian/gbp.conf| 16 + debian/libproj-dev.install | 11 +- debian/libproj-dev.manpages| 1 + debian/libproj-java.doc-base | 8 + debian/libproj-java.docs | 1 + debian/libproj-java.install| 1 + debian/libproj-java.links | 1 + debian/libproj0.install| 1 - debian/libproj0.symbols|406 - debian/libproj9.install| 1 + debian/libproj9.symbols|456 + debian/patches/00list | 1 - debian/proj-bin.install| 2 - debian/proj-bin.links | 3 +- debian/proj-data.install | 28 +- debian/rules |157 +- debian/upstream/metadata | 7 + debian/watch | 9 +- install-sh |673 +- jniwrap/Makefile.in|296 +- jniwrap/doxygen.cfg| 2 +- jniwrap/org/Makefile.in|295 +- jniwrap/org/proj4/LatLong.java | 74 - jniwrap/org/proj4/Makefile.am | 6 +- jniwrap/org/proj4/Makefile.in |126 +- jniwrap/org/proj4/Others.java | 73 - jniwrap/org/proj4/PJ.java | 2 - jniwrap/org/proj4/PJException.java | 2 - jniwrap/org/proj4/Proj4.java |189 - jniwrap/org/proj4/Proj4Factory.java| 77 - jniwrap/org/proj4/ProjectionData.java | 78 - jniwrap/org/proj4/Projections.java |318 - jniwrap/org/proj4/package-info.java| 2 - ltmain.sh |123 +- m4/ax_cflags_warn_all.m4 |120 + aclocal.m4
[proj] 02/02: Release for trusty
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch ubuntu/trusty in repository proj. commit 8cfb0d2b4d182ad190a18fe32a1693a112da639b Author: Johan Van de WauwDate: Fri Sep 18 20:26:23 2015 +0200 Release for trusty --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f2026c..3d082c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -proj (4.9.2-1~ubuntugis~precise) precise; urgency=medium +proj (4.9.2-1~ubuntugis~trusty) trusty; urgency=medium - * Backport to precise + * Backport to trusty -- Johan Van de Wauw Fri, 18 Sep 2015 20:11:23 +0200 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[proj] branch ubuntu/trusty created (now 8cfb0d2)
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a change to branch ubuntu/trusty in repository proj. at 8cfb0d2 Release for trusty This branch includes the following new commits: new 4ba2b96 Merge remote-tracking branch 'origin/master' into ubuntu/precise new 8cfb0d2 Release for trusty The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
routino_3.0-1_amd64.changes ACCEPTED into unstable, unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Thu, 17 Sep 2015 22:27:12 +0200 Source: routino Binary: routino routino-www libroutino0 libroutino-slim0 libroutino-dev routino-dbg Architecture: source amd64 all Version: 3.0-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: libroutino-dev - Routino library development headers libroutino-slim0 - Routino slim routing library libroutino0 - Routino routing library routino- Set of tools to find a path between two points routino-dbg - Debug symbols for Routino routino-www - Web frontend for routino Changes: routino (3.0-1) unstable; urgency=medium . * New upstream release. Adds libroutino for QMapShack and other programs. * Update copyright file, changes: - Update copyright years for Andrew M. Bishop - Add license & copyright for mman-win32.{c,h} * Update Vcs-Browser URL to use HTTPS. * Override dh_install to use --list-missing. * Refresh patches, mark as Forwarded: not-needed. * Add packages for routino shared libraries. * Install documentation in routino package. * Strip RPATH from binaries. * Add debug package. * Update email address for upstream author. * Add patch to set the SONAME for libroutino{,-slim}. * Add symbols files for libroutino{,-slim}. * Merge fix_tests patch into rename_router patch. * Add doc-base registration for HTML documentation. * Add build dependencies for create-icons.pl: libgraphics-magick-perl & gsfonts. * Drop install_documenation patch, install all documentation except INSTALL*.txt. * Add man page for routino-router+lib{,-slim}. * Add version option to routino-router{,-slim} man page. Checksums-Sha1: b74383ae3febd554cff46ea5d17509ee170becf2 2322 routino_3.0-1.dsc 8c7c3a40e9187d6b229673f5582b4eaee6806392 1776362 routino_3.0.orig.tar.gz ed464f6ef198e141053cc2cd2e32b8e9a8dc8062 29752 routino_3.0-1.debian.tar.xz c5217ca4c288f53660025000a3cfe83b59b1e164 87700 libroutino-dev_3.0-1_amd64.deb 3b500e4538c66711b0b3255c7f6132a84163c99d 148700 libroutino-slim0_3.0-1_amd64.deb 79a052371f1a7265b40bafd3fafaad95ad54d894 134320 libroutino0_3.0-1_amd64.deb b616f7a853af886b294339ce38843686ebb754fb 1390262 routino-dbg_3.0-1_amd64.deb 4bb6474a4c4677302447f54b6e0d64c750c8e32e 1468892 routino-www_3.0-1_all.deb 45b9d4483b1526ee138fa7303597ea0d342734a2 452628 routino_3.0-1_amd64.deb Checksums-Sha256: 6471a6712c27714f37022d2b087415f5ea7199d75c1472569349189821c2b218 2322 routino_3.0-1.dsc 376512ef9627ce5c12e8c7a98dba7fe5125acfb89a9f9ee6758fbe36b5cf942f 1776362 routino_3.0.orig.tar.gz 9e4b5c319507c42af5dc94e0113124ae85508bbab8587941b86c82574edb2fc9 29752 routino_3.0-1.debian.tar.xz ffd787f21e87302341efe1fdc04efafa9510d810a46efb18de2194a4027b2f63 87700 libroutino-dev_3.0-1_amd64.deb 8572de8cf13074eb7ebe7291dc3e65c0e54b697b79c2674afb222444a5a17654 148700 libroutino-slim0_3.0-1_amd64.deb a60cbb96eda38c0c169838da5467e63255e222f248e1a08024347d7c9d21c767 134320 libroutino0_3.0-1_amd64.deb f59b199ecdc0b3b95ae038776b563ec69f664b50fd7eea9f0a0275f467af0fb5 1390262 routino-dbg_3.0-1_amd64.deb 81818fb55a69b9331746913a43e5b6f9f52c17d9829c25b5199cd40acddd0308 1468892 routino-www_3.0-1_all.deb 7f34303f7e62c12eb1bcecde656bcf082fbd053f0d716a7d04968fa538894cef 452628 routino_3.0-1_amd64.deb Files: 03e6aedbe2048530cabcc6c18b4d87c4 2322 misc extra routino_3.0-1.dsc 7d8f2fcdfc1c9791352096e53c27c8a9 1776362 misc extra routino_3.0.orig.tar.gz f090931cbee02fc2aed940532e4dd1a3 29752 misc extra routino_3.0-1.debian.tar.xz 9c23ae25d1a22efb7c55e8054b7a3eba 87700 libdevel extra libroutino-dev_3.0-1_amd64.deb d39da01f7f6833349a60bee19f314eb5 148700 libs extra libroutino-slim0_3.0-1_amd64.deb 6bd1e3934b35902e989f2b6e292df030 134320 libs extra libroutino0_3.0-1_amd64.deb 1aa1b41bf269f8d362b8057207db7f5c 1390262 debug extra routino-dbg_3.0-1_amd64.deb b8cf71a3fde3ff7bd638eac20948a724 1468892 web extra routino-www_3.0-1_all.deb 800b2e335bd750f107625121c8d324b0 452628 misc extra routino_3.0-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV+ybmAAoJEGdQ8QrojUrxxKkQAKJYio1jiZpU3hZ4A5+PLJOF aOWBNtZ5CBVoqPjszeCaTVE5q+GNt5cjB8oLTvaFS3eImG8PD8ZHtRDSMFUTN2Wg /SxpQBhcyFITeOOaOvEKMGfcm6o+sHXuW6t7XWdbi1mTkBjxY/PwrpbrefKFgV5/ xtLgrJIQYVe3K+atD7s3MQlfbnNiYRhp3pjbAyqYxnMZktfU+iMLo8iFDQ6FbwVe CgsEnNXk8cLsv4cmN98EqGWHnrMZAXhgxmSooVuoPC0V+Nn3Sn0RDsxveYWdQD/r MoK2BmZk8e0ZHIjrIXn4Z/36VQppedYwuucvq/gCwmyT2Fl9Lgl9nVBqxoP3+DKD IVUPBxbyGIDux9KD1MT9omYrLWiCwsZ0JgzNujsFJo+cfmHtQMx5D3XlPUZw9HRq L1KLgkUYHXbcYUyZC8kShZzDEdBu3uSLxirB3C0Md3ZUUGnUtDVS3VjhsPBH9d+n /ZxPnuu0ifTCmpnOA9eI2VKWl5FTgUBmQLrRaQOtPgYp3ihakvGsfSLBkuJ4xg5s ZrXBRx3ndO97sxC/harLwXZ96ZX9pzzxbQycnBW6R2GRnLUFrajfGY0qMbxQIvZy Z9O3GuqL44iEa7nRF1vKcVeGZ99W0jkwtFBaUvD9abtStqbAMWXZhb4ARIWm2z0u gu1PPWNvKKwvYkwfGK8q =Icq3 -END PGP SIGNATURE-
Processed: fixed 766036 in 1:2.2.16-1, notfixed 497142 in 1:2.55.dfsg1-1, notfixed 395912 in 1.5.4 ...
Processing commands for cont...@bugs.debian.org: > fixed 766036 1:2.2.16-1 Bug #766036 {Done: jald...@debian.org (Jaldhar H. Vyas)} [src:dovecot] dovecot: New upstream version 2.2.14 is available Marked as fixed in versions dovecot/1:2.2.16-1. > notfixed 497142 1:2.55.dfsg1-1 Bug #497142 {Done: Etienne Millon} [rss2email] rss2email: AttributeError: object has no attribute 'type' No longer marked as fixed in versions 1:2.55.dfsg1-1. > notfixed 395912 1.5.4 Bug #395912 {Done: Helmut Grohne } [doxygen] cannot pass objects of non-POD type 'struct va_list' through '...' There is no source info for the package 'doxygen' at version '1.5.4' with architecture '' Unable to make a source version for version '1.5.4' No longer marked as fixed in versions 1.5.4. > fixed 395912 1.5.4-1 Bug #395912 {Done: Helmut Grohne } [doxygen] cannot pass objects of non-POD type 'struct va_list' through '...' Marked as fixed in versions doxygen/1.5.4-1. > fixed 726127 0.2.0-1 Bug #726127 {Done: Serge Hallyn } [libnetcf1] libnetcf1: The function ipcalc_netmask in netcf had a bug for any netmask > 24 Marked as fixed in versions netcf/0.2.0-1. > reassign 769685 python-botocore Bug #769685 {Done: TANIGUCHI Takaki } [src:awscli] awscli: FTBFS: ImportError: Failed to import test module: awscli.testutils Bug reassigned from package 'src:awscli' to 'python-botocore'. No longer marked as found in versions awscli/1.5.5-1. No longer marked as fixed in versions python-botocore/0.81.0-1. > fixed 769685 0.81.0-1 Bug #769685 {Done: TANIGUCHI Takaki } [python-botocore] awscli: FTBFS: ImportError: Failed to import test module: awscli.testutils Marked as fixed in versions python-botocore/0.81.0-1. > affects 769685 + awscli Bug #769685 {Done: TANIGUCHI Takaki } [python-botocore] awscli: FTBFS: ImportError: Failed to import test module: awscli.testutils Added indication that 769685 affects awscli > fixed 769389 1:1.0.57-1 Bug #769389 {Done: Apollon Oikonomopoulos } [src:tgt] tgt: Update homepage field Marked as fixed in versions tgt/1:1.0.57-1. > notfixed 636463 3.0.29-1 Bug #636463 {Done: Ola Lundqvist } [vzctl] vzctl: /etc/vz/dists/scripts/postcreate.sh randomises run-times in /etc/crontab, but not cron.d There is no source info for the package 'vzctl' at version '3.0.29-1' with architecture '' Unable to make a source version for version '3.0.29-1' No longer marked as fixed in versions 3.0.29-1. > fixed 636463 3.0.29.3-1 Bug #636463 {Done: Ola Lundqvist } [vzctl] vzctl: /etc/vz/dists/scripts/postcreate.sh randomises run-times in /etc/crontab, but not cron.d Marked as fixed in versions vzctl/3.0.29.3-1. > notfixed 732798 209-1 Bug #732798 {Done: Felipe Sateler } [systemd] document --full as an option for status There is no source info for the package 'systemd' at version '209-1' with architecture '' Unable to make a source version for version '209-1' No longer marked as fixed in versions 209-1. > fixed 732798 214-1 Bug #732798 {Done: Felipe Sateler } [systemd] document --full as an option for status Marked as fixed in versions systemd/214-1. > notfixed 734937 0.4-1 Bug #734937 {Done: Jaromír Mikeš } [synthv1] [synthv1] No user interface There is no source info for the package 'synthv1' at version '0.4-1' with architecture '' Unable to make a source version for version '0.4-1' No longer marked as fixed in versions synthv1/0.4-1. > fixed 734937 0.4.0-1 Bug #734937 {Done: Jaromír Mikeš } [synthv1] [synthv1] No user interface Marked as fixed in versions synthv1/0.4.0-1. > notfixed 697149 2.10.7 Bug #697149 {Done: Peter Spiess-Knafl } [libpurple0] libpurple: Tcl script example has a typo There is no source info for the package 'libpurple0' at version '2.10.7' with architecture '' Unable to make a source version for version '2.10.7' No longer marked as fixed in versions 2.10.7. > fixed 697149 2.10.7-1 Bug #697149 {Done: Peter Spiess-Knafl } [libpurple0] libpurple: Tcl script example has a typo Marked as fixed in versions pidgin/2.10.7-1. > reassign 676477 src:netcdf Bug #676477 {Done: Bas Couwenberg } [libnetcdfc7] libnetcdfc7: pleace convert to Multi-Arch: same Bug reassigned from package 'libnetcdfc7' to 'src:netcdf'. No longer marked as found in versions netcdf/1:4.1.3-6. No longer marked as fixed in versions netcdf/1:4.3.3.1+ds-1~exp1. > fixed 676477 1:4.3.3.1+ds-1~exp1 Bug #676477 {Done: Bas Couwenberg } [src:netcdf] libnetcdfc7: pleace convert to Multi-Arch: same Marked as fixed in versions netcdf/1:4.3.3.1+ds-1~exp1. > found 676477 1:4.1.3-6 Bug #676477 {Done: Bas Couwenberg } [src:netcdf] libnetcdfc7: pleace convert to Multi-Arch: same Marked as
[merkaartor] 02/23: Merge tag 'upstream/0.18.2'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit a7c27c2a286aad469cb8912492206eed96613cec Merge: 7a126bf e920a8f Author: Bas CouwenbergDate: Fri Sep 18 01:17:45 2015 +0200 Merge tag 'upstream/0.18.2' Upstream version 0.18.2 .travis.yml|17 + .../examples/loader/main.cpp | 8 +- .../examples/trivial/main.cpp | 2 +- .../qtsingleapplication.pro| 1 + .../src/qtlocalpeer.cpp| 7 +- .../src/qtlockedfile_win.cpp | 3 + .../src/qtsingleapplication.cpp| 4 +- .../src/qtsingleapplication.h | 4 +- .../src/qtsingleapplication.pri| 2 +- .../qttoolbardialog-2.2_1-opensource/INSTALL.TXT | 254 - .../LGPL_EXCEPTION.txt |23 - .../qttoolbardialog-2.2_1-opensource/LICENSE.GPL3 | 674 -- .../qttoolbardialog-2.2_1-opensource/LICENSE.LGPL | 504 - .../qttoolbardialog-2.2_1-opensource/README.TXT| 7 - .../buildlib/buildlib.pro |13 - .../qttoolbardialog-2.2_1-opensource/common.pri| 6 - .../qttoolbardialog-2.2_1-opensource/configure | 112 - .../doc/html/classic.css | 139 - .../doc/html/images/qt-logo.png| Bin 4075 -> 0 bytes .../doc/html/images/qttoolbardialog.png| Bin 12323 -> 0 bytes .../doc/html/index.html|41 - .../doc/html/qttoolbardialog-members.html | 371 - .../doc/html/qttoolbardialog.dcf |29 - .../doc/html/qttoolbardialog.html |89 - .../doc/html/qttoolbardialog.index |54 - .../doc/html/qttoolbardialog.qch | Bin 50176 -> 0 bytes .../doc/html/qttoolbardialog.qhp |46 - .../doc/html/qttoolbarmanager-members.html |85 - .../doc/html/qttoolbarmanager.html | 102 - .../doc/images/qt-logo.png | Bin 4075 -> 0 bytes .../doc/images/qttoolbardialog.png | Bin 12323 -> 0 bytes .../doc/index.qdoc |37 - .../examples/examples.pro | 7 - .../examples/simple/images/copy.png| Bin 1338 -> 0 bytes .../examples/simple/images/cut.png | Bin 1323 -> 0 bytes .../examples/simple/images/new.png | Bin 852 -> 0 bytes .../examples/simple/images/open.png| Bin 2073 -> 0 bytes .../examples/simple/images/paste.png | Bin 1745 -> 0 bytes .../examples/simple/images/save.png| Bin 1187 -> 0 bytes .../examples/simple/main.cpp |59 - .../examples/simple/mainwindow.cpp | 455 - .../examples/simple/mainwindow.h | 122 - .../examples/simple/simple.pro |11 - .../examples/simple/simple.qrc |10 - .../qttoolbardialog.pro| 5 - .../src/QtToolBarDialog| 1 - .../src/QtToolBarManager | 1 - .../src/qttoolbardialog.cpp| 1892 .../src/qttoolbardialog.h | 144 - .../src/qttoolbardialog.pri|17 - .../src/qttoolbardialog.qrc|10 - 3rdparty/quazip-0.7/CMakeLists.txt |54 + 3rdparty/quazip-0.7/COPYING| 458 + 3rdparty/quazip-0.7/Doxyfile | 1722 +++ 3rdparty/quazip-0.7/FindQuaZip.cmake |40 + 3rdparty/quazip-0.7/NEWS.txt | 149 + 3rdparty/quazip-0.7/README.txt |66 + .../quazip-0.7/doc/html/JlCompress_8h_source.html | 131 + 3rdparty/quazip-0.7/doc/html/annotated.html|78 + 3rdparty/quazip-0.7/doc/html/bc_s.png | Bin 0 -> 676 bytes 3rdparty/quazip-0.7/doc/html/bdwn.png | Bin 0 -> 147 bytes .../doc/html/classJlCompress-members.html |69 + 3rdparty/quazip-0.7/doc/html/classJlCompress.html | 475 + .../doc/html/classQuaAdler32-members.html |67 + 3rdparty/quazip-0.7/doc/html/classQuaAdler32.html | 194 + .../doc/html/classQuaAdler32__coll__graph.map | 3 + .../doc/html/classQuaAdler32__coll__graph.md5 | 1 + .../doc/html/classQuaAdler32__coll__graph.png | Bin 0 -> 3849 bytes .../doc/html/classQuaAdler32__inherit__graph.map | 3 + .../doc/html/classQuaAdler32__inherit__graph.md5 | 1 + .../doc/html/classQuaAdler32__inherit__graph.png | Bin 0 -> 3849 bytes
[merkaartor] 03/23: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 220e97a30ffc1dbc48c1ebc04de27b8e73610081 Author: Bas CouwenbergDate: Fri Sep 18 01:18:27 2015 +0200 New upstream release. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d5dc64..304d463 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -merkaartor (0.18.1-4) UNRELEASED; urgency=medium +merkaartor (0.18.2-1) UNRELEASED; urgency=medium + * New upstream release. * Move package to Debian GIS team, changes: - Move Maintainer to Uploaders - Set Debian GIS Project as Maintainer @@ -12,7 +13,7 @@ merkaartor (0.18.1-4) UNRELEASED; urgency=medium * Switch to source format 3.0 (quilt). * Use minimal dh rules. - -- Bas Couwenberg Sat, 22 Aug 2015 21:39:31 +0200 + -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 merkaartor (0.18.1-3) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 05/23: Update copyright file using copyright-format 1.0.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 5f2d80b47c600068cdea9e79ce3e8eab1eada2b4 Author: Bas CouwenbergDate: Fri Sep 18 02:38:30 2015 +0200 Update copyright file using copyright-format 1.0. --- debian/changelog | 1 + debian/copyright | 436 +++ 2 files changed, 276 insertions(+), 161 deletions(-) diff --git a/debian/changelog b/debian/changelog index 30022fd..e245242 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Switch to source format 3.0 (quilt). * Use minimal dh rules. * Drop patches applied upstream. + * Update copyright file using copyright-format 1.0. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/copyright b/debian/copyright index 8c8966e..56420ed 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,162 +1,276 @@ -This package was debianized by bart on -Sat, 28 Oct 2006 12:59:04 +0200. - -It was downloaded from http://www.merkaartor.org/ - -Copyright 2006-2010 Bart Vanhauwaert, Chris Browet and others - -AUTHORS - -Bart Vanhauwaert bvh-...@irule.be -Chris "Koying" Browet -Elrond elrond+openstreetmap@samba-tng.org -Oliver Heesakkers -Patric Cameron -Geoff Richards -Raphael Studer -Matt Williams -Daniel van Gerpen -Colin Marquardt -Andreas Laas -Vincent Meurisse -Dirk Stöcker -Tomás Mika -Yves "LonelyPixel" Goergen -Toby Speight - - -License: -This program is licensed under the GNU Public License v2 - -Merkaartor uses icons from the Tango Desktop Project. The Tango base icon theme -is licensed under the Creative Commons Attribution Share-Alike license (see -below). -- http://tango.freedesktop.org/ - -The Debian packaging is -Copyright (C) 2006, bart -Copyright (C) 2008 Christoph Berg -Copyright (C) 2008-2009 Bernd Zeimetz -and is licensed under the GPL. - -On Debian systems, a copy of the GNU GPL 2 can be found in -`/usr/share/common-licenses/GPL-2'. - - -Merkaator ships boost-ggl, which is not part of libboost yet: - - Generic Geometry Library - - Copyright Barend Gehrels 1995-2009, Geodan Holding B.V. Amsterdam, the Netherlands. - Copyright Bruno Lalande 2008, 2009 - Use, modification and distribution is subject to the Boost Software License, - Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at - http://www.boost.org/LICENSE_1_0.txt) - - Boost Software License - Version 1.0 - August 17th, 2003 - - Permission is hereby granted, free of charge, to any person or organization - obtaining a copy of the software and accompanying documentation covered by - this license (the "Software") to use, reproduce, display, distribute, - execute, and transmit the Software, and to prepare derivative works of the - Software, and to permit third-parties to whom the Software is furnished to - do so, all subject to the following: - - The copyright notices in the Software and this entire statement, including - the above license grant, this restriction and the following disclaimer, - must be included in all copies of the Software, in whole or in part, and - all derivative works of the Software, unless such copies or derivative - works are solely in the form of machine-executable object code generated by - a source language processor. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT - SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE - FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - - - - -Merkaartor ships with a zlib copy: - -/* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.3, July 18th, 2005 - Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2.
[merkaartor] 06/23: Restructure control file with cme.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit f8bee53533fcc969dff6628ac67ba34d61a097b0 Author: Bas CouwenbergDate: Fri Sep 18 02:41:30 2015 +0200 Restructure control file with cme. --- debian/changelog | 1 + debian/control | 31 ++- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index e245242..1a7e6cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Use minimal dh rules. * Drop patches applied upstream. * Update copyright file using copyright-format 1.0. + * Restructure control file with cme. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/control b/debian/control index 2e7224e..6a6b17a 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,27 @@ Source: merkaartor -Section: science -Priority: extra Maintainer: Debian GIS Project Uploaders: Bernd Zeimetz , Bas Couwenberg -Build-Depends: debhelper (>= 9), zlib1g-dev, - libqtwebkit-dev, libqt4-dev (>= 4:4.4.3), - libexiv2-dev, sharutils, libgdal-dev, libxml2-dev, libxslt1-dev, - libboost-dev (>= 1.38), libboost-math-dev (>= 1.38), libboost-serialization-dev (>= 1.38), - libgps-dev, libzbarqt-dev (>= 0.10), libzbar-dev (>= 0.10), libspatialite-dev, libproj-dev, - libproxy-dev +Section: science +Priority: extra +Build-Depends: debhelper (>= 9), + libboost-dev, + libboost-math-dev, + libboost-serialization-dev, + libexiv2-dev, + libgdal-dev, + libgps-dev, + libproj-dev, + libproxy-dev, + libqtwebkit-dev, + libqt4-dev, + libspatialite-dev, + libxml2-dev, + libxslt1-dev, + libzbarqt-dev, + libzbar-dev, + sharutils, + zlib1g-dev Standards-Version: 3.8.4 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/merkaartor.git Vcs-Git: git://anonscm.debian.org/pkg-grass/merkaartor.git @@ -17,7 +29,8 @@ Homepage: http://www.merkaartor.be/ Package: merkaartor Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Suggests: spatialite-bin Description: map editor for OpenStreetMap.org Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ 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 merkaartor_0.18.2-1~exp1_amd64.changes
merkaartor_0.18.2-1~exp1_amd64.changes uploaded successfully to localhost along with the files: merkaartor_0.18.2-1~exp1.dsc merkaartor_0.18.2.orig.tar.gz merkaartor_0.18.2-1~exp1.debian.tar.xz merkaartor_0.18.2-1~exp1_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
[merkaartor] 07/23: Update Vcs-Browser URL to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit d2f7f505f292a3c55864026ff69edd260554308e Author: Bas CouwenbergDate: Fri Sep 18 02:44:43 2015 +0200 Update Vcs-Browser URL to use HTTPS. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1a7e6cd..d5673af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Drop patches applied upstream. * Update copyright file using copyright-format 1.0. * Restructure control file with cme. + * Update Vcs-Browser URL to use HTTPS. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/control b/debian/control index 6a6b17a..679c3a2 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 9), sharutils, zlib1g-dev Standards-Version: 3.8.4 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/merkaartor.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/merkaartor.git Vcs-Git: git://anonscm.debian.org/pkg-grass/merkaartor.git Homepage: http://www.merkaartor.be/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 15/23: Add patch to fix various typos.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit cb37e9cc2ebf8752ead48cf329500e37115f8d7a Author: Bas CouwenbergDate: Fri Sep 18 15:12:26 2015 +0200 Add patch to fix various typos. --- debian/changelog | 3 +- debian/patches/series | 1 + debian/patches/various-typos.patch | 645 + 3 files changed, 648 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b97116e..268f40d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Disable zbar, is Qt4-only. * Use dh_auto_* commands in overrides. * Disable SpatiaLite support, causes FTBFS. + * Add patch to fix various typos. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 @@ -528,7 +529,7 @@ merkaartor (0.0.12~svn10441-1) experimental; urgency=low merkaartor (0.0.11~svn7913-2) unstable; urgency=low - * Explicitely call qmake-qt4. (Closes: #495807) + * Explicitly call qmake-qt4. (Closes: #495807) -- Christoph Berg Sat, 23 Aug 2008 13:46:25 +0200 diff --git a/debian/patches/series b/debian/patches/series index 2820a49..9228595 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Fixed-version-info-in-tarballs.patch 0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch quazip-qt5.patch +various-typos.patch diff --git a/debian/patches/various-typos.patch b/debian/patches/various-typos.patch new file mode 100644 index 000..0e879da --- /dev/null +++ b/debian/patches/various-typos.patch @@ -0,0 +1,645 @@ +Description: Fix various typos. + * Replace 'succesfully' with 'successfully'. + * Replace 'Explicitely' with 'Explicitly'. + * Replace 'GNU Public License' with 'GNU General Public License'. + * Replace 'allows to ' with 'allows to ing' or 'allows one to '. +Author: Bas Couwenberg + +--- a/src/qextserialport/posix_qextserialport.cpp b/src/qextserialport/posix_qextserialport.cpp +@@ -823,7 +823,7 @@ bool Posix_QextSerialPort::open(OpenMode + Posix_File->setFileName(port); + qDebug("Trying to open File"); + if (Posix_File->open(QIODevice::ReadWrite|QIODevice::Unbuffered)) { +-qDebug("Opened File succesfully"); ++qDebug("Opened File successfully"); + /*set open mode*/ + QIODevice::open(mode); + +--- a/CHANGELOG b/CHANGELOG +@@ -74,7 +74,7 @@ v0.18 + * ADD : Self-contained style packages (*.msz) + * FIX : mutex deadlock (refs #3319) + * FIX : Protect updatemeta (fixes #3317) +-* ADD : Allow to show/hide the toolbars labels (toolbar context menu) ++* ADD : Allow showing/hiding the toolbars labels (toolbar context menu) + * ADD : "Select parent(s)" & "Download missing children" to the Feature menu (refs #3314) + * FIX : force redrawing the osm map when zooming (fixes #3316) + * FIX : Mutex-lock update of the painters (fixes #3315) +@@ -122,9 +122,9 @@ v0.18 + * FIX : do not create ~/.merkaartor in portable mode + * FIX : Handle UTF8 in GDAL fields + * CHG : When doing GDAL imports, always confirm input projection +-* ADD : Allow to use projection chooser in projection editor +-* ADD : Allow to enter WKT in projection chooser +-* ADD : Goto dialog: Allow to show/edit coordinates in projected units ++* ADD : Allow using projection chooser in projection editor ++* ADD : Allow entering WKT in projection chooser ++* ADD : Goto dialog: Allow showing/editing coordinates in projected units + * FIX : Only check styles for POI nodes + * FIX : Feature dock: Relations not shown in "All' tab + * FIX : log2 not available on FreeBSD (fixes #3211) +@@ -136,17 +136,17 @@ v0.18 + v0.17 + * FIX : Problem importing OSM comprising new features + * ADD : Move "validation" style rules to a new "Validation.mas" style +-* ADD : Allow to align background image with +pan ++* ADD : Allow aligning background image with +pan + * CHG : Rename "Create rectangle" to "Create rectangular building" and automatically add "building=yes" + * ADD : Remember "Create polygon" last number of sides +-* ADD : "Relation->Add to Multipolygon"; allows to create or add to a multipolygon relation (closes 2889) ++* ADD : "Relation->Add to Multipolygon"; allows creating or adding to a multipolygon relation (closes 2889) + * ADD : Network timeout preference + * CHG : Paste Tags : Allow any<->any pasting but only takes top level features into account (fixes #3174) + * FIX : When loading history from MDC, do not import the command if the layer is not found + save layers dirty level in MDC (fixes #3176) + * FIX : Locked zoom was bugged since passage to real pixel per Meter (fixes
[merkaartor] 12/23: Reorder qmake options.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit aee8d310d91f0eeada33ce197aff94e374d36484 Author: Bas CouwenbergDate: Fri Sep 18 12:59:36 2015 +0200 Reorder qmake options. --- debian/rules | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/rules b/debian/rules index b20d11c..a735ea0 100755 --- a/debian/rules +++ b/debian/rules @@ -41,18 +41,19 @@ override_dh_clean: override_dh_auto_configure: echo '#define SVNREV $(SVNREV)' > src/revision.h cd translations && make release - qmake Merkaartor.pro NOWEBKIT=1 \ - TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \ - PREFIX=/usr \ - GEOIMAGE=1 \ - PROJ=1 \ - GDAL=1 \ - GPSDLIB=1 \ - ZBAR=0 \ - SPATIALITE=1 \ - LIBPROXY=1 \ - SYSTEM_QUAZIP=1 \ - $(RELEASEFLAGS) + qmake Merkaartor.pro \ + TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \ + PREFIX=/usr \ + GDAL=1 \ + GEOIMAGE=1 \ + GPSDLIB=1 \ + LIBPROXY=1 \ + NOWEBKIT=1 \ + PROJ=1 \ + SPATIALITE=1 \ + SYSTEM_QUAZIP=1 \ + ZBAR=0 \ + $(RELEASEFLAGS) override_dh_auto_build: $(MAKE) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] annotated tag upstream/0.18.2 created (now fdcd8b6)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.18.2 in repository merkaartor. at fdcd8b6 (tag) tagging e920a8fe56f3176a051b24f4c013ebb12cc7d2d7 (commit) replaces 0.18.1 tagged by Bas Couwenberg on Fri Sep 18 01:17:44 2015 +0200 - Log - Upstream version 0.18.2 Bas Couwenberg (1): Imported Upstream version 0.18.2 Bernd Zeimetz (1): Merge tag '0.18.1' into upstream Chris "Koying" Browet (61): CHG : Paste Tags : Allow any<->any pasting but only takes top level features into account (fixes #3174) i18n Add Bing plugins to windows install FIX : cannot save mas style FIX : assert when creating a polygon and a source tag is auto-added FIX : style editor issues FIX : crash on file->new with Bing (fixes #3179) FIX : break roads moves node to origin (fixes #3180) Compilation error when PROJ=1 is not enabled (fixes #3195) FIX : duplicate custom toolbars (refs #3194) FIX : toggle ALL toolbars (refs #3194) i18n i18n + Add Croatian language forgotten file ADD : Network timeout preference show network timeout in seconds Display "zoomed" previous zoom level for TMS, too (ref #3181) FIX : Only ask whether to discard changes if they actually weren't saved FIX : Only override ESC key behaviour when editing tags (fixes #1791) FIX : Properly check for Ways and Areas FIX : over-optimization of indeFind : POI were not draxn when nodes were hidden CHG : POI excludes a list of technical tags FIX : Complete proxy problem solution FIX : Cadastre issue with 1 digit departement FIX : Plugins were not saved in doc templates Qt 4.4.x fix FIX : Cannot uncheck "Use Language" (fixes #3203) FIX : Not download background images while panning in some interactions (fixes #3202) FIX : crash (on linux 64 bits only?) with empty projections and without proj4 (fixes #3204) FIX : Cadastre: departements are 2 digits minimum FIX : None adapter not working FIX : RelationAddFeatureCommand::undo() issue CHG : Set default max search results to 999 FIX : Bug with short osm link Self-clipping opt-in via --selfclip FIX : Do self-clipping unless Qt is >= 4.7.1 (fixes #3206) FIX : Macosx menu issue by Aleks i18n FIX : Background image refresh issue when going to tiled from direct FIX : Compilation error with WEBKIT=0 (fixes #3224) FIX : Make sure new id's are unique (fixes #3223) FIX : log2 not available on FreeBSD (fixes #3211) FIX : Feature dock: Relations not shown in "All' tab (rel #3220) FIX : Only check styles for POI nodes FIX : Handle UTF8 in GDAL fields FIX : do not create ~/.merkaartor in portable mode FIX : do not save locale info to registry in portable mode FIX : Background cache size not limited (fixes #3227) FIX : Use "=" rather than "is" in selection dialog (fixes #3218) FIX : Remote Protocol: Send back aknowledgment (fixes #3230) FIX : Workaround for labels on long ways in Qt > 4.7 FIX : do not prevent upload of deletion of not-uploadable tags (fixes #3236) FIX : Bing maps: Make initial providers request non-blocking to avoid NULL document (fixes #3241) CHANGELOG FIX : Crash with an external MDC with WMS/TMS not defined locally FIX : Document bounding box calculation tweak to bypass null coordboxes FIX : List index out of range when merging node in relation with another node (fixes #3234) FIX : Issue when creating nodes when active layer is closed (fixes #3244) FIX : Do not simplify (i.e. remove) nodes outside the downloaded area (fixes #3246) FIX : Harden Filter Editor (fixes #3247) FIX : Unblock indexing after an aborted doawnload, too (fixes #3248) Chris "koying" Browet (1): FIX : Crash when restoring shortcuts of disappeared actions (fixes #3205) Chris Browet (21): Backport of completed Bing Maps FIX : Allow creating a way in non-separate move mode with a virtual node selected (fixes #3172) .gitignore *.po Do not show watermark if the layer is hidden FIX : Locked zoom was bugged since passage to real pixel per Meter (fixes #3175) FIX : When loading history from MDC, do not import the command if the layer is not found + save layers dirty level in MDC (fixes #3176) French Cadastre: Gracefully abort if the cadastre is in image format (fixes #3184) CHG : Move handling of Tag strings list to Global FIX : Do not consider aborted http requests as errors FIX : style is not applied when changed in preferences dialog (fixes #3190) FIX : Crash if cannot reload the background plugin from MDC FIX : layout issues on Mac
[merkaartor] branch pristine-tar updated (9f594d1 -> 7e6bbbc)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository merkaartor. from 9f594d1 pristine-tar data for merkaartor_0.18.1.orig.tar.gz new 7e6bbbc pristine-tar data for merkaartor_0.18.2.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: merkaartor_0.18.2.orig.tar.gz.delta | Bin 0 -> 60545 bytes merkaartor_0.18.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 merkaartor_0.18.2.orig.tar.gz.delta create mode 100644 merkaartor_0.18.2.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 04/23: Drop patches applied upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 9dae0349db03180efc8ce9535b3bf8215c3b3fa3 Author: Bas CouwenbergDate: Fri Sep 18 01:23:57 2015 +0200 Drop patches applied upstream. --- debian/changelog| 1 + debian/patches/0002-linker_fixes.patch | 26 debian/patches/arm_qreal_build_fix | 71 - debian/patches/gcc-4.7-ftbfs-fix| 57 -- debian/patches/libgps20_build-fix.patch | 65 -- debian/patches/series | 4 -- 6 files changed, 1 insertion(+), 223 deletions(-) diff --git a/debian/changelog b/debian/changelog index 304d463..30022fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium - Update Homepage URL to www.merkaartor.be. * Switch to source format 3.0 (quilt). * Use minimal dh rules. + * Drop patches applied upstream. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/patches/0002-linker_fixes.patch b/debian/patches/0002-linker_fixes.patch deleted file mode 100644 index 59abdc3..000 --- a/debian/patches/0002-linker_fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Bernd Zeimetz -Date: Tue, 5 Jul 2011 22:16:57 +0200 -Subject: linker_fixes - - src/src.pro |9 + - 1 files changed, 9 insertions(+), 0 deletions(-) - a/src/src.pro -+++ b/src/src.pro -@@ -165,6 +165,15 @@ win32 { - } - } - -+ -+unix { -+CONFIG += link_pkgconfig -+PKGCONFIG += sqlite3 -+} -+win32 { -+LIBS += -lsqlite3 -+} -+ - DEFINES += SHARE_DIR=$${SHARE_DIR} - INSTALLS += target - diff --git a/debian/patches/arm_qreal_build_fix b/debian/patches/arm_qreal_build_fix deleted file mode 100644 index 539dbfd..000 --- a/debian/patches/arm_qreal_build_fix +++ /dev/null @@ -1,71 +0,0 @@ -806029c2d1ac26e92c5d683360452e71986e9187 a/src/Features/Node.cpp -+++ b/src/Features/Node.cpp -@@ -697,13 +697,13 @@ void PhotoNode::drawTouchup(QPainter& th - QRect box(me - QPoint(5, 3), QSize(10, 6)); - thePainter.drawRect(box); - if (theView->renderOptions().options.testFlag(RendererOptions::PhotosVisible) && theView->pixelPerM() > M_PREFS->getRegionalZoom()) { --qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - QPoint phPt; - - if (photoLocationBR) { - phPt = me + QPoint(10*rt, 10*rt); - } else { --qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - qreal phRt = 1. * Photo->width() / Photo->height(); - phPt = me - QPoint(10*rt, 10*rt) - QPoint(M_PREFS->getMaxGeoPicWidth()*rt, M_PREFS->getMaxGeoPicWidth()*rt/phRt); - } -@@ -723,7 +723,7 @@ void PhotoNode::drawHover(QPainter& theP - if (TEST_RFLAGS(RendererOptions::PhotosVisible) && theView->pixelPerM() > M_PREFS->getRegionalZoom()) { - QPoint me(theView->toView(this)); - --qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - qreal phRt = 1. * Photo->width() / Photo->height(); - QPoint phPt; - if (photoLocationBR) { -@@ -742,7 +742,7 @@ qreal PhotoNode::pixelDistance(const QPo - QPoint me = theView->toView(const_cast (this)); - #ifdef GEOIMAGE - if (TEST_RFLAGS(RendererOptions::PhotosVisible) && theView->pixelPerM() > M_PREFS->getRegionalZoom()) { --qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - qreal phRt = 1. * Photo->width() / Photo->height(); - QPoint phPt; - if (photoLocationBR) { a/src/common/Projection.cpp -+++ b/src/common/Projection.cpp -@@ -151,17 +151,17 @@ void Projection::projTransform(ProjProje -ProjProjection dstdefn, -long point_count, int point_offset, qreal *x, qreal *y, qreal *z ) - { --pj_transform(srcdefn, dstdefn, point_count, point_offset, x, y, z); -+pj_transform(srcdefn, dstdefn, point_count, point_offset, (double *)x, (double *)y, (double *)z); - } - - void Projection::projTransformFromWGS84(long point_count, int point_offset, qreal *x, qreal *y, qreal *z ) const - { --pj_transform (theWGS84Proj, theProj, point_count, point_offset, x, y, z); -+pj_transform (theWGS84Proj, theProj, point_count, point_offset, (double *)x, (double *)y, (double *)z); - } - - void Projection::projTransformToWGS84(long point_count, int point_offset, qreal *x, qreal *y, qreal *z ) const - { --pj_transform(theProj, theWGS84Proj, point_count, point_offset, x, y, z);
[merkaartor] 09/23: Rename old style config sections in gbp.conf.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 03ee217ecf1de5bad02f9d0f4840e44e3b540390 Author: Bas CouwenbergDate: Fri Sep 18 10:31:08 2015 +0200 Rename old style config sections in gbp.conf. --- debian/changelog | 1 + debian/gbp.conf | 19 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4b870b4..0a465ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Restructure control file with cme. * Update Vcs-Browser URL to use HTTPS. * Override dh_install to use --list-missing. + * Rename old style config sections in gbp.conf. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/gbp.conf b/debian/gbp.conf index 418cefe..a89eb4e 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,29 +1,40 @@ # Configuration file for git-buildpackage and friends [DEFAULT] + # the default branch for upstream sources: upstream-branch = upstream + # the default branch for the debian patch: debian-branch = master + # the default tag formats used: upstream-tag = upstream/%(version)s debian-tag = debian/%(version)s + # use pristine-tar: pristine-tar = True -# Options only affecting git-buildpackage -[git-buildpackage] + +# Options only affecting gbp-buildpackage +[buildpackage] + # uncomment this to automatically GPG sign tags sign-tags = True -# Options only affecting git-dch -[git-dch] + +# Options only affecting gbp-dch +[dch] + #git-log = --no-merges #snapshot-number = snapshot + 1 + # include 0 digits of the commit id in the changelog enty id-length = 8 + # don't include information from meta tags meta = True + # what tags to look for to generate bug-closing changelog entries meta-closes = Closes|LP -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 11/23: Switch to Qt5.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 2ef803abd6522c0393a677e25c4ab9333a4876d3 Author: Bas CouwenbergDate: Fri Sep 18 03:00:22 2015 +0200 Switch to Qt5. Disable zbar, is Qt4-only. --- debian/changelog | 2 ++ debian/control | 10 +++--- ...ompilation-issues-with-GEOIMAGE-1-and-Qt5.patch | 41 ++ debian/patches/quazip-qt5.patch| 15 debian/patches/series | 2 ++ debian/rules | 10 -- 6 files changed, 73 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index b904e24..2c7eb58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Override dh_install to use --list-missing. * Rename old style config sections in gbp.conf. * Add patch to fix version detection for tarball releases. + * Switch to Qt5. + * Disable zbar, is Qt4-only. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/control b/debian/control index 679c3a2..0c3ddb3 100644 --- a/debian/control +++ b/debian/control @@ -13,13 +13,15 @@ Build-Depends: debhelper (>= 9), libgps-dev, libproj-dev, libproxy-dev, - libqtwebkit-dev, - libqt4-dev, + libqt5svg5-dev, + libqt5webkit5-dev, + libquazip-qt5-dev, libspatialite-dev, libxml2-dev, libxslt1-dev, - libzbarqt-dev, - libzbar-dev, + qt5-qmake, + qtbase5-dev, + qttools5-dev-tools, sharutils, zlib1g-dev Standards-Version: 3.8.4 diff --git a/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch b/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch new file mode 100644 index 000..70b1de3 --- /dev/null +++ b/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch @@ -0,0 +1,41 @@ +From e6d015a953a163f174e09a9b50c9bb8bc19593e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= +Date: Mon, 27 Jul 2015 14:22:37 +0200 +Subject: Fixed compilation issues with GEOIMAGE=1 and Qt5. +Origin: https://github.com/openstreetmap/merkaartor/commit/e6d015a953a163f174e09a9b50c9bb8bc19593e4 + +--- + src/Docks/GeoImageDock.cpp | 4 ++-- + src/Docks/GeoImageDock.h | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp +@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis + + Exiv2::Image::AutoPtr image; + Exiv2::ExifData exifData; +-bool positionValid = FALSE; ++bool positionValid = false; + + Layer *theLayer; + if (photoLayer == NULL) { +@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage( + double lat = 0.0, lon = 0.0; + Exiv2::Image::AutoPtr image; + Exiv2::ExifData exifData; +-bool positionValid = FALSE; ++bool positionValid = false; + + if (!QFile::exists(file)) { + return pos; +--- a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + class ImageView; + diff --git a/debian/patches/quazip-qt5.patch b/debian/patches/quazip-qt5.patch new file mode 100644 index 000..7a27f9a --- /dev/null +++ b/debian/patches/quazip-qt5.patch @@ -0,0 +1,15 @@ +Description: Link quazip-qt5 for Qt5 build. +Author: Bas Couwenberg +Bug: https://github.com/openstreetmap/merkaartor/issues/66 + +--- a/src/src.pro b/src/src.pro +@@ -15,7 +15,7 @@ isEmpty(SYSTEM_QUAZIP) { + DEFINES += QUAZIP_STATIC + include(../3rdparty/quazip-0.7/quazip.pri) + } else { +- LIBS += -lquazip ++ LIBS += -lquazip-qt5 + } + + #Qt Version diff --git a/debian/patches/series b/debian/patches/series index c0e662b..2820a49 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-Fixed-version-info-in-tarballs.patch +0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch +quazip-qt5.patch diff --git a/debian/rules b/debian/rules index d069f07..b20d11c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,9 @@ else CFLAGS += -O2 endif +# Use Qt5 +export QT_SELECT=5 + %: dh $@ --parallel @@ -38,16 +41,17 @@ override_dh_clean: override_dh_auto_configure: echo '#define SVNREV $(SVNREV)' > src/revision.h cd translations && make release - qmake-qt4 Merkaartor.pro NOWEBKIT=1 \ - TRANSDIR_SYSTEM="/usr/share/qt4/translations/" \ + qmake Merkaartor.pro NOWEBKIT=1 \ +
[merkaartor] 08/23: Override dh_install to use --list-missing.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit cd467fa4dcb5bc5195f28d302ccbe9e34e48e414 Author: Bas CouwenbergDate: Fri Sep 18 02:45:52 2015 +0200 Override dh_install to use --list-missing. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index d5673af..4b870b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Update copyright file using copyright-format 1.0. * Restructure control file with cme. * Update Vcs-Browser URL to use HTTPS. + * Override dh_install to use --list-missing. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/rules b/debian/rules index ac8fe1e..d069f07 100755 --- a/debian/rules +++ b/debian/rules @@ -65,6 +65,9 @@ override_dh_auto_install: install -D -m644 $(CURDIR)/src/merkaartor.desktop \ $(CURDIR)/debian/merkaartor/usr/share/applications/merkaartor.desktop +override_dh_install: + dh_install --list-missing + override_dh_installchangelogs: dh_installchangelogs CHANGELOG -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 20/23: Don't install merkaartor.{png,desktop} twice.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit afb48ce5df359c53d64053555df04859dc963ad0 Author: Bas CouwenbergDate: Fri Sep 18 18:56:45 2015 +0200 Don't install merkaartor.{png,desktop} twice. --- debian/rules | 4 1 file changed, 4 deletions(-) diff --git a/debian/rules b/debian/rules index b9ddad4..280d76e 100755 --- a/debian/rules +++ b/debian/rules @@ -64,10 +64,6 @@ override_dh_auto_install: install -d $(CURDIR)/debian/merkaartor/usr/share/pixmaps install -D -m644 $(CURDIR)/Icons/Merkaartor.xpm \ $(CURDIR)/debian/merkaartor/usr/share/pixmaps/merkaartor.xpm - install -D -m644 $(CURDIR)/merkaartor.png \ - $(CURDIR)/debian/merkaartor/usr/share/icons/merkaartor.png - install -D -m644 $(CURDIR)/src/merkaartor.desktop \ - $(CURDIR)/debian/merkaartor/usr/share/applications/merkaartor.desktop override_dh_install: dh_install --list-missing -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 21/23: Mark patches as Forwarded.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 4b628203c1a7e36fd3fb2327c6994b1a2cd4d1a9 Author: Bas CouwenbergDate: Fri Sep 18 19:12:51 2015 +0200 Mark patches as Forwarded. --- debian/patches/desktop-keywords.patch | 1 + debian/patches/hardening-buildflags.patch | 1 + debian/patches/various-typos.patch| 1 + 3 files changed, 3 insertions(+) diff --git a/debian/patches/desktop-keywords.patch b/debian/patches/desktop-keywords.patch index f451974..c9b5e29 100644 --- a/debian/patches/desktop-keywords.patch +++ b/debian/patches/desktop-keywords.patch @@ -1,5 +1,6 @@ Description: Add Keywords to .desktop file. Author: Bas Couwenberg +Forwarded: https://github.com/openstreetmap/merkaartor/pull/68 --- a/src/merkaartor.desktop +++ b/src/merkaartor.desktop diff --git a/debian/patches/hardening-buildflags.patch b/debian/patches/hardening-buildflags.patch index 8b6e69a..56536ff 100644 --- a/debian/patches/hardening-buildflags.patch +++ b/debian/patches/hardening-buildflags.patch @@ -1,5 +1,6 @@ Description: Add hardening buildflags to qmake build. Author: Bas Couwenberg +Forwarded: https://github.com/openstreetmap/merkaartor/pull/68 --- a/src/Config.pri +++ b/src/Config.pri diff --git a/debian/patches/various-typos.patch b/debian/patches/various-typos.patch index 0e879da..2333c7a 100644 --- a/debian/patches/various-typos.patch +++ b/debian/patches/various-typos.patch @@ -4,6 +4,7 @@ Description: Fix various typos. * Replace 'GNU Public License' with 'GNU General Public License'. * Replace 'allows to ' with 'allows to ing' or 'allows one to '. Author: Bas Couwenberg +Forwarded: https://github.com/openstreetmap/merkaartor/pull/68 --- a/src/qextserialport/posix_qextserialport.cpp +++ b/src/qextserialport/posix_qextserialport.cpp -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] tag debian/0.18.2-1.exp1 created (now 9750a34)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.18.2-1.exp1 in repository merkaartor. at 9750a34 (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/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 18/23: Add patch to add Keywords to merkaartor.desktop.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor. commit 465764bee153d4eae46b01e6374f57dc27306da6 Author: Bas CouwenbergDate: Fri Sep 18 15:26:36 2015 +0200 Add patch to add Keywords to merkaartor.desktop. --- debian/changelog | 1 + debian/patches/desktop-keywords.patch | 11 +++ debian/patches/series | 1 + 3 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 50b1294..e3836c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium * Add patch to fix various typos. * Add patch to add hardening buildflags to qmake build. * Don't create empty usr/sbin directory. + * Add patch to add Keywords to merkaartor.desktop. -- Bas Couwenberg Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/patches/desktop-keywords.patch b/debian/patches/desktop-keywords.patch new file mode 100644 index 000..f451974 --- /dev/null +++ b/debian/patches/desktop-keywords.patch @@ -0,0 +1,11 @@ +Description: Add Keywords to .desktop file. +Author: Bas Couwenberg + +--- a/src/merkaartor.desktop b/src/merkaartor.desktop +@@ -10,4 +10,4 @@ Exec=merkaartor + Terminal=false + StartupNotify=false + Categories=Education;Geography;Network;Qt; +- ++Keywords=OSM;GIS;Map;Geo diff --git a/debian/patches/series b/debian/patches/series index 24c3182..dd10a96 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ quazip-qt5.patch various-typos.patch hardening-buildflags.patch +desktop-keywords.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] 01/01: pristine-tar data for merkaartor_0.18.2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository merkaartor. commit 7e6bbbc8d683e15da99ec48f264801dfce0604af Author: Bas CouwenbergDate: Fri Sep 18 01:17:44 2015 +0200 pristine-tar data for merkaartor_0.18.2.orig.tar.gz --- merkaartor_0.18.2.orig.tar.gz.delta | Bin 0 -> 60545 bytes merkaartor_0.18.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/merkaartor_0.18.2.orig.tar.gz.delta b/merkaartor_0.18.2.orig.tar.gz.delta new file mode 100644 index 000..58675fb Binary files /dev/null and b/merkaartor_0.18.2.orig.tar.gz.delta differ diff --git a/merkaartor_0.18.2.orig.tar.gz.id b/merkaartor_0.18.2.orig.tar.gz.id new file mode 100644 index 000..f4f89b8 --- /dev/null +++ b/merkaartor_0.18.2.orig.tar.gz.id @@ -0,0 +1 @@ +bf608343548944344d2df097a0a7b079520500d4 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[proj] branch ubuntu/precise updated (01d926b -> 4ba2b96)
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a change to branch ubuntu/precise in repository proj. from 01d926b Removed projects.h from libproj-dev.install adds e3d50a9 Change priority to optional. Remove duplicate science section. adds 02ceb3f Sync with current sid version. adds b90db59 New upstream version committed adds d38fa69 Removed staling 4.7 files and merged with current 4.8.0-1 changes. adds a58129f Merge branch 'sid' adds 9569749 Restored original config.* stuff from upstream branch. adds c574204 Make sure projects.h is installed adds fa8ace3 Merge changes from 4.8.0-2 source package. adds dc84a02 Add myself to Uploaders. adds f9d1bad Also install geodesic.h. adds f8f9840 Restructure control file with cme. adds 43bef3c Add gbp.conf to use pristine-tar by default. adds ab2c808 Use dh-autoreconf for retooling. adds 6190ba3 Remove generated files on clean. adds 3041a39 Remove unused substitution variable. adds 2bab1dd Bump debhelper compatibility to 9. adds d958f1b Use hardening build flags. adds 38d96f0 Strip debian revision symbols. adds 91ceecd Empty dependency_libs in .la files. adds 8be7a2d Add patches to fix man pages issues. adds a12779e Add header and refresh manpages patch. adds 8415010 Use build-arch and build-indep targets. adds 9cec292 Close bug in changelog. adds 971a45b Also build the Java Native Interface bindings. adds d0be0ba Update symbols for Java bindings. adds 62f170c Update copyright file using copyright-format 1.0. adds a7fc297 Bump Standards-Version to 3.9.5, changes: Vcs-* fields, symbols, copyright. adds 78fb359 Set distribution to experimental. adds 9a96f16 Fix copyright file. adds 26c5024 Update watch file, handle common problems. adds f462824 Fix copyright entry for watch file change. adds cd02ab5 Don't install geodesic.h. adds 6008193 Move from experimental to unstable. adds 644495d proj-data is arch all adds cc3d66a proj-data is arch any because of architecture specific datumgrids. adds 7daeff2 Set distribution to unstable. adds a899f3f Add patch to install nad2bin produced data files in /usr/lib/proj. adds dec51cb Symlink moved data files from /usr/lib/proj to /usr/share/proj. adds a4ff640 Remove debian/TODO, nad2bin data files no longer in /usr/share. adds 8bbd0af Set distribution to unstable. adds 9ffa767 Imported Upstream version 4.9.0~b2 adds 4853bdc Merge tag 'upstream/4.9.0_b2' adds 4d22860 New upstream release. adds d0fb381 Refresh patches. adds f205023 Mangle upstream version to use lowecase RC. adds 96d93e6 Imported Upstream version 4.9.0~rc1 adds 0eb5712 Merge tag 'upstream/4.9.0_rc1' into experimental adds 8b534a2 Imported Upstream version 4.9.0~rc2 adds 27eca9e Merge tag 'upstream/4.9.0_rc2' into experimental adds 3084102 New upstream release. adds 648f22d Refresh patches. adds 6d6e56a Update copyright file. adds d026356 Use minimal dh rules. adds a21f27c Update install files for Multi-Arch paths. adds 6ca86ec Install additional files. adds a970277 Bump Standards-Version to 3.9.6, no changes. adds ec76053 Remove useless autogenerated doxygen files. adds 2ad41a5 Update datumgrids.shar with proj-datumgrid-1.6RC1, it now includes "CTable2" format grid shift files that aren't system dependent, but requires PROJ 4.8.0 or newer. adds 2ea546c Update datumgrids-ch.shar to also include the latest Swiss CHENyx06 dataset, adding CHENYX06a.{asc,gsb} and chenyx06etrs.gsb. adds aca3212 Update nad2bin-data.patch to fix the build when the .lla files from proj-datumgrid-1.5 are not present, and install system independent files from proj-datumgrid-1.6 if they are present. adds e7f4312 Add patch to use the higher precision towgs84 values as specified by Kadaster for EPSG 28991 & 28992. adds f7ae9b4 Don't clean src/org_proj4_PJ.h. adds b769237 Document debian/datumgrids*.shar in copyright file. adds 06af96e Document debian/* in copyright file. adds 1a00f15 Set experimental branch in Vcs-Git and gbp.conf. adds adfd832 Add upstream metadata. adds 02d6fdd Disable Bug-Submit in metadata, requires login. adds bb454d0 Update Vcs-Browser URL to use cgit instead of gitweb. adds cb88827 Update my email to use @debian.org address. adds 90c2845 Drop uupdate from watch file. adds 60621e3 Imported Upstream version 4.9.1~rc1 adds 79d9b78 Merge tag 'upstream/4.9.1_rc1' into experimental
[sfcgal] 01/01: pristine-tar data for sfcgal_1.2.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a commit to branch pristine-tar in repository sfcgal. commit 1dd81348f08d4582e9de6f97e5531adec4b7fecd Author: Sven GeggusDate: Fri Sep 18 17:46:44 2015 +0200 pristine-tar data for sfcgal_1.2.0.orig.tar.gz --- sfcgal_1.2.0.orig.tar.gz.delta | Bin 0 -> 16089 bytes sfcgal_1.2.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/sfcgal_1.2.0.orig.tar.gz.delta b/sfcgal_1.2.0.orig.tar.gz.delta new file mode 100644 index 000..7a7db13 Binary files /dev/null and b/sfcgal_1.2.0.orig.tar.gz.delta differ diff --git a/sfcgal_1.2.0.orig.tar.gz.id b/sfcgal_1.2.0.orig.tar.gz.id new file mode 100644 index 000..110fd00 --- /dev/null +++ b/sfcgal_1.2.0.orig.tar.gz.id @@ -0,0 +1 @@ +0385f26618781f202d917ded848d4090e9eeda93 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[sfcgal] branch pristine-tar updated (d9c7ff4 -> 1dd8134)
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a change to branch pristine-tar in repository sfcgal. from d9c7ff4 pristine-tar data for sfcgal_1.1.0.orig.tar.gz new 1dd8134 pristine-tar data for sfcgal_1.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: sfcgal_1.2.0.orig.tar.gz.delta | Bin 0 -> 16089 bytes sfcgal_1.2.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 sfcgal_1.2.0.orig.tar.gz.delta create mode 100644 sfcgal_1.2.0.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[sfcgal] 02/04: Imported Upstream version 1.2.0
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a commit to branch master in repository sfcgal. commit 08f9bc0f4dd342ed5a9924d00d5f8d7d934f7747 Author: Sven GeggusDate: Fri Sep 18 17:46:43 2015 +0200 Imported Upstream version 1.2.0 --- .gitignore | 12 +- .travis.yml| 19 +++ CMakeLists.txt | 9 +- NEWS | 16 ++- src/Exception.h| 2 +- src/algorithm/connection.cpp | 2 +- src/algorithm/covers.h | 2 +- src/algorithm/difference.h | 2 +- src/algorithm/intersection.h | 2 +- src/algorithm/intersects.h | 2 +- src/algorithm/isValid.cpp | 12 ++ src/algorithm/straightSkeleton.cpp | 135 +++-- src/algorithm/straightSkeleton.h | 16 ++- src/algorithm/translate.cpp| 12 ++ src/algorithm/translate.h | 7 +- src/algorithm/union.cpp| 4 +- src/algorithm/union.h | 2 +- src/capi/sfcgal_c.cpp | 1 + src/capi/sfcgal_c.h| 10 +- src/detail/GeometrySet.cpp | 4 +- src/detail/TestGeometry.h | 2 + src/detail/graph/Edge.h| 2 +- src/detail/graph/GeometryGraph.h | 2 +- test/CMakeLists.txt| 8 -- test/bench/BenchStraightSkeleton.cpp | 95 +++ ...tSkeletonTest.cpp => ApproximateMedialAxis.cpp} | 60 + .../unit/SFCGAL/algorithm/StraightSkeletonTest.cpp | 54 +++-- test/unit/SFCGAL/capi/sfcgal_cTest.cpp | 28 + travis/linux/before_install.sh | 16 +++ viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp| 2 +- 30 files changed, 422 insertions(+), 118 deletions(-) diff --git a/.gitignore b/.gitignore index 88fe904..eef6c1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +CMakeCache.txt +CMakeFiles +Makefile +cmake_install.cmake +install_manifest.txt +CTestTestfile.cmake +Testing + .settings .cproject .project @@ -19,6 +27,4 @@ polygon_triangulation2.obj gmon.out -include/SFCGAL/version.h -include/SFCGAL/config.h - +include/SFCGAL diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..32a0cd5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,19 @@ +language: cpp + +# os: +# - linux +# - osx + +compiler: + - gcc + - clang + +before_install: + - ./travis/${TRAVIS_OS_NAME}/before_install.sh + +before_script: + - cmake -DSFCGAL_BUILD_TESTS=ON + +script: + - make + - make test diff --git a/CMakeLists.txt b/CMakeLists.txt index 4089385..42bf129 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ option( SFCGAL_BUILD_VIEWER "build viewer and OpenSceneGraph support (outputs in set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules;${CMAKE_MODULE_PATH}" ) set( SFCGAL_VERSION_MAJOR 1 ) -set( SFCGAL_VERSION_MINOR 1 ) +set( SFCGAL_VERSION_MINOR 2 ) set( SFCGAL_VERSION_PATCH 0 ) set( SFCGAL_VERSION "${SFCGAL_VERSION_MAJOR}.${SFCGAL_VERSION_MINOR}.${SFCGAL_VERSION_PATCH}" ) @@ -72,7 +72,10 @@ if ( SFCGAL_BUILD_TESTS OR SFCGAL_BUILD_EXAMPLES OR SFCGAL_BUILD_OSG OR SFCGAL_B set( SFCGAL_Boost_COMPONENTS program_options chrono filesystem timer ${SFCGAL_Boost_COMPONENTS} ) endif() find_package( Boost COMPONENTS ${SFCGAL_Boost_COMPONENTS} REQUIRED ) - +if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 58)) + message( STATUS "Defining BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" ) + add_definitions( "-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" ) +endif() #-- GMP (facultative) - find_package( GMP ) @@ -106,7 +109,7 @@ if( ${CGAL_USE_AUTOLINK} ) add_definitions( "-DCGAL_NO_AUTOLINK" ) endif() -find_package( CGAL 4.1 COMPONENTS Core REQUIRED ) +find_package( CGAL 4.3 COMPONENTS Core REQUIRED ) message( STATUS "CGAL ${CGAL_VERSION} found" ) include_directories( ${CMAKE_BINARY_DIR}/include ) diff --git a/NEWS b/NEWS index 72d5f17..e38de1c 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,15 @@ -1.0.5: +1.2.0 (2015-09-18): +* Improve the computation speed of straight skeletons by using an inexact construction kernel +* Add a new function approximateMedialAxis +* Fix an invalidity case (polygon degenerated to a point) #108 +* Fix compilation issues with boost 1.58 +* Add Travis support +1.1.0 (2015-01-14): +* New spatial operation Union(geom, geom) and Difference(geom, geom). +* Exposed Volume(geom) in C api and
[sfcgal] 04/04: New upstream release.
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a commit to branch master in repository sfcgal. commit a47daa40a7c52f0d43b417386f405e1ba122e804 Author: Sven GeggusDate: Fri Sep 18 17:49:00 2015 +0200 New upstream release. Test and thus probably lib does currently not work on sid. However this does compile just fine in jessie. Might be libcgal related --- debian/changelog | 6 ++ ...g-errors-accourding-to-lintian-tool-of-th.patch | 82 -- ...T_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch | 29 debian/patches/0003-style-test-is-not-robust.patch | 29 debian/patches/series | 3 - 5 files changed, 6 insertions(+), 143 deletions(-) diff --git a/debian/changelog b/debian/changelog index a27c5b8..8ce42c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sfcgal (1.2.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Sven Geggus Fri, 18 Sep 2015 17:47:24 +0200 + sfcgal (1.1.0-6) unstable; urgency=medium * Update symbols for mips(el) and armhf diff --git a/debian/patches/0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch b/debian/patches/0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch deleted file mode 100644 index b559be5..000 --- a/debian/patches/0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 7f44429b1c726b47868ff981ae647be061bb319c Mon Sep 17 00:00:00 2001 -From: Sven Geggus -Date: Sat, 13 Jun 2015 16:35:58 +0200 -Subject: [PATCH] Fix spelling errors accourding to lintian tool of the debian - distribution - - src/Exception.h | 2 +- - src/algorithm/connection.cpp| 2 +- - src/detail/graph/Edge.h | 2 +- - src/detail/graph/GeometryGraph.h| 2 +- - viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Exception.h b/src/Exception.h -index cf3178a..b575c4d 100644 a/src/Exception.h -+++ b/src/Exception.h -@@ -48,7 +48,7 @@ public: - */ - virtual const char* what() const throw(); - /** -- * returns diagnostic informations (file, line, etc.) -+ * returns diagnostic information (file, line, etc.) - */ - std::string diagnostic() const throw(); - protected: -diff --git a/src/algorithm/connection.cpp b/src/algorithm/connection.cpp -index 559e5de..0d3906f 100644 a/src/algorithm/connection.cpp -+++ b/src/algorithm/connection.cpp -@@ -51,7 +51,7 @@ void SurfaceGraph::addRing( const LineString& ring, FaceIndex faceIndex ) - - if ( foundEdgeWithBadOrientation != _edgeMap.end() ) { - _isValid = Validity::invalid( -- ( boost::format( "inconsistant orientation of PolyhedralSurface detected at edge %d (%d-%d) of polygon %d" ) % s % edge.first % edge.second % faceIndex ).str() -+ ( boost::format( "inconsistent orientation of PolyhedralSurface detected at edge %d (%d-%d) of polygon %d" ) % s % edge.first % edge.second % faceIndex ).str() -); - } - -diff --git a/src/detail/graph/Edge.h b/src/detail/graph/Edge.h -index e751ba5..b69b84d 100644 a/src/detail/graph/Edge.h -+++ b/src/detail/graph/Edge.h -@@ -28,7 +28,7 @@ namespace graph { - - /** - * @brief [private]An edge in a GeometryGraph with minimal requirements (some algorithms could need -- * more informations) -+ * more information) - */ - struct SFCGAL_API Edge { - Edge( const int& face_ = -1 ); -diff --git a/src/detail/graph/GeometryGraph.h b/src/detail/graph/GeometryGraph.h -index 7b54883..2584271 100644 a/src/detail/graph/GeometryGraph.h -+++ b/src/detail/graph/GeometryGraph.h -@@ -52,7 +52,7 @@ inline EdgeDirection reverse( const EdgeDirection& direction ) - * - * @brief [private]Represents the vertices and edges for a list of geometries. - * -- * A boost::adjancency_list is wrapped in order to be able to annex some informations -+ * A boost::adjancency_list is wrapped in order to be able to annex some information - * and to provide basic functionalities. - * - * @warning duplicate matching is performed in GeometryGraphBuilder (allows to modify position once it's done) -diff --git a/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp b/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp -index b9122ef..71b125c 100644 a/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp -+++ b/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp -@@ -91,7 +91,7 @@ void DataPlugin::load() - { - QMenu* pluginMenu = viewerWindow()->menuBar()->addMenu( "Data" ) ; - --QAction* actionDisplayInformations = pluginMenu->addAction( QString( " informations" ) ); -+
[sfcgal] 03/04: Merge tag 'upstream/1.2.0'
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a commit to branch master in repository sfcgal. commit 5ff97f9a64e236f78a24fd922d12b2b20817cce7 Merge: 0c9fa58 08f9bc0 Author: Sven GeggusDate: Fri Sep 18 17:46:46 2015 +0200 Merge tag 'upstream/1.2.0' Upstream version 1.2.0 .gitignore | 12 +- .travis.yml| 19 +++ CMakeLists.txt | 9 +- NEWS | 16 ++- src/Exception.h| 2 +- src/algorithm/connection.cpp | 2 +- src/algorithm/covers.h | 2 +- src/algorithm/difference.h | 2 +- src/algorithm/intersection.h | 2 +- src/algorithm/intersects.h | 2 +- src/algorithm/isValid.cpp | 12 ++ src/algorithm/straightSkeleton.cpp | 135 +++-- src/algorithm/straightSkeleton.h | 16 ++- src/algorithm/translate.cpp| 12 ++ src/algorithm/translate.h | 7 +- src/algorithm/union.cpp| 4 +- src/algorithm/union.h | 2 +- src/capi/sfcgal_c.cpp | 1 + src/capi/sfcgal_c.h| 10 +- src/detail/GeometrySet.cpp | 4 +- src/detail/TestGeometry.h | 2 + src/detail/graph/Edge.h| 2 +- src/detail/graph/GeometryGraph.h | 2 +- test/CMakeLists.txt| 8 -- test/bench/BenchStraightSkeleton.cpp | 95 +++ ...tSkeletonTest.cpp => ApproximateMedialAxis.cpp} | 60 + .../unit/SFCGAL/algorithm/StraightSkeletonTest.cpp | 54 +++-- test/unit/SFCGAL/capi/sfcgal_cTest.cpp | 28 + travis/linux/before_install.sh | 16 +++ viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp| 2 +- 30 files changed, 422 insertions(+), 118 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[sfcgal] branch upstream updated (bca7157 -> 08f9bc0)
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a change to branch upstream in repository sfcgal. from bca7157 Imported Upstream version 1.1.0 new 08f9bc0 Imported Upstream version 1.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: .gitignore | 12 +- .travis.yml| 19 +++ CMakeLists.txt | 9 +- NEWS | 16 ++- src/Exception.h| 2 +- src/algorithm/connection.cpp | 2 +- src/algorithm/covers.h | 2 +- src/algorithm/difference.h | 2 +- src/algorithm/intersection.h | 2 +- src/algorithm/intersects.h | 2 +- src/algorithm/isValid.cpp | 12 ++ src/algorithm/straightSkeleton.cpp | 135 +++-- src/algorithm/straightSkeleton.h | 16 ++- src/algorithm/translate.cpp| 12 ++ src/algorithm/translate.h | 7 +- src/algorithm/union.cpp| 4 +- src/algorithm/union.h | 2 +- src/capi/sfcgal_c.cpp | 1 + src/capi/sfcgal_c.h| 10 +- src/detail/GeometrySet.cpp | 4 +- src/detail/TestGeometry.h | 2 + src/detail/graph/Edge.h| 2 +- src/detail/graph/GeometryGraph.h | 2 +- test/CMakeLists.txt| 8 -- test/bench/BenchStraightSkeleton.cpp | 95 +++ ...tSkeletonTest.cpp => ApproximateMedialAxis.cpp} | 60 + .../unit/SFCGAL/algorithm/StraightSkeletonTest.cpp | 54 +++-- test/unit/SFCGAL/capi/sfcgal_cTest.cpp | 28 + travis/linux/before_install.sh | 16 +++ viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp| 2 +- 30 files changed, 422 insertions(+), 118 deletions(-) create mode 100644 .travis.yml create mode 100644 test/bench/BenchStraightSkeleton.cpp copy test/unit/SFCGAL/algorithm/{StraightSkeletonTest.cpp => ApproximateMedialAxis.cpp} (55%) create mode 100755 travis/linux/before_install.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git ___ 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#799411: openstreetmap-carto: [INTL:pt_BR] Brazilian Portuguese debconf templates translation
Package: openstreetmap-carto Tags: l10n patch Severity: wishlist Hello, Please, Could you update the Brazilian Portuguese Translation? Attached you will find the file pt_BR.po. It is UTF-8 encoded and it is tested with msgfmt and podebconf-display-po. Kind regards. pt_BR.po.gz Description: application/gzip 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
[sfcgal] branch master updated (f479607 -> a47daa4)
This is an automated email from the git hooks/post-receive script. giggls-guest pushed a change to branch master in repository sfcgal. from f479607 Set distribution to unstable. new 0c9fa58 Update symbols for mips(el) and armhf new 08f9bc0 Imported Upstream version 1.2.0 new 5ff97f9 Merge tag 'upstream/1.2.0' new a47daa4 New upstream release. The 4 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: .gitignore | 12 +- .travis.yml| 19 + CMakeLists.txt |9 +- NEWS | 16 +- debian/changelog | 12 + debian/libsfcgal1.symbols | 3027 ++-- ...g-errors-accourding-to-lintian-tool-of-th.patch | 82 - ...T_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch | 29 - debian/patches/0003-style-test-is-not-robust.patch | 29 - debian/patches/series |3 - src/Exception.h|2 +- src/algorithm/connection.cpp |2 +- src/algorithm/covers.h |2 +- src/algorithm/difference.h |2 +- src/algorithm/intersection.h |2 +- src/algorithm/intersects.h |2 +- src/algorithm/isValid.cpp | 12 + src/algorithm/straightSkeleton.cpp | 135 +- src/algorithm/straightSkeleton.h | 16 +- src/algorithm/translate.cpp| 12 + src/algorithm/translate.h |7 +- src/algorithm/union.cpp|4 +- src/algorithm/union.h |2 +- src/capi/sfcgal_c.cpp |1 + src/capi/sfcgal_c.h| 10 +- src/detail/GeometrySet.cpp |4 +- src/detail/TestGeometry.h |2 + src/detail/graph/Edge.h|2 +- src/detail/graph/GeometryGraph.h |2 +- test/CMakeLists.txt|8 - test/bench/BenchStraightSkeleton.cpp | 95 + ...tSkeletonTest.cpp => ApproximateMedialAxis.cpp} | 60 +- .../unit/SFCGAL/algorithm/StraightSkeletonTest.cpp | 54 +- test/unit/SFCGAL/capi/sfcgal_cTest.cpp | 28 + travis/linux/before_install.sh | 16 + viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp|2 +- 36 files changed, 1953 insertions(+), 1769 deletions(-) create mode 100644 .travis.yml delete mode 100644 debian/patches/0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch delete mode 100644 debian/patches/0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch delete mode 100644 debian/patches/0003-style-test-is-not-robust.patch delete mode 100644 debian/patches/series create mode 100644 test/bench/BenchStraightSkeleton.cpp copy test/unit/SFCGAL/algorithm/{StraightSkeletonTest.cpp => ApproximateMedialAxis.cpp} (55%) create mode 100755 travis/linux/before_install.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 03/03: Mark patches as Forwarded & Applied-Upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapserver. commit 26eacbd92e830ae27961f1007e3ce9c20fa32ff7 Author: Bas CouwenbergDate: Fri Sep 18 16:48:14 2015 +0200 Mark patches as Forwarded & Applied-Upstream. --- debian/patches/dont-install-headers-in-usr-lib.patch | 2 ++ debian/patches/windows-archive-install-target.patch | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/patches/dont-install-headers-in-usr-lib.patch b/debian/patches/dont-install-headers-in-usr-lib.patch index 67625bd..d45af14 100644 --- a/debian/patches/dont-install-headers-in-usr-lib.patch +++ b/debian/patches/dont-install-headers-in-usr-lib.patch @@ -2,6 +2,8 @@ Description: Don't install the headers in /usr/lib too. The mapserver target only needs to be installed when BUILD_DYNAMIC is true. Also add staticlib component for mapserver_static. Author: Bas Couwenberg +Forwarded: https://github.com/mapserver/mapserver/pull/5166 +Applied-Upstream: https://github.com/mapserver/mapserver/commit/3c10ad17cbd04998edf779c92f3be04a9bc3b460 --- a/CMakeLists.txt +++ b/CMakeLists.txt diff --git a/debian/patches/windows-archive-install-target.patch b/debian/patches/windows-archive-install-target.patch index b2e60ae..52ba5fd 100644 --- a/debian/patches/windows-archive-install-target.patch +++ b/debian/patches/windows-archive-install-target.patch @@ -1,6 +1,8 @@ Description: Add ARCHIVE install target for Windows builds. Author: Bas Couwenberg Origin: https://github.com/sebastic/mapserver/commit/f86ccbd000a0672d9e29756db2a57b4d9290c5c3 +Forwarded: https://github.com/mapserver/mapserver/pull/5164 +Applied-Upstream: https://github.com/mapserver/mapserver/commit/3c10ad17cbd04998edf779c92f3be04a9bc3b460 --- a/CMakeLists.txt +++ b/CMakeLists.txt -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] branch master updated (043886c -> 26eacbd)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository mapserver. from 043886c Mark cmake-mapserver-export.patch as Applied-Upstream. new 3d35bfc Add patch to add ARCHIVE install target for Windows builds. new bf3f1c3 Add patch to install mapserver target only once. new 26eacbd Mark patches as Forwarded & Applied-Upstream. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 .../patches/dont-install-headers-in-usr-lib.patch | 37 ++ debian/patches/series | 2 ++ .../patches/windows-archive-install-target.patch | 16 ++ debian/rules | 1 - 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 debian/patches/dont-install-headers-in-usr-lib.patch create mode 100644 debian/patches/windows-archive-install-target.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 02/03: Add patch to install mapserver target only once.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapserver. commit bf3f1c310f02788ac9b27cd216c248b7484f9c71 Author: Bas CouwenbergDate: Sat Sep 12 17:13:10 2015 +0200 Add patch to install mapserver target only once. --- debian/changelog | 1 + .../patches/dont-install-headers-in-usr-lib.patch | 35 ++ debian/patches/series | 1 + debian/rules | 1 - 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 32a2f3c..52f49af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mapserver (7.0.0-5) UNRELEASED; urgency=medium * Add patch to add ARCHIVE install target for Windows builds. + * Add patch to install mapserver target only once. -- Bas Couwenberg Sat, 12 Sep 2015 16:09:34 +0200 diff --git a/debian/patches/dont-install-headers-in-usr-lib.patch b/debian/patches/dont-install-headers-in-usr-lib.patch new file mode 100644 index 000..67625bd --- /dev/null +++ b/debian/patches/dont-install-headers-in-usr-lib.patch @@ -0,0 +1,35 @@ +Description: Don't install the headers in /usr/lib too. + The mapserver target only needs to be installed when BUILD_DYNAMIC is true. + Also add staticlib component for mapserver_static. +Author: Bas Couwenberg + +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -974,18 +974,19 @@ endif(USE_MSSQL2008) + INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv + RUNTIME DESTINATION ${INSTALL_BIN_DIR} COMPONENT bin + ) +-INSTALL(TARGETS mapserver +-EXPORT mapserverTargets +-ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib +-LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib +-PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev +-) + + if(BUILD_STATIC) +- INSTALL(TARGETS mapserver_static DESTINATION ${INSTALL_LIB_DIR}) ++ INSTALL(TARGETS mapserver_static ++ DESTINATION ${INSTALL_LIB_DIR} COMPONENT staticlib ++ ) + endif(BUILD_STATIC) + if(BUILD_DYNAMIC) +- INSTALL(TARGETS mapserver DESTINATION ${INSTALL_LIB_DIR}) ++ INSTALL(TARGETS mapserver ++ EXPORT mapserverTargets ++ ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib ++ LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib ++ PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev ++ ) + endif(BUILD_DYNAMIC) + + # Add all targets to the build-tree export set diff --git a/debian/patches/series b/debian/patches/series index 2ef82c3..3eddf6d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ ruby-mapscript-install.patch cmake-mapserver-export.patch java-hardening.patch windows-archive-install-target.patch +dont-install-headers-in-usr-lib.patch diff --git a/debian/rules b/debian/rules index 27759bd..bc376e4 100755 --- a/debian/rules +++ b/debian/rules @@ -157,7 +157,6 @@ override_dh_installexamples: chmod a-x $(CURDIR)/debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml override_dh_install: - $(RM) debian/*/usr/lib/*.h dh_install --autodest --list-missing override_dh_compress: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 01/03: Add patch to add ARCHIVE install target for Windows builds.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapserver. commit 3d35bfc13a7555dc77c999cf7c4284dd078b44d9 Author: Bas CouwenbergDate: Sat Sep 12 16:09:52 2015 +0200 Add patch to add ARCHIVE install target for Windows builds. --- debian/changelog| 6 ++ debian/patches/series | 1 + debian/patches/windows-archive-install-target.patch | 14 ++ 3 files changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5e8b634..32a2f3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mapserver (7.0.0-5) UNRELEASED; urgency=medium + + * Add patch to add ARCHIVE install target for Windows builds. + + -- Bas Couwenberg Sat, 12 Sep 2015 16:09:34 +0200 + mapserver (7.0.0-4) unstable; urgency=medium * Update symbols for ppc64. diff --git a/debian/patches/series b/debian/patches/series index c9c814a..2ef82c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ perl-mapscript-install.patch ruby-mapscript-install.patch cmake-mapserver-export.patch java-hardening.patch +windows-archive-install-target.patch diff --git a/debian/patches/windows-archive-install-target.patch b/debian/patches/windows-archive-install-target.patch new file mode 100644 index 000..b2e60ae --- /dev/null +++ b/debian/patches/windows-archive-install-target.patch @@ -0,0 +1,14 @@ +Description: Add ARCHIVE install target for Windows builds. +Author: Bas Couwenberg +Origin: https://github.com/sebastic/mapserver/commit/f86ccbd000a0672d9e29756db2a57b4d9290c5c3 + +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -976,6 +976,7 @@ INSTALL(TARGETS sortshp shptree shptreev + ) + INSTALL(TARGETS mapserver + EXPORT mapserverTargets ++ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib + LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib + PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev + ) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] branch master updated (2eac01d -> a9fb000)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository qmapshack. from 2eac01d Don't remove planetsplitter, no longer built. new a9fb000 Set distribution to unstable. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] tag debian/1.3.1-1 created (now a9fb000)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.3.1-1 in repository qmapshack. at a9fb000 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] 01/01: 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 qmapshack. commit a9fb0002db2059789d0bf8a0f8a2e7c4af649fbd Author: Bas CouwenbergDate: Fri Sep 18 15:43:56 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 f98799c..3fd40af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qmapshack (1.3.1-1) UNRELEASED; urgency=medium +qmapshack (1.3.1-1) unstable; urgency=medium * New upstream release. * Drop license & copyright for 3rdparty code, no longer included. @@ -6,7 +6,7 @@ qmapshack (1.3.1-1) UNRELEASED; urgency=medium * Override dh_install to use --list-missing. * Don't remove planetsplitter, no longer built. - -- Bas Couwenberg Mon, 14 Sep 2015 01:00:04 +0200 + -- Bas Couwenberg Fri, 18 Sep 2015 15:43:39 +0200 qmapshack (1.3.0-4) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[merkaartor] branch master updated (7a126bf -> 9750a34)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository merkaartor. from 7a126bf Use minimal dh rules. new e920a8f Imported Upstream version 0.18.2 new a7c27c2 Merge tag 'upstream/0.18.2' new 220e97a New upstream release. new 9dae034 Drop patches applied upstream. new 5f2d80b Update copyright file using copyright-format 1.0. new f8bee53 Restructure control file with cme. new d2f7f50 Update Vcs-Browser URL to use HTTPS. new cd467fa Override dh_install to use --list-missing. new 03ee217 Rename old style config sections in gbp.conf. new e1f6d4d Add patch to fix version detection for tarball releases. new 2ef803a Switch to Qt5. new aee8d31 Reorder qmake options. new a619dd0 Use dh_auto_* commands in overrides. new 7c81709 Disable SpatiaLite support, causes FTBFS. new cb37e9c Add patch to fix various typos. new 072872a Add patch to add hardening buildflags to qmake build. new ad9f866 Don't create empty usr/sbin directory. new 465764b Add patch to add Keywords to merkaartor.desktop. new 9570880 Bump Standards-Version to 3.9.6. new afb48ce Don't install merkaartor.{png,desktop} twice. new 4b62820 Mark patches as Forwarded. new 38f4d39 Close bugs in changelog. new 9750a34 Set distribution to experimental. The 23 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|17 + .../examples/loader/main.cpp | 8 +- .../examples/trivial/main.cpp | 2 +- .../qtsingleapplication.pro| 1 + .../src/qtlocalpeer.cpp| 7 +- .../src/qtlockedfile_win.cpp | 3 + .../src/qtsingleapplication.cpp| 4 +- .../src/qtsingleapplication.h | 4 +- .../src/qtsingleapplication.pri| 2 +- .../qttoolbardialog-2.2_1-opensource/INSTALL.TXT | 254 - .../LGPL_EXCEPTION.txt |23 - .../qttoolbardialog-2.2_1-opensource/LICENSE.GPL3 | 674 -- .../qttoolbardialog-2.2_1-opensource/LICENSE.LGPL | 504 - .../qttoolbardialog-2.2_1-opensource/README.TXT| 7 - .../buildlib/buildlib.pro |13 - .../qttoolbardialog-2.2_1-opensource/common.pri| 6 - .../qttoolbardialog-2.2_1-opensource/configure | 112 - .../doc/html/classic.css | 139 - .../doc/html/images/qt-logo.png| Bin 4075 -> 0 bytes .../doc/html/images/qttoolbardialog.png| Bin 12323 -> 0 bytes .../doc/html/index.html|41 - .../doc/html/qttoolbardialog-members.html | 371 - .../doc/html/qttoolbardialog.dcf |29 - .../doc/html/qttoolbardialog.html |89 - .../doc/html/qttoolbardialog.index |54 - .../doc/html/qttoolbardialog.qch | Bin 50176 -> 0 bytes .../doc/html/qttoolbardialog.qhp |46 - .../doc/html/qttoolbarmanager-members.html |85 - .../doc/html/qttoolbarmanager.html | 102 - .../doc/images/qt-logo.png | Bin 4075 -> 0 bytes .../doc/images/qttoolbardialog.png | Bin 12323 -> 0 bytes .../doc/index.qdoc |37 - .../examples/examples.pro | 7 - .../examples/simple/images/copy.png| Bin 1338 -> 0 bytes .../examples/simple/images/cut.png | Bin 1323 -> 0 bytes .../examples/simple/images/new.png | Bin 852 -> 0 bytes .../examples/simple/images/open.png| Bin 2073 -> 0 bytes .../examples/simple/images/paste.png | Bin 1745 -> 0 bytes .../examples/simple/images/save.png| Bin 1187 -> 0 bytes .../examples/simple/main.cpp |59 - .../examples/simple/mainwindow.cpp | 455 - .../examples/simple/mainwindow.h | 122 - .../examples/simple/simple.pro |11 - .../examples/simple/simple.qrc |10 - .../qttoolbardialog.pro| 5 - .../src/QtToolBarDialog| 1 - .../src/QtToolBarManager | 1 - .../src/qttoolbardialog.cpp| 1892 .../src/qttoolbardialog.h | 144 -
qmapshack_1.3.1-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Fri, 18 Sep 2015 15:43:39 +0200 Source: qmapshack Binary: qmapshack Architecture: source amd64 Version: 1.3.1-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS ProjectChanged-By: Bas Couwenberg Description: qmapshack - GPS mapping (GeoTiff and vector) and GPSr management Changes: qmapshack (1.3.1-1) unstable; urgency=medium . * New upstream release. * Drop license & copyright for 3rdparty code, no longer included. * Add build dependency on libroutino-dev. * Override dh_install to use --list-missing. * Don't remove planetsplitter, no longer built. Checksums-Sha1: ae4726b5fd190a40be86cc52bf4465796a92c86e 2148 qmapshack_1.3.1-1.dsc ce3921d4a8dab1f1520bc21212ac0454e908b92c 3758785 qmapshack_1.3.1.orig.tar.gz bdda554036ad79a2b317cb896384656ec970bf8b 5768 qmapshack_1.3.1-1.debian.tar.xz 322271bea2c312ec7f1c933bf26533627c08b600 1993610 qmapshack_1.3.1-1_amd64.deb Checksums-Sha256: 336b0e34cb8d06cf1c73f1f768a1c86aec564b71bfb579888c2080cce3175481 2148 qmapshack_1.3.1-1.dsc 8f4bcb5454786d7f81681abe4f96cc8e3598f62219708d1efe4c94d19ab0dfea 3758785 qmapshack_1.3.1.orig.tar.gz 8782925c7737e3040b4ad68e4f82731b635a84ff7c84c0ca147b7da3a522057e 5768 qmapshack_1.3.1-1.debian.tar.xz 6e6b22fd3663e14e33360428450dce5a091ff69b7ab72010bc0ffa598b1ede41 1993610 qmapshack_1.3.1-1_amd64.deb Files: aa81e4c746d72853593a9ebfaf64a4b0 2148 science optional qmapshack_1.3.1-1.dsc 60be6c63e18497a872752393fef1dcbc 3758785 science optional qmapshack_1.3.1.orig.tar.gz ca03b0adf0bfac5c762e5b1fcfcd35ee 5768 science optional qmapshack_1.3.1-1.debian.tar.xz a8ba9d872f3995611bd7543e59658eb4 1993610 science optional qmapshack_1.3.1-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV/Bi+AAoJEGdQ8QrojUrx4XsQAKpLv7Rm+bPjCvK6Yu9R70Jd i5CyfnU6X7lUlxofV4woHPlBcvvwhZCTFWYSsPzoeoU3uYswBE+BG1ma+AoeFoML QgLy5Of139VqipzLjWYTruGeM+JrlEoKOYQF/Dz/F2Nc1rtwQgKlSaXQgD96yNHJ kHXLdaHzwPa+MoqvjDSppPii4eJtCyVokF0M0pefVgnregoC9jKrdmZywwltSbgF WMPeuOMAwkekkt/0cQJXjmJu4Kdwqlebny6w3cvjUSGxw3YJRUOJMFzmLnhrzRDQ 044zGP5lni4vVG4HwBYot+8JziXDP4nTgJM8tiPTYIJH/gOuCnR9xLt8P1WBpDnk n+4+FGRAyqAZtpjgAWMX6mu3N4e6HzUzoMXhwCH6oue5rFV7SjA5v+Zn9FkGA2ux 3UivN0k8oFyY71YT9YZAr+kTlCS+Ht6TByg0BcxZG68bSFcjGNZyJNP6bRGoGz/u uIWx6kK8xkrljp7CH25HCNCiL0UFREGyC7AT8oGQxOtxo/wBVpntPgBK7zMR6m3O vU1auHnj2rdgpkjwhEnC2mIF+6YzlkQ2N22L8oUxpeR/MGnVVyCQ9XAb86EINdnH mni5Z6WGb06C0SCzsIBlw281SoWqRs9CBDnMb1gVcE4Tkmt9qYleEjbTC3fFahl+ 53+xSDbvgsFeC0kp88/L =AizR -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