[Git][java-team/java-common][master] 4 commits: Correct update-java-alternatives return code (Closes: #1017922)

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / java-common


Commits:
74a932fd by tony mancill at 2023-09-05T20:22:35-07:00
Correct update-java-alternatives return code (Closes: #1017922)

- - - - -
71e5cc9d by tony mancill at 2023-09-05T20:44:00-07:00
No longer call do_auto during do_set (Closes: #829008)

- - - - -
6cb81bbf by tony mancill at 2023-09-05T20:44:13-07:00
Freshen years in debian/copyright

- - - - -
cff0f68a by tony mancill at 2023-09-06T07:47:06-07:00
interim debian/changelog

- - - - -


3 changed files:

- debian/changelog
- debian/copyright
- scripts/update-java-alternatives


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+java-common (0.75) UNRELEASED; urgency=medium
+
+  * Team upload.
+
+  [ tony mancill ]
+  * Correct update-java-alternatives return code (Closes: #1017922)
+  * No longer call do_auto during do_set (Closes: #829008)
+  * Freshen years in debian/copyright
+
+ -- tony mancill <tmancill at debian.org>  Tue, 05 Sep 2023 20:24:46 -0700
+
 java-common (0.74) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/copyright
=====================================
@@ -8,11 +8,12 @@ Copyright: 2000, Stephane Bortzmeyer <bortzmeyer at debian.org>
            2003, Stefan Gybas <sgybas at debian.org>
            2005, Arnaud Vandyck <avdyk at debian.org>
            2006-2008, Michael Koch <konqueror at gmx.de>
-           2006-2016, Matthias Klose <doko at debian.org>
+           2006-2023, Matthias Klose <doko at debian.org>
            2009, Torsten Werner <twerner at debian.org>
            2010, Niels Thykier <niels at thykier.net>
            2011-2013, Sylvestre Ledru <sylvestre at debian.org>
-           2014-2017, Emmanuel Bourg <ebourg at apache.org>
+           2014-2023, Emmanuel Bourg <ebourg at apache.org>
+           2013-2023, tony mancill <tmancill at debian.org>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by


=====================================
scripts/update-java-alternatives
=====================================
@@ -101,7 +101,7 @@ fi
 
 vecho()
 {
-    [ -z "$verbose" ]  || echo >&2 "$@"
+    [ -z "$verbose" ] || echo >&2 "$@"
 }
 
 jinfo_files=
@@ -124,14 +124,12 @@ do_list()
 	alias=${alias#.}
 	prio=$(awk -F= '/priority=/ {print $2}' $i)
 	printf "%-30s %-10s %s\n" $alias "$prio " $top/$alias
-	[ -n "$verbose" ] && egrep "$which" $i
+	[ -n "$verbose" ] && egrep "$which" $i || true
     done
 }
 
 do_set()
 {
-    do_auto
-
     awk "/$which/ {print}" $jinfo | sort -u \
 	| \
     while read type name location; do



View it on GitLab: https://salsa.debian.org/java-team/java-common/-/compare/e784ba7711380600b6a2a54632dcb899faad88f5...cff0f68ab1a12974cce3a4e3363947736a346634

-- 
View it on GitLab: https://salsa.debian.org/java-team/java-common/-/compare/e784ba7711380600b6a2a54632dcb899faad88f5...cff0f68ab1a12974cce3a4e3363947736a346634
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-java-commits/attachments/20230906/4b496500/attachment.htm>