[Git][debian-gis-team/osmosis][master] 6 commits: New upstream version 0.47.1

[Bas Couwenberg]

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


Commits:
60dd044a by Bas Couwenberg at 2020-03-09T05:42:08+01:00
New upstream version 0.47.1
- - - - -
4577a533 by Bas Couwenberg at 2020-03-09T05:42:12+01:00
Update upstream source from tag 'upstream/0.47.1'

Update to upstream version '0.47.1'
with Debian dir 2a4e310de25a2828ba37e0722ec457b54b6db88c
- - - - -
2f0045c0 by Bas Couwenberg at 2020-03-09T05:43:45+01:00
New upstream release.

- - - - -
85297efd by Bas Couwenberg at 2020-03-09T05:49:50+01:00
Revert "Add patch to fix FTBFS with protobuf 3.10.1. (closes: #944928)"

This reverts commit 034b4ef1563273e54d21f37b85134c5044522558.

Revert "Require at least libprotobuf-java 3.10.1."

This reverts commit de6f643257482b52c7a7df32c9306f1db5a816c5.

- - - - -
0df124b5 by Bas Couwenberg at 2020-03-09T05:50:44+01:00
Set distribution to unstable.

- - - - -
3a769e3b by Bas Couwenberg at 2020-03-09T06:02:18+01:00
Add patch to fix FTBFS with protobuf 3.10.1. (closes: #944928)

This reverts commit 85297efdf16829d2423b0d7b426011c1ee7d8081.

- - - - -


4 changed files:

- debian/changelog
- osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/impl/UserManager.java
- package/changes.txt
- package/script/contrib/apidb_0.6.sql


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-osmosis (0.47-5) UNRELEASED; urgency=medium
+osmosis (0.47.1-1) unstable; urgency=medium
 
+  * New upstream release.
   * Update gbp.conf to use --source-only-changes by default.
   * Bump Standards-Version to 4.5.0, no changes.
   * Add patch to fix FTBFS with protobuf 3.10.1.
@@ -7,7 +8,7 @@ osmosis (0.47-5) UNRELEASED; urgency=medium
   * Require at least libprotobuf-java 3.10.1.
   * Drop Name field from upstream metadata.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Jul 2019 09:23:39 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 09 Mar 2020 05:50:37 +0100
 
 osmosis (0.47-4) unstable; urgency=medium
 


=====================================
osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/impl/UserManager.java
=====================================
@@ -25,8 +25,8 @@ public class UserManager implements Closeable {
 
     private static final String INSERT_SQL_USER = "INSERT INTO users (id, email, pass_crypt,"
             + " creation_time, display_name, data_public, description, home_lat, home_lon, home_zoom,"
-            + " nearby, pass_salt) VALUES (?, ?, '00000000000000000000000000000000', NOW(), ?, ?,"
-            + " ?, 0, 0, 3, 50, '00000000')";
+            + " pass_salt) VALUES (?, ?, '00000000000000000000000000000000', NOW(), ?, ?,"
+            + " ?, 0, 0, 3, '00000000')";
 
     private static final String UPDATE_SQL_USER = "UPDATE users SET display_name = ? WHERE id = ?";
 


=====================================
package/changes.txt
=====================================
@@ -1,3 +1,6 @@
+0.47.1
+Update APIDB schema to remove users.nearby column (PR #54)
+
 0.47
 Build using Java 11 now that Java has moved to a 6 month release cycle with no (free) long term support.
 Use https for all replication URLs.


=====================================
package/script/contrib/apidb_0.6.sql
=====================================
@@ -2756,7 +2756,6 @@ CREATE TABLE users (
     home_lat double precision,
     home_lon double precision,
     home_zoom smallint DEFAULT 3,
-    nearby integer DEFAULT 50,
     pass_salt character varying(255),
     image text,
     email_valid boolean DEFAULT false NOT NULL,



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/ae44b04755d6f644a1729989178fb14ffd503f57...3a769e3b23c9d78b706535ef1f62ea862b0810ed

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/ae44b04755d6f644a1729989178fb14ffd503f57...3a769e3b23c9d78b706535ef1f62ea862b0810ed
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/20200309/9381d7d3/attachment-0001.html>