[Git][java-team/javatools][master] 7 commits: Trimmed trailing spaces in debian/changelog
Emmanuel Bourg
gitlab at salsa.debian.org
Sat Jun 9 22:46:08 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / javatools
Commits:
0f49a285 by Emmanuel Bourg at 2018-06-09T14:12:24+02:00
Trimmed trailing spaces in debian/changelog
- - - - -
7fd48831 by Emmanuel Bourg at 2018-06-09T14:12:45+02:00
Standards-Version updated to 4.1.4
- - - - -
4d43108a by Emmanuel Bourg at 2018-06-09T14:12:54+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
390dfd43 by Emmanuel Bourg at 2018-06-09T14:14:23+02:00
jarwrapper: No longer use the d32/d64 options to detect the JVM data model (Closes: #893931)
- - - - -
24ecfef9 by Tiago Stürmer Daitx at 2018-06-09T23:22:51+02:00
jh_build: Do not set -source when --release (available on jdk9+) is set for either javac or javadoc (Closes: #895230)
- - - - -
73408a47 by Emmanuel Bourg at 2018-06-09T23:41:52+02:00
java-vars.mk: Fixed the JVM_CLIENT_DIR and JVM_SERVER_DIR variables to work with Java 9 and later (Closes: #896438)
- - - - -
b1fcd2c3 by Emmanuel Bourg at 2018-06-09T23:43:28+02:00
Upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/jarwrapper.install
- debian/rules
- jarwrapper
- java-vars.mk
- jh_build
- + src/main/java/org/debian/javatools/CheckProperty.java
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+javatools (0.64) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Emmanuel Bourg ]
+ * jarwrapper: No longer use the d32/d64 options to detect the JVM data model
+ (Closes: #893931)
+ * java-vars.mk: Fixed the JVM_CLIENT_DIR and JVM_SERVER_DIR variables to work
+ with Java 9 and later (Closes: #896438)
+ * Standards-Version updated to 4.1.4
+ * Use salsa.debian.org Vcs-* URLs
+
+ [ Tiago Stürmer Daitx ]
+ * jh_build: Do not set -source when --release (available on jdk9+) is set
+ for either javac or javadoc. (Closes: #895230)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 09 Jun 2018 23:42:10 +0200
+
javatools (0.63) unstable; urgency=medium
[ tony mancill ]
@@ -266,7 +284,7 @@ javatools (0.42) unstable; urgency=low
javatools (0.41) unstable; urgency=low
[ Sylvestre Ledru ]
- * jh_makepkg:
+ * jh_makepkg:
- Switch the OpenJDK6 path to the multiarch one.
- Remove the sun-java6 support since it has been
removed from the archive
@@ -466,7 +484,7 @@ javatools (0.32) unstable; urgency=low
/usr/share/java (Closes: #586783)
* jh_build will now -link any javadoc in a package that you build-depend
on
- * fix jh_build documentation
+ * fix jh_build documentation
-- Matthew Johnson <mjj29 at debian.org> Sun, 04 Jul 2010 10:04:17 +0000
@@ -515,19 +533,19 @@ javatools (0.29) unstable; urgency=low
* keep --version and jh_makepkg depends up to date with latest javahelper
version number
* Use default-jdk-doc instead of classpath-doc for javadoc
- * Fix jh_build --help
+ * Fix jh_build --help
* Fix passing of javadoc-opts to jh_build (Closes: #567880)
- * Change maintainers to pkg-java
+ * Change maintainers to pkg-java
* Add -t/--transitive flag to jh_linkjars (and fix obvious bug in it)
(Closes: #565728)
- * Add sparc64 architecture translator (Closes: #570501)
+ * Add sparc64 architecture translator (Closes: #570501)
-- Matthew Johnson <mjj29 at debian.org> Sat, 20 Feb 2010 13:08:24 +0000
javatools (0.28) unstable; urgency=low
* Reorder things in javahelper.pm and .mk to make jh_classpath and manifest
- work with jh_installlibs
+ work with jh_installlibs
* add various version mangling options to jh_installlibs
-- Matthew Johnson <mjj29 at debian.org> Wed, 20 Jan 2010 23:31:37 +0000
@@ -543,11 +561,11 @@ javatools (0.27) unstable; urgency=low
* Build javadoc by default in jh_build and don't pass -J in the .pm
(fails when you also pass other args via dh). Also, don't complain
at spurious args if we've detected running with dh.
- * Add jh_linkjars command to create/remove symlink farms from
- build-deps
- * Update tutorials
- * Make cdbs class call jh_clean
- * Ensure that cdbs class is included before ant.mk so that jh_linkjars
+ * Add jh_linkjars command to create/remove symlink farms from
+ build-deps
+ * Update tutorials
+ * Make cdbs class call jh_clean
+ * Ensure that cdbs class is included before ant.mk so that jh_linkjars
works
-- Matthew Johnson <mjj29 at debian.org> Sun, 17 Jan 2010 13:28:06 +0000
@@ -571,8 +589,8 @@ javatools (0.25) unstable; urgency=low
javatools (0.24) unstable; urgency=low
- * Add jh_installjavadoc and have jh_build create the javadoc
- * jh_makepkg depend on default-jdk not default-jdk-builddep
+ * Add jh_installjavadoc and have jh_build create the javadoc
+ * jh_makepkg depend on default-jdk not default-jdk-builddep
* jh_makepkg doesn't use dh_javadoc
-- Matthew Johnson <mjj29 at debian.org> Tue, 08 Dec 2009 23:27:16 +0000
@@ -586,24 +604,24 @@ javatools (0.23) unstable; urgency=low
which does not use make (runtime and build-time variants)
(Closes: #558109)
* Add a -X option to jh_depends to ignore certain packages for depends
- (Closes: #559303)
+ (Closes: #559303)
-- Matthew Johnson <mjj29 at debian.org> Sat, 05 Dec 2009 13:44:20 +0000
javatools (0.22) unstable; urgency=low
- * Fix typo in description
- * Add misc:Depends to java-propose-classpath
+ * Fix typo in description
+ * Add misc:Depends to java-propose-classpath
-- Matthew Johnson <mjj29 at debian.org> Thu, 13 Aug 2009 00:03:11 +0100
javatools (0.21) unstable; urgency=low
- * Fix bug in jh_manifest when manifest file doesn't exist
+ * Fix bug in jh_manifest when manifest file doesn't exist
* Treat DH_VERBOSE as a -v flag to all programs
- * Split java-propose-classpath off to a separate package to
+ * Split java-propose-classpath off to a separate package to
avoid a hard dependency on gcj
- * Add jh_classpath which isn't tied specifically to manifest files
+ * Add jh_classpath which isn't tied specifically to manifest files
* Fix jh_build not to require a JAVA_HOME if it's not actually trying to build
* Update jh_makepkg to produce dh 7 packages
* Fix bug in jh_depends which results in a jarwrapper dependency but no jvm
@@ -613,30 +631,30 @@ javatools (0.21) unstable; urgency=low
javatools (0.20) unstable; urgency=low
* Add dh 7 module from أحمد المحمودي (Closes: #536895)
- * Fix handling of jars which are symlinks not shipped in a deb
+ * Fix handling of jars which are symlinks not shipped in a deb
(eg alternatives) (Closes: #537057)
* Change java-propose-classpath to use jar xf not unzip and remove
- dependency on zip (Closes: #537059)
- * Fix handling of multiple Debian-java-home entries
- (patch from أحمد المحمودي) (Closes: #537074)
- * Fix jh_manifest reading of manifest lines with embedded line breaks
+ dependency on zip (Closes: #537059)
+ * Fix handling of multiple Debian-java-home entries
+ (patch from أحمد المحمودي) (Closes: #537074)
+ * Fix jh_manifest reading of manifest lines with embedded line breaks
and CRLF (patch from أحمد المحمودي) (Closes: #537241, #537262)
* Add jh_clean for use from dh helper
* Add option to use jh_build from debian/javabuild for use from dh helper
- * Fix jh_installlibs when the jar is not at the top level
- * Change this package to using dh 7
+ * Fix jh_installlibs when the jar is not at the top level
+ * Change this package to using dh 7
-- Matthew Johnson <mjj29 at debian.org> Sat, 18 Jul 2009 01:16:42 +0100
javatools (0.19) unstable; urgency=low
- * Remove depends on icepick, use ugly hexdump hack instead,
+ * Remove depends on icepick, use ugly hexdump hack instead,
since I don't want to depend on openjdk (Closes: #532122)
* Also, fix depends checking of packages with a Main-Class but
no Debian-Java-Home
- * Change to sections java/devel
+ * Change to sections java/devel
* Fix bashism in jarwrapper (Closes: #530110)
- * Have propose-classpath check that symlinks point to real
+ * Have propose-classpath check that symlinks point to real
files before reading them (Closes: #510590)
-- Matthew Johnson <mjj29 at debian.org> Sun, 07 Jun 2009 09:52:24 +0100
@@ -645,10 +663,10 @@ javatools (0.18) unstable; urgency=low
* Add cdbs class for javahelper
* Merge experimental class version checking
- * Remove depends from jarwrapper on a JRE, everything using
+ * Remove depends from jarwrapper on a JRE, everything using
jarwrapper will need a JRE anyway.
- * Move to section java
- * Bump standards version
+ * Move to section java
+ * Bump standards version
-- Matthew Johnson <mjj29 at debian.org> Sun, 22 Mar 2009 15:27:41 +0000
@@ -666,16 +684,16 @@ javatools (0.17.experimental1) experimental; urgency=low
javatools (0.17) unstable; urgency=medium
- * Remove build-arch-stamp and build-indep-stamp in all modes
- (Closes: #505066)
+ * Remove build-arch-stamp and build-indep-stamp in all modes
+ (Closes: #505066)
* More manifest entry handling fixes, including in jh_depends and
- some tests (Closes: #503890)
+ some tests (Closes: #503890)
-- Matthew Johnson <mjj29 at debian.org> Sun, 09 Nov 2008 22:05:34 +0000
javatools (0.16) unstable; urgency=medium
- * Don't append a space to manifest entries (Closes: #501516)
+ * Don't append a space to manifest entries (Closes: #501516)
-- Matthew Johnson <mjj29 at debian.org> Fri, 10 Oct 2008 21:00:09 +0000
@@ -687,7 +705,7 @@ javatools (0.15) unstable; urgency=medium
javatools (0.14) unstable; urgency=low
- * Change openjdk dependency to be openjdk-6-jre, package name was wrong!
+ * Change openjdk dependency to be openjdk-6-jre, package name was wrong!
-- Matthew Johnson <mjj29 at debian.org> Mon, 21 Jul 2008 11:31:29 +0100
@@ -702,7 +720,7 @@ javatools (0.13) unstable; urgency=low
javatools (0.12) unstable; urgency=low
- * Use openjdk instead of icedtea
+ * Use openjdk instead of icedtea
* jh_build needs to expand directory arguments to files because Sun Java
does not support it. Also add better error handling for missing
parameters.
@@ -717,7 +735,7 @@ javatools (0.11) unstable; urgency=low
javatools (0.10) unstable; urgency=low
- * Update to default-jdk/jre packages and default-java path
+ * Update to default-jdk/jre packages and default-java path
-- Matthew Johnson <mjj29 at debian.org> Sat, 26 Apr 2008 12:54:10 +0100
@@ -735,14 +753,14 @@ javatools (0.9) unstable; urgency=low
javatools (0.8) unstable; urgency=low
* Fix bug in jh_manifest when passing multiple jars on the commandline
- * Fix bug in jh_depends creating multiple identical dependencies
+ * Fix bug in jh_depends creating multiple identical dependencies
* depend on realpath
-- Matthew Johnson <mjj29 at debian.org> Wed, 26 Mar 2008 01:17:36 +0000
javatools (0.7) unstable; urgency=low
- * Calls dh_testdir in places, therefore, must depend on debhelper!
+ * Calls dh_testdir in places, therefore, must depend on debhelper!
* Bump Standards-Version
-- Matthew Johnson <mjj29 at debian.org> Wed, 06 Feb 2008 16:16:12 +0000
@@ -757,14 +775,14 @@ javatools (0.6) unstable; urgency=low
* Add maven2 to build systems in jh_makepkg (needs testing)
* Allow multiple entries in Debian-Java-Home
* Use unversioned jcf-dump
- * java-propose-classpath can take class names as parameters
+ * java-propose-classpath can take class names as parameters
-- Matthew Johnson <mjj29 at debian.org> Fri, 01 Feb 2008 12:25:17 +0000
javatools (0.5) unstable; urgency=low
* Rename source package, add build-helper binary package
- * Add help2man manpages
+ * Add help2man manpages
-- Matthew Johnson <mjj29 at debian.org> Sun, 13 Jan 2008 17:43:00 +0000
@@ -778,13 +796,13 @@ jarwrapper (0.4) unstable; urgency=low
jarwrapper (0.3) unstable; urgency=low
* Depend on fastjar for detector (Closes: #442911)
- * Change maintainer address
+ * Change maintainer address
-- Matthew Johnson <mjj29 at debian.org> Wed, 05 Dec 2007 10:23:36 +0000
jarwrapper (0.2) unstable; urgency=low
- * Remove bashisms
+ * Remove bashisms
-- Matthew Johnson <debian at matthew.ath.cx> Mon, 20 Aug 2007 23:35:47 +0100
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends:
libtest-strict-perl,
markdown,
perl
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/javatools.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/javatools.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/javatools.git
+Vcs-Browser: https://salsa.debian.org/java-team/javatools
Package: jarwrapper
Architecture: all
=====================================
debian/jarwrapper.install
=====================================
--- a/debian/jarwrapper.install
+++ b/debian/jarwrapper.install
@@ -2,3 +2,4 @@ jardetector /usr/bin
jarwrapper /usr/bin
jarwrapper-binfmt/jarwrapper /usr/share/binfmts
java-arch.sh /usr/share/jarwrapper
+target/javatools.jar /usr/share/java
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ jh_lib.sh: jh_lib.sh.in
sed 's,%JAVATOOLS_VERSION%,${VERSION},' < $< > $@
override_dh_auto_build: jh_lib.sh
+ mkdir -p target/classes
+ javac -d target/classes src/main/java/org/debian/javatools/CheckProperty.java
+ jar -cvf target/javatools.jar -C target/classes/ .
+
mkdir tmp tmp.jarwrapper
# javahelper pod-based manpages
$(POD2MAN) jh_installeclipse tmp/jh_installeclipse.1
@@ -40,4 +44,4 @@ override_dh_auto_test: runtests
override_dh_auto_clean:
rm -f jh_lib.sh tutorial.html
- rm -fr tmp tmp.jarwrapper
+ rm -fr tmp tmp.jarwrapper target
=====================================
jarwrapper
=====================================
--- a/jarwrapper
+++ b/jarwrapper
@@ -38,7 +38,7 @@ MULTIARCH_LIBRARY_PATH_32BIT="/usr/lib/jni:/usr/lib/arm-linux-gnueabi/jni:/usr/l
MULTIARCH_LIBRARY_PATH_64BIT="/usr/lib/jni:/usr/lib/alpha-linux-gnu/jni:/usr/lib/x86_64-linux-gnu/jni:/usr/lib/aarch64-linux-gnu/jni:/usr/lib/x86_64-kfreebsd-gnu/jni:/usr/lib/powerpc64-linux-gnu/jni:/usr/lib/powerpc64le-linux-gnu/jni:/usr/lib/s390x-linux-gnu/jni:/usr/lib/sparc64-linux-gnu/jni"
if which "$JAVA" >/dev/null 2>&1; then
- if java -d32 2>&1 | grep "does not support" > /dev/null; then
+ if java -cp /usr/share/java/javatools.jar org.debian.javatools.CheckProperty sun.arch.data.model 64 > /dev/null; then
# 64bit
export LD_LIBRARY_PATH=$MULTIARCH_LIBRARY_PATH_64BIT
exec $JAVA $JAVAOPTS -Djava.library.path=$MULTIARCH_LIBRARY_PATH_64BIT -jar "$JAR" "$@"
=====================================
java-vars.mk
=====================================
--- a/java-vars.mk
+++ b/java-vars.mk
@@ -1,6 +1,6 @@
# Define useful Java-related variables. May be overridden by the package.
-# In particular, JAVA_HOME should be overridden before including this file,
-# so that it can give JRE_HOME and the CLIENT/SERVER dirs relative to the
+# In particular, JAVA_HOME should be overridden before including this file,
+# so that it can give JRE_HOME and the CLIENT/SERVER dirs relative to the
# correct JAVA_HOME
#
@@ -16,12 +16,12 @@ JAVA_ARCH=$(shell /usr/share/javahelper/java-arch.sh $(DPKG_ARCH))
JRE_HOME=$(shell if [ -d $(JAVA_HOME)/jre ]; then echo $(JAVA_HOME)/jre; else echo $(JAVA_HOME); fi )
# may or may not be set, depends if the JVM ships a server VM or not
-JVM_CLIENT_DIR=$(shell if [ -d $(JRE_HOME)/lib/$(JAVA_ARCH)/client ]; then echo $(JRE_HOME)/lib/$(JAVA_ARCH)/client; fi )
-JVM_SERVER_DIR=$(shell if [ -d $(JRE_HOME)/lib/$(JAVA_ARCH)/server ]; then echo $(JRE_HOME)/lib/$(JAVA_ARCH)/server; fi )
+JVM_CLIENT_DIR=$(shell if [ -d $(JRE_HOME)/lib/$(JAVA_ARCH)/client ]; then echo $(JRE_HOME)/lib/$(JAVA_ARCH)/client; else if [ -d $(JRE_HOME)/lib/client ]; then echo $(JRE_HOME)/lib/client; fi; fi )
+JVM_SERVER_DIR=$(shell if [ -d $(JRE_HOME)/lib/$(JAVA_ARCH)/server ]; then echo $(JRE_HOME)/lib/$(JAVA_ARCH)/server; else if [ -d $(JRE_HOME)/lib/server ]; then echo $(JRE_HOME)/lib/server; fi; fi )
#print-vars:
-# @echo $(JAVA_HOME)
-# @echo $(JAVA_ARCH)
-# @echo $(JRE_HOME)
-# @echo $(JVM_CLIENT_DIR)
-# @echo $(JVM_SERVER_DIR)
+# @echo "JAVA_HOME : $(JAVA_HOME)"
+# @echo "JAVA_ARCH : $(JAVA_ARCH)"
+# @echo "JRE_HOME : $(JRE_HOME)"
+# @echo "JVM_CLIENT_DIR : $(JVM_CLIENT_DIR)"
+# @echo "JVM_SERVER_DIR : $(JVM_SERVER_DIR)"
=====================================
jh_build
=====================================
--- a/jh_build
+++ b/jh_build
@@ -54,16 +54,20 @@ if ! grep -- -encoding <<< "$JH_JAVAC_OPTS" &>/dev/null; then
JH_JAVAC_OPTS="-encoding ISO8859-1 $JH_JAVAC_OPTS"
fi
-if ! grep -- -source <<< "$JH_JAVAC_OPTS" &>/dev/null; then
- if ! grep -- -target <<< "$JH_JAVAC_OPTS" &>/dev/null; then
- JH_JAVAC_OPTS="-source 1.7 -target 1.7 $JH_JAVAC_OPTS"
- else
- JH_JAVAC_OPTS="-source 1.7 $JH_JAVAC_OPTS"
+if ! grep -- --release <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+ if ! grep -- -source <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+ if ! grep -- -target <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+ JH_JAVAC_OPTS="-source 1.7 -target 1.7 $JH_JAVAC_OPTS"
+ else
+ JH_JAVAC_OPTS="-source 1.7 $JH_JAVAC_OPTS"
+ fi
fi
fi
-if ! grep -- -source <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
+if ! grep -- --release <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+ if ! grep -- -source <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
JH_JAVADOC_OPTS="-source 1.7 $JH_JAVADOC_OPTS"
+ fi
fi
if ! grep -- -notimestamp <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
=====================================
src/main/java/org/debian/javatools/CheckProperty.java
=====================================
--- /dev/null
+++ b/src/main/java/org/debian/javatools/CheckProperty.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2018 Emmanuel Bourg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.debian.javatools;
+
+/**
+ * Check the value of a system property from the command line.
+ *
+ * Syntax:
+ *
+ * java org.debian.javatools.CheckProperty <propertyName> <expectedValue>
+ *
+ * The program exits with the status code 0 if the actual value matches, and 1 otherwise.
+ */
+public class CheckProperty {
+
+ public static void main(String[] args) throws Exception {
+ String propertyName = args[0];
+ String expectedValue = args[1];
+ String actualValue = System.getProperty(propertyName);
+
+ if (expectedValue.equals(actualValue)) {
+ System.out.println("OK: " + propertyName + " = " + actualValue);
+ System.exit(0);
+ } else {
+ System.out.println("FAILED: " + propertyName + " = " + actualValue);
+ System.exit(1);
+ }
+ }
+}
View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/d1ca56c9de9bf095dc69a7d98173752e43c45f8f...b1fcd2c32b1be9d5c2ec69abce548a9f15dde1d0
--
View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/d1ca56c9de9bf095dc69a7d98173752e43c45f8f...b1fcd2c32b1be9d5c2ec69abce548a9f15dde1d0
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/20180609/23a9e855/attachment.html>
More information about the pkg-java-commits
mailing list