[Git][debian-gis-team/osmosis][master] 7 commits: New upstream version 0.47.2

[Bas Couwenberg]

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


Commits:
d86b9be1 by Bas Couwenberg at 2020-03-11T05:54:46+01:00
New upstream version 0.47.2
- - - - -
d9ea4561 by Bas Couwenberg at 2020-03-11T05:54:51+01:00
Update upstream source from tag 'upstream/0.47.2'

Update to upstream version '0.47.2'
with Debian dir 00d277463c3092f323e974f6ce15071c6bb3d1aa
- - - - -
8137fa7e by Bas Couwenberg at 2020-03-11T05:55:05+01:00
New upstream release.

- - - - -
477e563e by Bas Couwenberg at 2020-03-11T05:58:52+01:00
Revert "Add patch to fix FTBFS with protobuf 3.10.1. (closes: #944928)"

This reverts commit 3a769e3b23c9d78b706535ef1f62ea862b0810ed.

- - - - -
0e14c4c7 by Bas Couwenberg at 2020-03-11T06:03:12+01:00
Don't use external xerces.

- - - - -
da5e9c7b by Bas Couwenberg at 2020-03-11T06:03:30+01:00
Set distribution to unstable.

- - - - -
6473485d by Bas Couwenberg at 2020-03-11T06:12:02+01:00
Add patch to fix FTBFS with protobuf 3.10.1. (closes: #944928)

This reverts commit 85297efdf16829d2423b0d7b426011c1ee7d8081.

- - - - -


8 changed files:

- build-support/docker/docker-compose.yml
- build-support/docker/env.sh
- debian/changelog
- debian/control
- debian/patches/02-fix_plexus.patch
- osmosis-core/build.gradle
- package/changes.txt
- package/script/contrib/apidb_0.6.sql


Changes:

=====================================
build-support/docker/docker-compose.yml
=====================================
@@ -8,6 +8,7 @@ services:
       - db
     volumes:
       - ${gradleUserDir}:/gradle
+      - ${gnupgUserDir}:${gnupgUserDir}
       - ${projectDir}:/project
   db:
     image: openstreetmap.org/osmosis-db


=====================================
build-support/docker/env.sh
=====================================
@@ -1,4 +1,5 @@
 export gradleUserDir="${HOME}/.gradle"
+export gnupgUserDir="${HOME}/.gnupg"
 export userId=$(id -u)
 export groupId=$(id -g)
 export projectDir="$( cd "${scriptDir}"/../.. && pwd )"


=====================================
debian/changelog
=====================================
@@ -1,10 +1,17 @@
-osmosis (0.47.1-2) UNRELEASED; urgency=medium
+osmosis (0.47.2-2) UNRELEASED; urgency=medium
 
   * Add patch to fix FTBFS with protobuf 3.10.1.
     (closes: #944928)
   * Require at least libprotobuf-java 3.10.1.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 09 Mar 2020 06:04:13 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 11 Mar 2020 06:11:50 +0100
+
+osmosis (0.47.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Don't use external xerces.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 11 Mar 2020 06:03:18 +0100
 
 osmosis (0.47.1-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -30,7 +30,6 @@ Build-Depends: debhelper (>= 9),
                libplexus-classworlds-java,
                libprotobuf-java (>= 3.10.1),
                libwoodstox-java,
-               libxerces2-java,
                libxz-java,
                maven-repo-helper
 Standards-Version: 4.5.0
@@ -59,7 +58,6 @@ Depends: default-jre-headless | java8-runtime-headless,
          libosmpbf-java,
          libplexus-classworlds-java,
          libprotobuf-java,
-         libxerces2-java,
          libxz-java,
          ${misc:Depends}
 Description: Command line OpenStreetMap data processor


=====================================
debian/patches/02-fix_plexus.patch
=====================================
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/package/config/plexus.conf
 +++ b/package/config/plexus.conf
-@@ -1,5 +1,20 @@
+@@ -1,5 +1,19 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  
  [osmosis.core]
@@ -25,5 +25,4 @@ Forwarded: not-needed
 +load /usr/share/java/protobuf.jar
 +load /usr/share/java/osmpbf.jar
 +load /usr/share/java/commons-pool.jar
-+load /usr/share/java/xercesImpl.jar
 +load /usr/share/osmosis/*.jar


=====================================
osmosis-core/build.gradle
=====================================
@@ -8,7 +8,6 @@ dependencies {
     compile group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: dependencyVersionWoodstoxCore
     compile group: 'org.codehaus.woodstox', name: 'stax2-api', version: dependencyVersionWoodstoxStax2
     compile group: 'org.apache.commons', name: 'commons-compress', version: dependencyVersionCommonsCompress
-    compile group: 'xerces', name: 'xercesImpl', version: dependencyVersionXerces
 }
 
 /*


=====================================
package/changes.txt
=====================================
@@ -1,3 +1,7 @@
+0.47.2
+Removed explicit dependency on xerces in favor of JDK version (PR #51)
+Added $gnupgUserDir to Docker setup (PR #56)
+
 0.47.1
 Update APIDB schema to remove users.nearby column (PR #54)
 


=====================================
package/script/contrib/apidb_0.6.sql
=====================================
@@ -4092,4 +4092,4 @@ INSERT INTO schema_migrations (version) VALUES ('20110322001319');
 
 INSERT INTO schema_migrations (version) VALUES ('20100516124737');
 
-INSERT INTO schema_migrations (version) VALUES ('20110925112722');
\ No newline at end of file
+INSERT INTO schema_migrations (version) VALUES ('20110925112722');



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/49b9bdd9a3ce6b074e80c61d60aaf32649cdc7cf...6473485d2552b823e3529cd152ac1804c914e29d

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/49b9bdd9a3ce6b074e80c61d60aaf32649cdc7cf...6473485d2552b823e3529cd152ac1804c914e29d
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/20200311/ae3ac41c/attachment-0001.html>