This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository merkaartor.
commit bd0ea5668348d1226e669323d0f0bcdf630a88b6
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Nov 1 23:10:40 2015 +0100
Mark patches as Applied-Upstream.
---
debian/patches/desktop-keywords-syntax.patch | 1 +
debian/patches/libgps22.patch | 1 +
2 files changed, 2 insertions(+)
diff --git a/debian/patches/desktop-keywords-syntax.patch
b/debian/patches/desktop-keywords-syntax.patch
index 3bf8d8f..1d3eebf 100644
--- a/debian/patches/desktop-keywords-syntax.patch
+++ b/debian/patches/desktop-keywords-syntax.patch
@@ -5,6 +5,7 @@ Description: Fix desktop file syntax for Keywords list
src/merkaartor.desktop: error: value "OSM;GIS;Map;Geo" for locale string list
key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as
trailing character
Author: Bas Couwenberg <sebas...@debian.org>
Forwarded: https://github.com/openstreetmap/merkaartor/pull/78
+Applied-Upstream:
https://github.com/openstreetmap/merkaartor/commit/ff455d627b0f79e42742b9a3d48a90e73dda230e
--- a/src/merkaartor.desktop
+++ b/src/merkaartor.desktop
diff --git a/debian/patches/libgps22.patch b/debian/patches/libgps22.patch
index bf737b6..cd2e3a0 100644
--- a/debian/patches/libgps22.patch
+++ b/debian/patches/libgps22.patch
@@ -2,6 +2,7 @@ Description: Fix gpsdata handling for gpsd >= 3.12 (libgps22 |
GPSD_API_MAJOR_VE
Author: Bas Couwenberg <sebas...@debian.org>
Bug: https://github.com/openstreetmap/merkaartor/issues/76
Forwarded: https://github.com/openstreetmap/merkaartor/pull/77
+Applied-Upstream:
https://github.com/openstreetmap/merkaartor/commit/02f72ddcfd5007149d0810d0c1149699713a8f11
--- a/src/GPS/qgpsdevice.cpp
+++ b/src/GPS/qgpsdevice.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
