merkaartor.git
21 months agoMerge merkaartor (0.19.0+ds-5) import into refs/heads/workingbranch
Bas Couwenberg [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
Merge merkaartor (0.19.0+ds-5) import into refs/heads/workingbranch

21 months agoFix pkg-config name gpsd.
Bas Couwenberg [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
Fix pkg-config name gpsd.

Forwarded: https://github.com/openstreetmap/merkaartor/pull/294

libgps-dev provides libgps.pc.

Gbp-Pq: Name gpsd.patch

21 months agoFix FTBFS with libproxy 0.5.
Bas Couwenberg [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
Fix FTBFS with libproxy 0.5.

Bug-Debian: https://bugs.debian.org/1066442
Forwarded: https://github.com/openstreetmap/merkaartor/pull/293

proxy.h includes glib-object.h which needs to be found too.
Use pkg-config to get these paths.

Gbp-Pq: Name libproxy.patch

21 months agoReplaced use of AutoPtr with std::unique_ptr in GeoImageDock.cpp.
Ladislav Láska [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
Replaced use of AutoPtr with std::unique_ptr in GeoImageDock.cpp.

Origin: https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd
Forwarded: not-needed

Gbp-Pq: Name upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch

21 months agoMoved exiv2 header from GeoImageDock.h to .cpp
Ladislav Láska [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
Moved exiv2 header from GeoImageDock.h to .cpp

Origin: https://github.com/openstreetmap/merkaartor/commit/ba8b73e6b3372a21305640baca07a991f77db119
Forwarded: not-needed

Gbp-Pq: Name upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch

21 months agoDon't use git for version information.
Bas Couwenberg [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
Don't use git for version information.

Forwarded: not-needed

Gbp-Pq: Name no-git-version.patch

21 months agomerkaartor (0.19.0+ds-5) unstable; urgency=medium
Bas Couwenberg [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
merkaartor (0.19.0+ds-5) unstable; urgency=medium

  * Team upload.

  [ 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.

[dgit import unpatched merkaartor 0.19.0+ds-5]

21 months agoImport merkaartor_0.19.0+ds-5.debian.tar.xz
Bas Couwenberg [Wed, 13 Mar 2024 14:22:13 +0000 (15:22 +0100)]
Import merkaartor_0.19.0+ds-5.debian.tar.xz

[dgit import tarball merkaartor 0.19.0+ds-5 merkaartor_0.19.0+ds-5.debian.tar.xz]

2 years agoMerge merkaartor (0.19.0+ds-4) import into refs/heads/workingbranch
Bas Couwenberg [Tue, 25 Jul 2023 07:31:25 +0000 (08:31 +0100)]
Merge merkaartor (0.19.0+ds-4) import into refs/heads/workingbranch

2 years agoExtract version from CHANGELOG, not git.
Bas Couwenberg [Tue, 25 Jul 2023 07:31:25 +0000 (08:31 +0100)]
Extract version from CHANGELOG, not git.

Forwarded: not-needed

Gbp-Pq: Name no-git-version.patch

2 years agoAdd nostrip to CONFIG for debug package.
Bas Couwenberg [Tue, 25 Jul 2023 07:31:25 +0000 (08:31 +0100)]
Add nostrip to CONFIG for debug package.

Forwarded: not-needed

Gbp-Pq: Name qmake-config-nostrip.patch

2 years agomerkaartor (0.19.0+ds-4) unstable; urgency=medium
Bas Couwenberg [Tue, 25 Jul 2023 07:31:25 +0000 (08:31 +0100)]
merkaartor (0.19.0+ds-4) unstable; urgency=medium

  * Team upload.

  [ Bas Couwenberg ]
  * Bump Standards-Version to 4.6.2, no changes.
  * Don't use qtwebengine5-dev on mipsel, package to be removed.
  * Update lintian overrides.

  [ Adrian Bunk ]
  * qtwebengine5-dev is now available on mips64el

[dgit import unpatched merkaartor 0.19.0+ds-4]

2 years agoImport merkaartor_0.19.0+ds-4.debian.tar.xz
Bas Couwenberg [Tue, 25 Jul 2023 07:31:25 +0000 (08:31 +0100)]
Import merkaartor_0.19.0+ds-4.debian.tar.xz

[dgit import tarball merkaartor 0.19.0+ds-4 merkaartor_0.19.0+ds-4.debian.tar.xz]

3 years agoMerge merkaartor (0.19.0+ds-3) import into refs/heads/workingbranch
Jerome Benoit [Sat, 29 Oct 2022 15:50:39 +0000 (16:50 +0100)]
Merge merkaartor (0.19.0+ds-3) import into refs/heads/workingbranch

3 years agoExtract version from CHANGELOG, not git.
Bas Couwenberg [Sat, 29 Oct 2022 15:50:39 +0000 (16:50 +0100)]
Extract version from CHANGELOG, not git.

Forwarded: not-needed

Gbp-Pq: Name no-git-version.patch

3 years agoAdd nostrip to CONFIG for debug package.
Bas Couwenberg [Sat, 29 Oct 2022 15:50:39 +0000 (16:50 +0100)]
Add nostrip to CONFIG for debug package.

Forwarded: not-needed

Gbp-Pq: Name qmake-config-nostrip.patch

3 years agomerkaartor (0.19.0+ds-3) unstable; urgency=medium
Jerome Benoit [Sat, 29 Oct 2022 15:50:39 +0000 (16:50 +0100)]
merkaartor (0.19.0+ds-3) unstable; urgency=medium

  [ Jerome Benoit ]
  * Silence lintian source-is-missing error reports.
  * Update copyright year for debian files.
  * Refresh a lintian tag in d/s/lintian-overrides.

  [ Bas Couwenberg ]
  * Team upload.
  * Bump Standards-Version to 4.6.1, no changes.
  * Add pkg-config to build dependencies.

[dgit import unpatched merkaartor 0.19.0+ds-3]

3 years agoImport merkaartor_0.19.0+ds-3.debian.tar.xz
Jerome Benoit [Sat, 29 Oct 2022 15:50:39 +0000 (16:50 +0100)]
Import merkaartor_0.19.0+ds-3.debian.tar.xz

[dgit import tarball merkaartor 0.19.0+ds-3 merkaartor_0.19.0+ds-3.debian.tar.xz]

4 years agoMerge merkaartor (0.19.0+ds-2) import into refs/heads/workingbranch
Bas Couwenberg [Sat, 4 Sep 2021 15:05:19 +0000 (16:05 +0100)]
Merge merkaartor (0.19.0+ds-2) import into refs/heads/workingbranch

4 years agoExtract version from CHANGELOG, not git.
Bas Couwenberg [Sat, 4 Sep 2021 15:05:19 +0000 (16:05 +0100)]
Extract version from CHANGELOG, not git.

Forwarded: not-needed

Gbp-Pq: Name no-git-version.patch

4 years agoAdd nostrip to CONFIG for debug package.
Bas Couwenberg [Sat, 4 Sep 2021 15:05:19 +0000 (16:05 +0100)]
Add nostrip to CONFIG for debug package.

Forwarded: not-needed

Gbp-Pq: Name qmake-config-nostrip.patch

4 years agomerkaartor (0.19.0+ds-2) unstable; urgency=medium
Bas Couwenberg [Sat, 4 Sep 2021 15:05:19 +0000 (16:05 +0100)]
merkaartor (0.19.0+ds-2) unstable; urgency=medium

  * Team upload.
  * Drop -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H, proj.h is supported now.
    (closes: #993609)

[dgit import unpatched merkaartor 0.19.0+ds-2]

4 years agoImport merkaartor_0.19.0+ds-2.debian.tar.xz
Bas Couwenberg [Sat, 4 Sep 2021 15:05:19 +0000 (16:05 +0100)]
Import merkaartor_0.19.0+ds-2.debian.tar.xz

[dgit import tarball merkaartor 0.19.0+ds-2 merkaartor_0.19.0+ds-2.debian.tar.xz]

4 years agoImport merkaartor_0.19.0+ds.orig.tar.xz
Jerome Benoit [Sun, 29 Aug 2021 12:45:57 +0000 (12:45 +0000)]
Import merkaartor_0.19.0+ds.orig.tar.xz

[dgit import orig merkaartor_0.19.0+ds.orig.tar.xz]

4 years agoImport merkaartor_0.19.0+ds.orig.tar.xz
Jerome Benoit [Sun, 29 Aug 2021 12:45:57 +0000 (13:45 +0100)]
Import merkaartor_0.19.0+ds.orig.tar.xz

[dgit import orig merkaartor_0.19.0+ds.orig.tar.xz]

5 years agoMerge merkaartor (0.18.4+ds-5) import into refs/heads/workingbranch
Jerome Benoit [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
Merge merkaartor (0.18.4+ds-5) import into refs/heads/workingbranch

5 years agoFix spelling errors.
Bas Couwenberg sebastic@debian.org, Jerome Benoit [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
Fix spelling errors.

Forwarded: https://github.com/openstreetmap/merkaartor/pull/207

Gbp-Pq: Name spelling-errors.patch

5 years agoExtract version from CHANGELOG, not git.
Bas Couwenberg [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
Extract version from CHANGELOG, not git.

Forwarded: not-needed

Gbp-Pq: Name no-git-version.patch

5 years agoAdd nostrip to CONFIG for debug package.
Bas Couwenberg [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
Add nostrip to CONFIG for debug package.

Forwarded: not-needed

Gbp-Pq: Name qmake-config-nostrip.patch

5 years agoAdd condition to use new timespec_t on gpsd APIs >= 9
Jerome Benoit [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
Add condition to use new timespec_t on gpsd APIs >= 9

Forwarded: not-needed

Apply upstream fix (commit 13b358fa7899bb34e277b32a4c0d92833050f2c6).

Gbp-Pq: Name upstream-gpsd-9+-fix_time.patch

5 years agoFix build with Qt 5.15 (missing QPainterPath include)
Jerome Benoit [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
Fix build with Qt 5.15 (missing QPainterPath include)

Forwarded: not-needed

Apply upstream fix (commit e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c).

Gbp-Pq: Name upstream-Qt5_15-fix.patch

5 years agomerkaartor (0.18.4+ds-5) unstable; urgency=medium
Jerome Benoit [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
merkaartor (0.18.4+ds-5) unstable; urgency=medium

  * FTBFS fix version: apply upstream fix for building against
      recent version of Qt (Closes: #974104).
  * Debianization:
    - d/p/upstream-Qt5_15-fix.patch, introduce.
    - d/control:
      -  debhelper, bump to 13;
    - d/s/lintian-overrides:
      - testsuite-autopkgtest-missing tag, discard.

[dgit import unpatched merkaartor 0.18.4+ds-5]

5 years agoImport merkaartor_0.18.4+ds-5.debian.tar.xz
Jerome Benoit [Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)]
Import merkaartor_0.18.4+ds-5.debian.tar.xz

[dgit import tarball merkaartor 0.18.4+ds-5 merkaartor_0.18.4+ds-5.debian.tar.xz]

5 years agoImport merkaartor_0.18.4+ds.orig.tar.xz
Jerome Benoit [Thu, 16 Apr 2020 08:55:48 +0000 (09:55 +0100)]
Import merkaartor_0.18.4+ds.orig.tar.xz

[dgit import orig merkaartor_0.18.4+ds.orig.tar.xz]

7 years agoMerge merkaartor (0.18.3+ds-5) import into refs/heads/workingbranch
Bas Couwenberg [Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)]
Merge merkaartor (0.18.3+ds-5) import into refs/heads/workingbranch

7 years agoFix spelling errors.
Bas Couwenberg [Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)]
Fix spelling errors.

* everytime -> every time

Gbp-Pq: Name spelling-errors.patch

7 years agoFix 'performace' typo, replace with 'performance'.
Bas Couwenberg [Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)]
Fix 'performace' typo, replace with 'performance'.

Forwarded: https://github.com/openstreetmap/merkaartor/pull/124
Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/4357e996a07358b663b35486184e45d8033f3233

Gbp-Pq: Name performance-typo.patch

7 years agoExtract version from CHANGELOG, not git.
Bas Couwenberg [Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)]
Extract version from CHANGELOG, not git.

Forwarded: not-needed

Gbp-Pq: Name no-git-version.patch

7 years agoAdd nostrip to CONFIG for debug package.
Bas Couwenberg [Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)]
Add nostrip to CONFIG for debug package.

Forwarded: not-needed

Gbp-Pq: Name qmake-config-nostrip.patch

7 years agomerkaartor (0.18.3+ds-5) unstable; urgency=medium
Bas Couwenberg [Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)]
merkaartor (0.18.3+ds-5) unstable; urgency=medium

  * Drop autopkgtest to test installability.
  * Add lintian override for testsuite-autopkgtest-missing.

[dgit import unpatched merkaartor 0.18.3+ds-5]

7 years agoImport merkaartor_0.18.3+ds-5.debian.tar.xz
Bas Couwenberg [Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)]
Import merkaartor_0.18.3+ds-5.debian.tar.xz

[dgit import tarball merkaartor 0.18.3+ds-5 merkaartor_0.18.3+ds-5.debian.tar.xz]

9 years agoExtract version from CHANGELOG, not git.
Bas Couwenberg [Tue, 6 Sep 2016 15:03:10 +0000 (16:03 +0100)]
Extract version from CHANGELOG, not git.

Forwarded: not-needed

Gbp-Pq: Name no-git-version.patch

9 years agoImport merkaartor_0.18.3+ds.orig.tar.gz
Bas Couwenberg [Tue, 6 Sep 2016 15:03:10 +0000 (16:03 +0100)]
Import merkaartor_0.18.3+ds.orig.tar.gz

[dgit import orig merkaartor_0.18.3+ds.orig.tar.gz]

9 years agoAdd nostrip to CONFIG for debug package.
Bas Couwenberg [Tue, 6 Sep 2016 15:03:10 +0000 (16:03 +0100)]
Add nostrip to CONFIG for debug package.

Forwarded: not-needed

Gbp-Pq: Name qmake-config-nostrip.patch

9 years agomerkaartor (0.18.3+ds-1) unstable; urgency=medium
Bas Couwenberg [Tue, 6 Sep 2016 15:03:10 +0000 (16:03 +0100)]
merkaartor (0.18.3+ds-1) unstable; urgency=medium

  * New upstream release (from modified release tag).
  * Fix filenamemangle in watch file.
  * Refresh patches.

[dgit import unpatched merkaartor 0.18.3+ds-1]

9 years agoImport merkaartor_0.18.3+ds-1.debian.tar.xz
Bas Couwenberg [Tue, 6 Sep 2016 15:03:10 +0000 (16:03 +0100)]
Import merkaartor_0.18.3+ds-1.debian.tar.xz

[dgit import tarball merkaartor 0.18.3+ds-1 merkaartor_0.18.3+ds-1.debian.tar.xz]