[Git][debian-gis-team/osmosis][experimental] 5 commits: Simplify osmosis-version.sh.

[Bas Couwenberg (@sebastic)]

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


Commits:
f2de2e6a by Bas Couwenberg at 2023-11-10T17:20:43+01:00
Simplify osmosis-version.sh.

- - - - -
64f192c3 by Bas Couwenberg at 2023-11-10T17:22:20+01:00
Drop obsolete 04-osmosis-version.patch.

- - - - -
753f5764 by Bas Couwenberg at 2023-11-11T06:57:33+01:00
Update copyright file.

- - - - -
ed5836a4 by Bas Couwenberg at 2023-11-11T07:03:50+01:00
Various ShellCheck fixed for osmosis launcher.

- - - - -
aae04329 by Bas Couwenberg at 2023-11-11T07:11:28+01:00
Drop obsolete default-jdk-doc build dependency.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/osmosis.sh
- − debian/patches/04-osmosis-version.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+osmosis (0.49.1-1~exp2) UNRELEASED; urgency=medium
+
+  * Drop obsolete 04-osmosis-version.patch.
+  * Various ShellCheck fixed for osmosis launcher.
+  * Drop obsolete default-jdk-doc build dependency.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 10 Nov 2023 17:21:39 +0100
+
 osmosis (0.49.1-1~exp1) experimental; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -6,7 +6,6 @@ Section: utils
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                default-jdk,
-               default-jdk-doc,
                dh-exec,
                dh-sequence-maven-repo-helper,
                junit4 (>= 4.10),


=====================================
debian/copyright
=====================================
@@ -4,7 +4,7 @@ Upstream-Contact: Brett Henderson <brett at bretth.com>
 Source: https://github.com/openstreetmap/osmosis
 
 Files: *
-Copyright: © 2007-2008, Bretth Henderson <brett at bretth.com> and other contributors
+Copyright: 2007-2008, Bretth Henderson <brett at bretth.com> and other contributors
 License: public-domain
  Osmosis is placed into the public domain and where this is not legally
  possible everybody is granted a perpetual, irrevocable license to use
@@ -20,9 +20,9 @@ License: public-domain
  as a result of its use.
 
 Files: debian/*
-Copyright: © 2008-2009, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-           © 2009-2012, David Paleino <dapal at debian.org>
-License: GPL-3.0+
+Copyright: 2008-2009, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+           2009-2012, David Paleino <dapal at debian.org>
+License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
@@ -36,4 +36,3 @@ License: GPL-3.0+
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
-


=====================================
debian/osmosis.sh
=====================================
@@ -6,10 +6,12 @@
 # OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, typically used to add plugins or make quiet operation the default.
 
 if [ -f /etc/osmosis/osmosis.conf ] ; then
+  # shellcheck source=/dev/null
   . /etc/osmosis/osmosis.conf
 fi
 
 if [ -f "$HOME/.osmosis" ] ; then
+  # shellcheck source=/dev/null
   . "$HOME/.osmosis"
 fi
 
@@ -23,21 +25,21 @@ PRG="$0"
 
 # if started without absolute path, but from PATH environment
 if [ ! -s "$PRG" ] ; then
-    PRG=`which $PRG`
+  PRG=$(which "$PRG")
 fi
 
 # need this for relative symlinks
 while [ -h "$PRG" ] ; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
+  ls=$(ls -ld "$PRG")
+  link=$(expr "$ls" : '.*-> \(.*\)$')
   if expr "$link" : '/.*' > /dev/null; then
     PRG="$link"
   else
-    PRG="`dirname "$PRG"`/$link"
+    PRG="$(dirname "$PRG")/$link"
   fi
 done
 
-if [ "x$1x" = "xx" ] || echo "$@" | grep -q -e '--help' ; then
+if [ "$1" = "" ] || echo "$@" | grep -q -e '--help' ; then
 cat <<EOF
 osmosis
 


=====================================
debian/patches/04-osmosis-version.patch deleted
=====================================
@@ -1,20 +0,0 @@
-Description: Extract osmosis version from changelog instead of git.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/build.gradle
-+++ b/build.gradle
-@@ -25,7 +25,7 @@ subprojects {
- 
- 	// Load the project version dynamically from Git.  For release builds, don't add a suffix.
- 	def versionSuffix = "RELEASE".equals(osmosisBuildType) ? '' : '-' + osmosisBuildType
--	version = 'git describe --always --dirty'.execute().in.text.trim() + versionSuffix
-+	version = 'sh osmosis-version.sh'.execute().in.text.trim()
- 
- 	// Enable access to artefact dependency repositories.
- 	repositories {
---- /dev/null
-+++ b/osmosis-version.sh
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://'


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
-04-osmosis-version.patch
-mariadb.patch
 maven.patch
+mariadb.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/049fa5c9ece11cd699e5e8c80aa71384b8210045...aae04329058071276c51d414ae34097c68000878

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/049fa5c9ece11cd699e5e8c80aa71384b8210045...aae04329058071276c51d414ae34097c68000878
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/20231111/8c26cc0a/attachment-0001.htm>