Bas Couwenberg pushed to branch master at Debian GIS Project / merkaartor
Commits: a60f49fc by Bas Couwenberg at 2025-07-05T06:50:46+02:00 Update branch in gbp.conf & Vcs-Git URL. - - - - - b2ac6356 by Bas Couwenberg at 2025-07-05T06:57:04+02:00 Switch to Qt6. - - - - - 353398df by Bas Couwenberg at 2025-08-16T07:28:51+02:00 Set distribution to experimental. - - - - - bd8bbb81 by Bas Couwenberg at 2025-08-16T10:45:28+02:00 Revert "Update branch in gbp.conf & Vcs-Git URL." This reverts commit a60f49fc8da03bc7c5181aca154960d55ff3bed0. - - - - - 203c5c91 by Bas Couwenberg at 2025-08-16T10:58:04+02:00 Drop libxml2-dev & libxslt1-dev build dependencies, osmarender support removed. - - - - - 1334a914 by Bas Couwenberg at 2025-08-16T11:00:08+02:00 Drop obsolete boost build dependencies. - - - - - 71166950 by Bas Couwenberg at 2025-08-16T11:20:28+02:00 Drop obsolete libquazip1-qt6-dev & sharutils build dependencies. - - - - - 422f18e3 by Bas Couwenberg at 2025-08-16T11:20:28+02:00 Move from experimental to unstable. - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,21 @@ -merkaartor (0.20.0+ds-2) UNRELEASED; urgency=medium +merkaartor (0.20.0+ds-2) unstable; urgency=medium + + * Team upload. + * Drop libxml2-dev & libxslt1-dev build dependencies, + osmarender support removed. + * Drop obsolete boost build dependencies. + * Drop obsolete libquazip1-qt6-dev & sharutils build dependencies. + * Move from experimental to unstable. + + -- Bas Couwenberg <[email protected]> Sat, 16 Aug 2025 10:58:27 +0200 + +merkaartor (0.20.0+ds-2~exp1) experimental; urgency=medium * Team upload. * Bump Standards-Version to 4.7.2, no changes. + * Switch to Qt6. - -- Bas Couwenberg <[email protected]> Thu, 20 Mar 2025 06:10:56 +0100 + -- Bas Couwenberg <[email protected]> Sat, 16 Aug 2025 07:28:35 +0200 merkaartor (0.20.0+ds-1) unstable; urgency=medium ===================================== debian/control ===================================== @@ -5,26 +5,20 @@ Section: science Priority: optional Build-Depends: cmake, debhelper-compat (= 13), - libboost-dev, - libboost-math-dev, - libboost-serialization-dev, libexiv2-dev, libgdal-dev, libgps-dev, libproj-dev, libprotobuf-dev, libproxy-dev, - libqt5networkauth5-dev, - libqt5svg5-dev, - libquazip5-dev, - libxml2-dev, - libxslt1-dev, pkgconf, protobuf-compiler, - qtbase5-dev, - qttools5-dev, - qtwebengine5-dev [amd64 arm64 armhf i386 mips64el], - sharutils, + qt6-5compat-dev, + qt6-base-dev, + qt6-networkauth-dev, + qt6-svg-dev, + qt6-tools-dev, + qt6-webengine-dev, xauth, xvfb, zlib1g-dev ===================================== debian/rules ===================================== @@ -6,18 +6,8 @@ # Enable hardening build flags export DEB_BUILD_MAINT_OPTIONS=hardening=+all -# Use Qt5 -export QT_SELECT=5 - DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el)) -DEB_PKG_WEBENGINE=1 -else -DEB_PKG_WEBENGINE=0 -endif - - %: dh $@ --buildsystem=cmake @@ -27,7 +17,7 @@ override_dh_auto_configure: -DGEOIMAGE=1 \ -DGPSD=1 \ -DLIBPROXY=1 \ - -DWEBENGINE=$(DEB_PKG_WEBENGINE) \ + -DWEBENGINE=1 \ -DZBAR=0 override_dh_auto_test: View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/compare/71c78aeec16ef603227978849a63c3f277f5bd8f...422f18e3b08a4b0dbb86206e5a48299e51fcac2b -- View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/compare/71c78aeec16ef603227978849a63c3f277f5bd8f...422f18e3b08a4b0dbb86206e5a48299e51fcac2b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
