diff -Nru osmosis-0.46/debian/changelog osmosis-0.46/debian/changelog
--- osmosis-0.46/debian/changelog	2018-03-29 12:59:30.000000000 +0000
+++ osmosis-0.46/debian/changelog	2018-06-20 19:21:12.000000000 +0000
@@ -1,3 +1,15 @@
+osmosis (0.46-4) unstable; urgency=medium
+
+  * Update Vcs-* URLs for Salsa.
+  * Drop override for vcs-deprecated-in-debian-infrastructure.
+  * Bump Standards-Version to 4.1.4, no changes.
+  * Strip trailing whitespace from control & rules files.
+  * Build depend on default-jdk & default-jdk-doc, fixes FTBFS:
+    javadoc: error - Error fetching URL: file:/usr/share/doc/default-jdk/api/
+  * Add patch to fix example-shell-script-fails-syntax-check issue.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 20 Jun 2018 21:21:12 +0200
+
 osmosis (0.46-3) unstable; urgency=medium
 
   * Update copyright-format URL to use HTTPS.
diff -Nru osmosis-0.46/debian/control osmosis-0.46/debian/control
--- osmosis-0.46/debian/control	2018-03-29 12:58:39.000000000 +0000
+++ osmosis-0.46/debian/control	2018-06-20 19:20:55.000000000 +0000
@@ -5,7 +5,8 @@
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               default-jdk-headless,
+               default-jdk,
+               default-jdk-doc,
                ant-optional,
                gradle-debian-helper,
                ivy,
@@ -32,9 +33,9 @@
                libxerces2-java,
                libxz-java,
                maven-repo-helper
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmosis.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmosis.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/osmosis
+Vcs-Git: https://salsa.debian.org/debian-gis-team/osmosis.git
 Homepage: https://wiki.openstreetmap.org/wiki/Osmosis
 
 Package: osmosis
@@ -70,4 +71,3 @@
     them to other databases and files.
   * Sort data contained in a file.
   * Extract data contained in a bounding box or in a polygon.
-
diff -Nru osmosis-0.46/debian/patches/example-shell-script-fails-syntax-check.patch osmosis-0.46/debian/patches/example-shell-script-fails-syntax-check.patch
--- osmosis-0.46/debian/patches/example-shell-script-fails-syntax-check.patch	1970-01-01 00:00:00.000000000 +0000
+++ osmosis-0.46/debian/patches/example-shell-script-fails-syntax-check.patch	2018-06-20 19:21:05.000000000 +0000
@@ -0,0 +1,78 @@
+Description: Fix `sh -n` syntax check failure.
+ Also fix typo and quoting issues.
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://github.com/openstreetmap/osmosis/pull/42
+
+--- a/package/script/munin/osm_replication_lag
++++ b/package/script/munin/osm_replication_lag
+@@ -1,35 +1,35 @@
+-#!/bin/sh
+-# -*- sh -*-
+-
+-# load the munin plugin helper
+-. $MUNIN_LIBDIR/plugins/plugin.sh
+-
+-# if no workingDirectory has been configures
+-if [ ! $workingDirectory ]; then
+-	# exit with an error
+-	echo "no workingDirectory configured" >&2
+-	exit 1
+-fi
+-
+-# path to osmosis binary
+-[ $osmosis ]  || osmosis="osmosis"
+-
+-# configuration section
+-if [ "$1" = "config" ]; then
+-
+-	echo 'graph_title OSM PostGIS Database Replag'
+-	echo 'graph_args --base 1000'
+-	echo 'graph_vlabel seconds behind main database'
+-	echo 'graph_category osm'
+-	
+-	echo 'lag.label replication lag'
+-	echo 'lag.draw LINE'
+-	
+-	exit 0
+-fi
+-
+-# invoke osmosis to calculate the replication lag
+-lag=$($osmosis --read-replication-lag workingDirectory="$workingDirectory" 2>/dev/null)
+-echo "lag.value $lag"
+-
+-exit 0
++#!/bin/sh
++# -*- sh -*-
++
++# load the munin plugin helper
++. "$MUNIN_LIBDIR/plugins/plugin.sh"
++
++# if no workingDirectory has been configured
++if [ ! "$workingDirectory" ]; then
++	# exit with an error
++	echo "no workingDirectory configured" >&2
++	exit 1
++fi
++
++# path to osmosis binary
++[ "$osmosis" ] || osmosis="osmosis"
++
++# configuration section
++if [ "$1" = "config" ]; then
++
++	echo 'graph_title OSM PostGIS Database Replag'
++	echo 'graph_args --base 1000'
++	echo 'graph_vlabel seconds behind main database'
++	echo 'graph_category osm'
++
++	echo 'lag.label replication lag'
++	echo 'lag.draw LINE'
++
++	exit 0
++fi
++
++# invoke osmosis to calculate the replication lag
++lag=$($osmosis --read-replication-lag workingDirectory="$workingDirectory" 2>/dev/null)
++echo "lag.value $lag"
++
++exit 0
diff -Nru osmosis-0.46/debian/patches/series osmosis-0.46/debian/patches/series
--- osmosis-0.46/debian/patches/series	2017-09-26 14:48:56.000000000 +0000
+++ osmosis-0.46/debian/patches/series	2018-06-20 19:20:55.000000000 +0000
@@ -1,3 +1,4 @@
 01-fix_launcher.patch
 02-fix_plexus.patch
 04-osmosis-version.patch
+example-shell-script-fails-syntax-check.patch
diff -Nru osmosis-0.46/debian/rules osmosis-0.46/debian/rules
--- osmosis-0.46/debian/rules	2017-09-26 14:52:13.000000000 +0000
+++ osmosis-0.46/debian/rules	2018-06-20 19:20:55.000000000 +0000
@@ -28,4 +28,3 @@
 
 override_dh_compress:
 	dh_compress -X.conf -X.sql
-
diff -Nru osmosis-0.46/debian/source/lintian-overrides osmosis-0.46/debian/source/lintian-overrides
--- osmosis-0.46/debian/source/lintian-overrides	2018-03-29 12:59:15.000000000 +0000
+++ osmosis-0.46/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# Package not officially migrated to Salsa yet.
-osmosis source: vcs-deprecated-in-debian-infrastructure * https://anonscm.debian.org/*
-