Pierre Gruet pushed to branch master at Debian Java Maintainers / eigenbase-resgen
Commits: 689d234a by Pierre Gruet at 2025-01-22T22:06:34+01:00 Adding a Lintian override for embedded JS - - - - - 875db443 by Pierre Gruet at 2025-01-22T22:07:00+01:00 Setting the classpath for the build in build.xml - - - - - 52b5a75a by Pierre Gruet at 2025-01-22T22:07:35+01:00 Using a lighter d/rules with no classpath variables and a simple ant invocation - - - - - 44f5b25b by Pierre Gruet at 2025-01-22T22:07:55+01:00 Defining the classpath of the built jars using javahelper - - - - - c515ecc5 by Pierre Gruet at 2025-01-22T22:08:29+01:00 Marking the -doc package as Multi-Arch: foreign - - - - - 042184ae by Pierre Gruet at 2025-01-22T22:08:50+01:00 Build-depending on the headless JDK only - - - - - 1a589719 by Pierre Gruet at 2025-01-22T22:09:40+01:00 Using the java:Depends substvar for the dependencies - - - - - b950f8d6 by Pierre Gruet at 2025-01-22T22:09:49+01:00 R-R-R: no - - - - - 5fd9fd69 by Pierre Gruet at 2025-01-22T22:10:53+01:00 Upload to unstable - - - - - 7 changed files: - debian/changelog - debian/control - + debian/libeigenbase-resgen-java-doc.lintian-overrides - + debian/libeigenbase-resgen-java.classpath - + debian/patches/classpath.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,17 @@ +eigenbase-resgen (1.3.0.13768-6) unstable; urgency=medium + + * Team upload + * Setting the classpath for the build in build.xml instead of debian/rules + * Setting Rules-Requires-Root: no + * Using a lighter d/rules with a simple ant invocation + * Defining the classpath of the built jars using javahelper + * Build-depending on the headless JDK only + * Using the java:Depends substvar for the dependencies + * Marking the -doc package as Multi-Arch: foreign + * Adding a Lintian override for embedded JS + + -- Pierre Gruet <[email protected]> Wed, 22 Jan 2025 22:09:54 +0100 + eigenbase-resgen (1.3.0.13768-5) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -5,7 +5,7 @@ Section: java Priority: optional Build-Depends: ant, debhelper-compat (= 13), - default-jdk, + default-jdk-headless, javahelper, junit, junit-doc, @@ -16,10 +16,11 @@ Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/java-team/eigenbase-resgen Vcs-Git: https://salsa.debian.org/java-team/eigenbase-resgen.git Homepage: https://eigenbase.sourceforge.net/resgen/ +Rules-Requires-Root: no Package: libeigenbase-resgen-java Architecture: all -Depends: libxerces2-java, +Depends: ${java:Depends}, ${misc:Depends} Description: Java i18n code generator from XML files Eigenbase Resource Generator helps you build and maintain internationalized @@ -32,6 +33,7 @@ Description: Java i18n code generator from XML files Package: libeigenbase-resgen-java-doc Architecture: all Section: doc +Multi-Arch: foreign Depends: ${misc:Depends} Recommends: default-jdk-doc, junit-doc ===================================== debian/libeigenbase-resgen-java-doc.lintian-overrides ===================================== @@ -0,0 +1,4 @@ +# It would be too complicated to remove the javascript that is included in +# javadocs, see the discussion on Debian Java mailing list starting at +# https://lists.debian.org/debian-java/2018/06/msg00020.html. +embedded-javascript-library please use libjs-jquery* [usr/share/doc/libeigenbase-resgen-java/api/script-dir/jquery*.min.*s] ===================================== debian/libeigenbase-resgen-java.classpath ===================================== @@ -0,0 +1 @@ +usr/share/java/eigenbase-xom.jar /usr/share/java/xercesImpl.jar ===================================== debian/patches/classpath.patch ===================================== @@ -0,0 +1,25 @@ +Description: specifying the classpath in the build.xml file for the Debian + build +Author: Pierre Gruet <[email protected]> +Forwarded: not-needed +Last-Update: 2025-01-22 + +--- a/build.xml ++++ b/build.xml +@@ -35,13 +35,13 @@ + + <path id="project.classpath"> + <pathelement location="${classes.dir}"/> +- <pathelement location="${lib.dir}/junit.jar"/> ++ <pathelement location="/usr/share/java/junit.jar"/> + </path> + + <path id="project.boot.classpath"> + <path refid="project.classpath"/> +- <pathelement location="${resgen.jar.file}"/> +- <pathelement location="${xom.jar.file}"/> ++ <pathelement location="/usr/share/java/eigenbase-xom.jar"/> ++ <pathelement location="/usr/share/java/xercesImpl.jar"/> + </path> + + <taskdef name="xomgen" classname="org.eigenbase.xom.XOMGenTask"> ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ javadoc.diff default-comment-style.diff remove-timestamps.patch +classpath.patch ===================================== debian/rules ===================================== @@ -1,18 +1,7 @@ #!/usr/bin/make -f -JAVA_HOME := /usr/lib/jvm/default-java - -DEB_JARS := xercesImpl junit eigenbase-resgen eigenbase-xom - -CLASSPATH = /usr/share/ant/lib/ant.jar::/usr/share/ant/lib/ant-launcher.jar:$(shell for jar in $(DEB_JARS:%=/usr/share/java/%.jar); do \ - echo -n $${jar}:; done; \ - echo -n $(JAVA_HOME)/lib/tools.jar) - %: dh $@ --with maven-repo-helper --with javahelper -override_dh_auto_clean: - mh_clean - override_dh_auto_build: - /usr/lib/jvm/default-java/bin/java -classpath $(CLASSPATH) -Dant.home=/usr/share/ant org.apache.tools.ant.Main -Dcompile.debug=true -Dcompile.optimize=true cleanBuild + ant -Dcompile.debug=true -Dcompile.optimize=true cleanBuild View it on GitLab: https://salsa.debian.org/java-team/eigenbase-resgen/-/compare/e06ebb0ae6312652887ab2cebf310238deba4cbe...5fd9fd694ba38d57013a9212c294a3c5a6d8dd8a -- View it on GitLab: https://salsa.debian.org/java-team/eigenbase-resgen/-/compare/e06ebb0ae6312652887ab2cebf310238deba4cbe...5fd9fd694ba38d57013a9212c294a3c5a6d8dd8a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
