[Git][debian-gis-team/merkaartor][master] Mark patches as Applied-Upstream.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / merkaartor


Commits:
82d691cd by Bas Couwenberg at 2024-03-14T05:17:24+01:00
Mark patches as Applied-Upstream.

- - - - -


2 changed files:

- debian/patches/gpsd.patch
- debian/patches/libproxy.patch


Changes:

=====================================
debian/patches/gpsd.patch
=====================================
@@ -2,6 +2,7 @@ Description: Fix pkg-config name gpsd.
  libgps-dev provides libgps.pc.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/openstreetmap/merkaartor/pull/294
+Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/7dede77370d89e8e7586f6ed5af225f9b5bde6cf
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt


=====================================
debian/patches/libproxy.patch
=====================================
@@ -4,6 +4,7 @@ Description: Fix FTBFS with libproxy 0.5.
 Author: Bas Couwenberg <sebastic at debian.org>
 Bug-Debian: https://bugs.debian.org/1066442
 Forwarded: https://github.com/openstreetmap/merkaartor/pull/293
+Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/c1997ae6548d85b84fea4689a93336c69e8350ea
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt



View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/82d691cd03a599292a9aed66b17da743e4ebe635

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/82d691cd03a599292a9aed66b17da743e4ebe635
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240314/67a4dc03/attachment.htm>