[merkaartor] 01/01: Mark patches as Applied-Upstream.

[Sebastiaan Couwenberg]

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

[merkaartor] 01/01: Mark patches as Applied-Upstream.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository merkaartor.

commit b6c7b9824662394d5a3c9c4b91486dc94dcfccf7
Author: Bas Couwenberg 
Date:   Thu Oct 15 14:42:31 2015 +0200

Mark patches as Applied-Upstream.
---
 debian/patches/desktop-keywords.patch | 1 +
 debian/patches/hardening-buildflags.patch | 1 +
 debian/patches/various-typos.patch| 1 +
 3 files changed, 3 insertions(+)

diff --git a/debian/patches/desktop-keywords.patch 
b/debian/patches/desktop-keywords.patch
index c9b5e29..225f736 100644
--- a/debian/patches/desktop-keywords.patch
+++ b/debian/patches/desktop-keywords.patch
@@ -1,6 +1,7 @@
 Description: Add Keywords to .desktop file.
 Author: Bas Couwenberg 
 Forwarded: https://github.com/openstreetmap/merkaartor/pull/68
+Applied-Upstream: 
https://github.com/openstreetmap/merkaartor/commit/d441932e6704481e48fdc0b6f27adee6b85e38af
 
 --- a/src/merkaartor.desktop
 +++ b/src/merkaartor.desktop
diff --git a/debian/patches/hardening-buildflags.patch 
b/debian/patches/hardening-buildflags.patch
index 56536ff..b3be72f 100644
--- a/debian/patches/hardening-buildflags.patch
+++ b/debian/patches/hardening-buildflags.patch
@@ -1,6 +1,7 @@
 Description: Add hardening buildflags to qmake build.
 Author: Bas Couwenberg 
 Forwarded: https://github.com/openstreetmap/merkaartor/pull/68
+Applied-Upstream: 
https://github.com/openstreetmap/merkaartor/commit/d441932e6704481e48fdc0b6f27adee6b85e38af
 
 --- a/src/Config.pri
 +++ b/src/Config.pri
diff --git a/debian/patches/various-typos.patch 
b/debian/patches/various-typos.patch
index 2333c7a..0370422 100644
--- a/debian/patches/various-typos.patch
+++ b/debian/patches/various-typos.patch
@@ -5,6 +5,7 @@ Description: Fix various typos.
  * Replace 'allows to ' with 'allows to ing' or 'allows one to 
'.
 Author: Bas Couwenberg 
 Forwarded: https://github.com/openstreetmap/merkaartor/pull/68
+Applied-Upstream: 
https://github.com/openstreetmap/merkaartor/commit/d441932e6704481e48fdc0b6f27adee6b85e38af
 
 --- a/src/qextserialport/posix_qextserialport.cpp
 +++ b/src/qextserialport/posix_qextserialport.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