[Git][debian-gis-team/osmosis][master] 3 commits: Update for protobuf 3.11.4.

[Bas Couwenberg]

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


Commits:
f7d7fc2e by Bas Couwenberg at 2020-03-22T07:15:06+01:00
Update for protobuf 3.11.4.

- - - - -
4c3974ae by Bas Couwenberg at 2020-03-22T07:32:36+01:00
Mark protobuf.patch as Forwarded.

- - - - -
bf48c602 by Bas Couwenberg at 2020-03-22T10:10:51+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/protobuf.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,12 +1,12 @@
-osmosis (0.47.2-2) UNRELEASED; urgency=medium
+osmosis (0.47.2-2) unstable; urgency=medium
 
-  * Add patch to fix FTBFS with protobuf 3.10.1.
+  * Add patch to fix FTBFS with protobuf 3.11.4.
     (closes: #944928)
-  * Require at least libprotobuf-java 3.10.1.
+  * Require at least libprotobuf-java 3.11.4.
   * Bump debhelper compat to 10, changes:
     - Drop --parallel option, enabled by default
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 11 Mar 2020 06:11:50 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 22 Mar 2020 10:10:37 +0100
 
 osmosis (0.47.2-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 10~),
                libstax2-api-java,
                libosmpbf-java,
                libplexus-classworlds-java,
-               libprotobuf-java (>= 3.10.1),
+               libprotobuf-java (>= 3.11.4),
                libwoodstox-java,
                libxz-java,
                maven-repo-helper


=====================================
debian/patches/protobuf.patch
=====================================
@@ -1,7 +1,8 @@
-Description: Update for protobuf 3.10.
+Description: Update for protobuf 3.11.
  optimize_for = LITE_RUNIME is deprecated,
  protobuf-javalite is not packaged
 Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/osmosis/pull/58
 
 --- a/osmosis-osm-binary/src/main/protobuf/fileformat.proto
 +++ b/osmosis-osm-binary/src/main/protobuf/fileformat.proto
@@ -23674,7 +23675,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
      }
      /**
       * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
-+     * @param value The types to add.
++     * @return The count of types.
       */
 -    @java.lang.Override
      public int getTypesCount() {



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/dce05a8cf203af1c7d28ac79d0aa3e11d0ef6d07...bf48c602c781bfd0307e58f20f346dc47ef4459c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/dce05a8cf203af1c7d28ac79d0aa3e11d0ef6d07...bf48c602c781bfd0307e58f20f346dc47ef4459c
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/20200322/5f9b5176/attachment-0001.html>