diff -Nru merkaartor-0.19.0+ds/debian/.gitlab-ci.yml merkaartor-0.19.0+ds/debian/.gitlab-ci.yml --- merkaartor-0.19.0+ds/debian/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/.gitlab-ci.yml 2024-03-13 14:12:12.000000000 +0000 @@ -0,0 +1,6 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml + +variables: + SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1 diff -Nru merkaartor-0.19.0+ds/debian/changelog merkaartor-0.19.0+ds/debian/changelog --- merkaartor-0.19.0+ds/debian/changelog 2024-03-15 05:54:55.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/changelog 2024-03-13 14:22:13.000000000 +0000 @@ -1,14 +1,24 @@ -merkaartor (0.19.0+ds-4build2) noble; urgency=medium +merkaartor (0.19.0+ds-5) unstable; urgency=medium - * No-change rebuild against libqt5core5t64 + * Team upload. - -- Steve Langasek Fri, 15 Mar 2024 05:54:55 +0000 + [ Bas Couwenberg ] + * Use execute_after instead of override in rules file. + * Enable Salsa CI. + * Drop unused libspatialite-dev build dependency. + * Replace pkg-config build dependency with pkgconf. + * Add patch to fix FTBFS with libproxy 0.5. + (closes: #1066442) + * Switch from qmake to cmake. + * Update lintian overrides. + + [ Pino Toscano ] + * Backport upstream commit ba8b73e6b3372a21305640baca07a991f77db119 and + commit 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd to build also with Exiv2 + 0.28+; patches upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch + and upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch. -merkaartor (0.19.0+ds-4build1) noble; urgency=medium - - * Rebuild against new libgdal34. - - -- Gianfranco Costamagna Fri, 17 Nov 2023 19:22:31 +0100 + -- Bas Couwenberg Wed, 13 Mar 2024 15:22:13 +0100 merkaartor (0.19.0+ds-4) unstable; urgency=medium diff -Nru merkaartor-0.19.0+ds/debian/clean merkaartor-0.19.0+ds/debian/clean --- merkaartor-0.19.0+ds/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/clean 2024-03-13 14:12:12.000000000 +0000 @@ -0,0 +1 @@ +binaries/ diff -Nru merkaartor-0.19.0+ds/debian/control merkaartor-0.19.0+ds/debian/control --- merkaartor-0.19.0+ds/debian/control 2024-03-15 05:54:55.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/control 2024-03-13 14:12:48.000000000 +0000 @@ -1,10 +1,10 @@ Source: merkaartor -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GIS Project +Maintainer: Debian GIS Project Uploaders: Jerome Benoit Section: science Priority: optional -Build-Depends: debhelper-compat (= 13), +Build-Depends: cmake, + debhelper-compat (= 13), libboost-dev, libboost-math-dev, libboost-serialization-dev, @@ -15,16 +15,15 @@ libproxy-dev, libqt5svg5-dev, libquazip5-dev, - libspatialite-dev, libxml2-dev, libxslt1-dev, - pkg-config, - qt5-qmake, - qt5-qmake:native, + pkgconf, qtbase5-dev, - qttools5-dev-tools, + qttools5-dev, qtwebengine5-dev [amd64 arm64 armhf i386 mips64el], sharutils, + xauth, + xvfb, zlib1g-dev Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/debian-gis-team/merkaartor @@ -36,7 +35,6 @@ Architecture: any 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 whole world. diff -Nru merkaartor-0.19.0+ds/debian/lintian-overrides merkaartor-0.19.0+ds/debian/lintian-overrides --- merkaartor-0.19.0+ds/debian/lintian-overrides 2023-07-25 07:31:25.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# False positive, string not included in source -spelling-error-in-binary wtH with * - diff -Nru merkaartor-0.19.0+ds/debian/patches/gpsd.patch merkaartor-0.19.0+ds/debian/patches/gpsd.patch --- merkaartor-0.19.0+ds/debian/patches/gpsd.patch 1970-01-01 00:00:00.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/patches/gpsd.patch 2024-03-13 14:12:48.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix pkg-config name gpsd. + libgps-dev provides libgps.pc. +Author: Bas Couwenberg +Forwarded: https://github.com/openstreetmap/merkaartor/pull/294 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -510,7 +510,7 @@ if (GEOIMAGE) + endif() + + if (GPSD) +- list(APPEND PKGCONFIG_REQUIRED_LIBS gpsd) ++ list(APPEND PKGCONFIG_REQUIRED_LIBS libgps) + add_definitions(-DUSE_GPS=1) + endif() + diff -Nru merkaartor-0.19.0+ds/debian/patches/libproxy.patch merkaartor-0.19.0+ds/debian/patches/libproxy.patch --- merkaartor-0.19.0+ds/debian/patches/libproxy.patch 1970-01-01 00:00:00.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/patches/libproxy.patch 2024-03-13 14:12:48.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Fix FTBFS with libproxy 0.5. + proxy.h includes glib-object.h which needs to be found too. + Use pkg-config to get these paths. +Author: Bas Couwenberg +Bug-Debian: https://bugs.debian.org/1066442 +Forwarded: https://github.com/openstreetmap/merkaartor/pull/293 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -486,6 +486,7 @@ set(PKGCONFIG_REQUIRED_LIBS gdal proj) + option(ZBAR "Enable ZBar usage in MWalkingPapersBackground and Geoimage." OFF) + option(GEOIMAGE "Enable Geoimage Dock (requires exiv2 library)." ON ) + option(GPSD "Enable GPS Dock (requires gpsd library)." OFF) ++option(LIBPROXY "Enable libproxy usage." OFF) + option(WEBENGINE "Enable the use of QtWeb engine (not supported on all platforms)" OFF) + option(EXTRA_TESTS "Enable extra tests that cannot be run automatically on CI build." ON ) + +@@ -493,6 +494,7 @@ message(STATUS "Build options (use -DOPT + message(STATUS " * ZBAR ${ZBAR}") + message(STATUS " * GEOIMAGE ${GEOIMAGE}") + message(STATUS " * GPSD ${GPSD}") ++message(STATUS " * LIBPROXY ${LIBPROXY}") + message(STATUS " * WEBENGINE ${WEBENGINE}") + message(STATUS " * EXTRA_TESTS ${EXTRA_TESTS}") + message(STATUS "") +@@ -512,6 +514,11 @@ if (GPSD) + add_definitions(-DUSE_GPS=1) + endif() + ++if (LIBPROXY) ++ list(APPEND PKGCONFIG_REQUIRED_LIBS libproxy-1.0) ++ add_definitions(-DUSE_LIBPROXY=1) ++endif() ++ + if (WEBENGINE) + add_definitions(-DUSEWEBENGINE=1) # Actual macro is USE_WEBKIT + # add_definitions(-DTHREADED_BROWSERIMAGEMANAGER=1) # TODO: Check if that even does something/works diff -Nru merkaartor-0.19.0+ds/debian/patches/no-git-version.patch merkaartor-0.19.0+ds/debian/patches/no-git-version.patch --- merkaartor-0.19.0+ds/debian/patches/no-git-version.patch 2020-04-16 09:57:59.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/patches/no-git-version.patch 2024-03-13 14:12:48.000000000 +0000 @@ -1,16 +1,13 @@ -Description: Extract version from CHANGELOG, not git. +Description: Don't use git for version information. Author: Bas Couwenberg Forwarded: not-needed ---- a/src/Config.pri -+++ b/src/Config.pri -@@ -1,7 +1,7 @@ - # see http://merkaartor.be/wiki/merkaartor/Compiling +--- a/cmake/vcs.cmake ++++ b/cmake/vcs.cmake +@@ -1,5 +1,5 @@ --REVISION = $$system( git describe --tags ) --VERSION = $$system( git describe --tags HEAD | sed "'s/-g.*//;s/-/./g'" ) -+REVISION = "" -+VERSION = "" - isEmpty( REVISION ) { - REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'") - VERSION = $$REVISION +-if (EXISTS "${CMAKE_SOURCE_DIR}/.git") ++if (EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/debian") + # If git directory is present, we require git executable and gather our info from git commands. + find_package(Git) + if (NOT ${GIT_FOUND}) diff -Nru merkaartor-0.19.0+ds/debian/patches/qmake-config-nostrip.patch merkaartor-0.19.0+ds/debian/patches/qmake-config-nostrip.patch --- merkaartor-0.19.0+ds/debian/patches/qmake-config-nostrip.patch 2021-06-14 03:35:15.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/patches/qmake-config-nostrip.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -Description: Add nostrip to CONFIG for debug package. -Author: Bas Couwenberg -Forwarded: not-needed - ---- a/Merkaartor.pro -+++ b/Merkaartor.pro -@@ -1,4 +1,4 @@ --CONFIG += debug_and_release -+CONFIG += debug_and_release nostrip - TEMPLATE = subdirs - SUBDIRS += src \ - plugins ---- a/plugins/background/background.pro -+++ b/plugins/background/background.pro -@@ -1,6 +1,6 @@ - TEMPLATE = subdirs - --CONFIG += debug_and_release -+CONFIG += debug_and_release nostrip - - #Qt Version - QT_VERSION = $$[QT_VERSION] ---- a/plugins/common.pri -+++ b/plugins/common.pri -@@ -10,7 +10,7 @@ - - MERKAARTOR_SRC_DIR = $$PWD/.. - --CONFIG += debug_and_release -+CONFIG += debug_and_release nostrip - # avoid deprecation warnings which 5.15 introduced. - DEFINES += QT_NO_DEPRECATED_WARNINGS - ---- a/plugins/plugins.pro -+++ b/plugins/plugins.pro -@@ -1,6 +1,6 @@ - TEMPLATE = subdirs - --CONFIG += debug_and_release -+CONFIG += debug_and_release nostrip - - SUBDIRS += background - # qtstyle ---- a/src/src.pro -+++ b/src/src.pro -@@ -6,7 +6,7 @@ - #Custom config - include(Custom.pri) - --CONFIG += debug_and_release c++11 -+CONFIG += debug_and_release c++11 nostrip - # avoid deprecation warnings which 5.15 introduced. - DEFINES += QT_NO_DEPRECATED_WARNINGS - diff -Nru merkaartor-0.19.0+ds/debian/patches/series merkaartor-0.19.0+ds/debian/patches/series --- merkaartor-0.19.0+ds/debian/patches/series 2021-08-29 13:12:15.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/patches/series 2024-03-13 14:12:48.000000000 +0000 @@ -1,2 +1,5 @@ -qmake-config-nostrip.patch no-git-version.patch +upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch +upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch +libproxy.patch +gpsd.patch diff -Nru merkaartor-0.19.0+ds/debian/patches/upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch merkaartor-0.19.0+ds/debian/patches/upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch --- merkaartor-0.19.0+ds/debian/patches/upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch 1970-01-01 00:00:00.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/patches/upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch 2024-03-13 14:12:12.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Moved exiv2 header from GeoImageDock.h to .cpp +Author: Ladislav Láska +Origin: https://github.com/openstreetmap/merkaartor/commit/ba8b73e6b3372a21305640baca07a991f77db119 +Forwarded: not-needed + +--- a/src/Docks/GeoImageDock.cpp ++++ b/src/Docks/GeoImageDock.cpp +@@ -6,6 +6,7 @@ + #include "LayerWidget.h" + #include "PropertiesDock.h" + #include "Global.h" ++#include + + #ifdef USE_ZBAR + #include +--- a/src/Docks/GeoImageDock.h ++++ b/src/Docks/GeoImageDock.h +@@ -7,7 +7,6 @@ + #include + #include + #include +-#include + #include + + class ImageView; diff -Nru merkaartor-0.19.0+ds/debian/patches/upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch merkaartor-0.19.0+ds/debian/patches/upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch --- merkaartor-0.19.0+ds/debian/patches/upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch 1970-01-01 00:00:00.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/patches/upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch 2024-03-13 14:12:12.000000000 +0000 @@ -0,0 +1,43 @@ +Description: Replaced use of AutoPtr with std::unique_ptr in GeoImageDock.cpp. +Author: Ladislav Láska +Origin: https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd +Forwarded: not-needed + +--- a/src/Docks/GeoImageDock.cpp ++++ b/src/Docks/GeoImageDock.cpp +@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringLis + Document *theDocument = Main->document(); + MapView *theView = Main->view(); + +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -869,7 +869,7 @@ void GeoImageDock::saveImage() + // fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)")); + qDebug() << fn; + if (!fn.isEmpty()) { +- Exiv2::Image::AutoPtr imageIn, imageOut; ++ std::unique_ptr imageIn, imageOut; + Exiv2::ExifData exifData; + try { + imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString()); +@@ -893,7 +893,7 @@ Coord GeoImageDock::getGeoDataFromImage( + { + Coord pos; + double lat = 0.0, lon = 0.0; +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -933,7 +933,7 @@ Coord GeoImageDock::getGeoDataFromImage( + + void GeoImageDock::addGeoDataToImage(Coord position, const QString & file) + { +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr image; + + try { + image = Exiv2::ImageFactory::open(file.toStdString()); diff -Nru merkaartor-0.19.0+ds/debian/rules merkaartor-0.19.0+ds/debian/rules --- merkaartor-0.19.0+ds/debian/rules 2023-07-25 07:31:25.000000000 +0000 +++ merkaartor-0.19.0+ds/debian/rules 2024-03-13 14:17:39.000000000 +0000 @@ -12,41 +12,26 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el)) -DEB_PKG_USEWEBENGINE=1 +DEB_PKG_WEBENGINE=1 else -DEB_PKG_USEWEBENGINE=0 +DEB_PKG_WEBENGINE=0 endif %: - dh $@ --buildsystem=qmake - -override_dh_auto_clean: - dh_auto_clean - cd translations && make clean - -override_dh_clean: - dh_clean - rm -rf binaries + dh $@ --buildsystem=cmake override_dh_auto_configure: - cd translations && make release - dh_auto_configure -- -recursive \ - Merkaartor.pro \ - TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \ - GDAL=1 \ - GEOIMAGE=1 \ - GPSDLIB=1 \ - LIBPROXY=1 \ - NOWEBKIT=1 \ - PROJ=1 \ - SPATIALITE=0 \ - SYSTEM_QUAZIP=1 \ - SYSTEM_QUAZIP_LDFLAGS="-lquazip5" \ - USEWEBENGINE=$(DEB_PKG_USEWEBENGINE) \ - ZBAR=0 \ - NODEBUG=1 \ - RELEASE=1 + dh_auto_configure -- \ + -DEXTRA_TESTS=0 \ + -DGEOIMAGE=1 \ + -DGPSD=1 \ + -DLIBPROXY=1 \ + -DWEBENGINE=$(DEB_PKG_WEBENGINE) \ + -DZBAR=0 + +override_dh_auto_test: + xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' dh_auto_test override_dh_installchangelogs: dh_installchangelogs CHANGELOG