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

[Bas Couwenberg]

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


Commits:
6668c677 by Bas Couwenberg at 2020-08-22T16:29:52+02:00
Mark patches as Applied-Upstream.

- - - - -


3 changed files:

- debian/patches/copy-headers.patch
- debian/patches/optimize_for-LITE_RUNTIME.patch
- debian/patches/proto2-syntax.patch


Changes:

=====================================
debian/patches/copy-headers.patch
=====================================
@@ -11,6 +11,7 @@ Description: Copy can fail during parallel builds.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/scrosby/OSM-binary/pull/16
 Applied-Upstream: https://github.com/scrosby/OSM-binary/commit/b7a621927bc9d881a7f9fd412615aa1b1321e019
+
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -20,7 +20,7 @@ libosmpbf.a: fileformat.pb.o osmformat.p


=====================================
debian/patches/optimize_for-LITE_RUNTIME.patch
=====================================
@@ -8,6 +8,7 @@ Description: Disable deprecated optimize_for = LITE_RUNTIME option.
   https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/openstreetmap/OSM-binary/pull/38
+Applied-Upstream: https://github.com/openstreetmap/OSM-binary/commit/982393066ec05bea522bcf28e11e133e3aef447e
 
 --- a/src/fileformat.proto
 +++ b/src/fileformat.proto


=====================================
debian/patches/proto2-syntax.patch
=====================================
@@ -1,6 +1,7 @@
 Description: Specify proto2 syntax to fix warnings with protobuf 3.0.0.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/scrosby/OSM-binary/pull/29
+Applied-Upstream: https://github.com/openstreetmap/OSM-binary/commit/0f48055af1f913d13e4c817c90cddbf6ef24e20b
 
 --- a/src/fileformat.proto
 +++ b/src/fileformat.proto



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/commit/6668c677062265b4963b041d34b0e4d5df97f5f1

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/commit/6668c677062265b4963b041d34b0e4d5df97f5f1
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/20200822/261cb6d3/attachment.html>