[Git][debian-gis-team/osmosis][bookworm-backports] 4 commits: Add autopkgtest to verify PBF to XML conversion.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch bookworm-backports at Debian GIS Project / osmosis


Commits:
e43ba088 by Bas Couwenberg at 2023-12-03T12:59:45+01:00
Add autopkgtest to verify PBF to XML conversion.

- - - - -
8f658ede by Bas Couwenberg at 2023-12-08T17:22:10+01:00
Fix plexus configuration.

- - - - -
34204374 by Bas Couwenberg at 2023-12-08T17:22:47+01:00
Set distribution to unstable.

- - - - -
4d709971 by Bas Couwenberg at 2023-12-11T08:12:02+01:00
Rebuild for bookworm-backports.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/plexus.conf
- + debian/tests/control
- + debian/tests/pbf2osm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+osmosis (0.49.2-2~bpo12+1) bookworm-backports; urgency=medium
+
+  * Rebuild for bookworm-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 11 Dec 2023 08:11:57 +0100
+
+osmosis (0.49.2-2) unstable; urgency=medium
+
+  * Add autopkgtest to verify PBF to XML conversion.
+  * Fix plexus configuration.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Dec 2023 17:22:12 +0100
+
 osmosis (0.49.2-1~bpo12+1) bookworm-backports; urgency=medium
 
   * Rebuild for bookworm-backports.


=====================================
debian/control
=====================================
@@ -37,7 +37,12 @@ Rules-Requires-Root: no
 Package: osmosis
 Architecture: all
 Depends: default-jre-headless | java17-runtime-headless,
+         libcommons-logging-java,
+         libcommons-pool-java,
          libplexus-classworlds-java,
+         libspring-beans-java,
+         libspring-core-java,
+         libspring-transaction-java,
          ${maven:Depends},
          ${misc:Depends}
 Description: Command line OpenStreetMap data processor


=====================================
debian/plexus.conf
=====================================
@@ -6,6 +6,8 @@ load /usr/share/java/commons-compress.jar
 load /usr/share/java/commons-csv.jar
 load /usr/share/java/commons-dbcp.jar
 load /usr/share/java/commons-io.jar
+load /usr/share/java/commons-logging.jar
+load /usr/share/java/commons-pool.jar
 load /usr/share/java/guava.jar
 load /usr/share/java/jpf.jar
 load /usr/share/java/mariadb-java-client.jar
@@ -13,5 +15,8 @@ load /usr/share/java/osmpbf.jar
 load /usr/share/java/postgis-jdbc.jar
 load /usr/share/java/postgresql.jar
 load /usr/share/java/protobuf.jar
+load /usr/share/java/spring3-beans.jar
+load /usr/share/java/spring3-core.jar
 load /usr/share/java/spring3-jdbc.jar
+load /usr/share/java/spring3-transaction.jar
 load /usr/share/osmosis/*.jar


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,6 @@
+Tests: pbf2osm
+Depends: ca-certificates,
+         diffutils,
+         osmosis,
+         wget
+Restrictions: needs-internet, allow-stderr


=====================================
debian/tests/pbf2osm
=====================================
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+PBF_URL="https://download.geofabrik.de/europe/monaco-latest.osm.pbf"
+PBF_FILE="monaco-latest.osm.pbf"
+XML_FILE="monaco-latest.osm"
+PBF_REPORT="pbf-report.txt"
+XML_REPORT="xml-report.txt"
+
+TEMPDIR="$(mktemp -d)"
+
+cd "${TEMPDIR}" || exit 1
+
+echo "Downloading PBF file"
+wget -q "${PBF_URL}" -O "${PBF_FILE}"
+RC=$?
+
+if [ "${RC}" -ne 0 ]; then
+    cd "${OLDPWD}" || exit 1
+    rm -rf "${TEMPDIR}"
+
+    exit "${RC}"
+fi
+
+echo
+echo "Converting PBF to XML"
+osmosis --read-pbf file="${PBF_FILE}" --write-xml file="${XML_FILE}"
+RC=$?
+
+if [ "${RC}" -ne 0 ]; then
+    cd "${OLDPWD}" || exit 1
+    rm -rf "${TEMPDIR}"
+
+    exit "${RC}"
+fi
+
+echo
+echo "Generating PBF report"
+osmosis --read-pbf file="${PBF_FILE}" --report-entity file="${PBF_REPORT}"
+RC=$?
+
+if [ "${RC}" -ne 0 ]; then
+    cd "${OLDPWD}" || exit 1
+    rm -rf "${TEMPDIR}"
+
+    exit "${RC}"
+fi
+
+echo
+echo "Generating XML report"
+osmosis --read-xml file="${XML_FILE}" --report-entity file="${XML_REPORT}"
+RC=$?
+
+if [ "${RC}" -ne 0 ]; then
+    cd "${OLDPWD}" || exit 1
+    rm -rf "${TEMPDIR}"
+
+    exit "${RC}"
+fi
+
+echo
+echo "Comparing PBF and XML reports"
+diff -u "${PBF_REPORT}" "${XML_REPORT}"
+RC=$?
+
+if [ "${RC}" -ne 0 ]; then
+    cd "${OLDPWD}" || exit 1
+    rm -rf "${TEMPDIR}"
+
+    exit "${RC}"
+fi
+
+cd "${OLDPWD}" || exit 1
+rm -rf "${TEMPDIR}"
+
+exit "${RC}"



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/fc1ed902c3982a8123e689ff28d8ee8d0f2e6530...4d7099713ce04e0cceb1552e70715c7af99f47f3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/fc1ed902c3982a8123e689ff28d8ee8d0f2e6530...4d7099713ce04e0cceb1552e70715c7af99f47f3
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/20231211/85bf6e83/attachment-0001.htm>