[Git][debian-gis-team/osmosis][master] 3 commits: Build depend on default-jdk & default-jdk-doc.

[Bas Couwenberg]

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


Commits:
9b2b2f32 by Bas Couwenberg at 2018-06-20T21:08:17+02:00
Build depend on default-jdk & default-jdk-doc.

Fixes FTBFS:

 javadoc: error - Error fetching URL: file:/usr/share/doc/default-jdk/api/

- - - - -
e3ed076e by Bas Couwenberg at 2018-06-20T21:21:10+02:00
Add patch to fix example-shell-script-fails-syntax-check issue.

- - - - -
ebf3a0d5 by Bas Couwenberg at 2018-06-20T21:21:21+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/example-shell-script-fails-syntax-check.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-osmosis (0.46-4) UNRELEASED; urgency=medium
+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 at debian.org>  Sat, 31 Mar 2018 12:38:21 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 20 Jun 2018 21:21:12 +0200
 
 osmosis (0.46-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Uploaders: David Paleino <dapal at debian.org>,
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               default-jdk-headless,
+               default-jdk,
+               default-jdk-doc,
                ant-optional,
                gradle-debian-helper,
                ivy,


=====================================
debian/patches/example-shell-script-fails-syntax-check.patch
=====================================
--- /dev/null
+++ b/debian/patches/example-shell-script-fails-syntax-check.patch
@@ -0,0 +1,78 @@
+Description: Fix `sh -n` syntax check failure.
+ Also fix typo and quoting issues.
+Author: Bas Couwenberg <sebastic at 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


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-fix_launcher.patch
 02-fix_plexus.patch
 04-osmosis-version.patch
+example-shell-script-fails-syntax-check.patch



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/compare/c754af6012d0a5c4b81b53163ecc3eb1b4129aa2...ebf3a0d552074743184ab68cbdca40dc6e45f3b2
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/20180620/8f442f2b/attachment-0001.html>