Emmanuel Bourg pushed to branch master at Debian Java Maintainers / apache-log4j1.2
Commits: b0f7c070 by Emmanuel Bourg at 2021-02-05T13:06:40+01:00 Standards-Version updated to 4.5.1 - - - - - f05f0b39 by Emmanuel Bourg at 2021-02-05T13:06:59+01:00 Switch to debhelper level 13 - - - - - 786f741d by Emmanuel Bourg at 2021-02-05T13:06:59+01:00 Removed debian/orig-tar.sh - - - - - db6e8a6b by Emmanuel Bourg at 2021-02-05T13:06:59+01:00 No longer build the examples to fix the build failure with OpenJDK 17 (Closes: #981854) - - - - - cf1271e4 by Emmanuel Bourg at 2021-02-05T13:07:59+01:00 Upload to unstable - - - - - 8 changed files: - debian/changelog - debian/control - debian/copyright - − debian/orig-tar.sh - + debian/patches/disable-examples.patch - debian/patches/series - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +apache-log4j1.2 (1.2.17-10) unstable; urgency=medium + + * No longer build the examples to fix the build failure with OpenJDK 17 + (Closes: #981854) + * Standards-Version updated to 4.5.1 + * Switch to debhelper level 13 + * Removed debian/orig-tar.sh + + -- Emmanuel Bourg <[email protected]> Fri, 05 Feb 2021 13:07:53 +0100 + apache-log4j1.2 (1.2.17-9) unstable; urgency=high * Team upload. ===================================== debian/control ===================================== @@ -11,12 +11,12 @@ Uploaders: Build-Depends: ant, bnd (>= 2.1.0), - debhelper-compat (= 12), + debhelper-compat (= 13), default-jdk, default-jdk-doc, libmail-java, maven-repo-helper -Standards-Version: 4.4.1 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/java-team/apache-log4j1.2.git Vcs-Browser: https://salsa.debian.org/java-team/apache-log4j1.2 Homepage: http://logging.apache.org/log4j/1.2/ ===================================== debian/copyright ===================================== @@ -1,6 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Apache Log4j Source: http://logging.apache.org/log4j/1.2/download.html +Files-Excluded: *.jar + site/* + *.dll Files: * Copyright: 1999-2007, The Apache Software Foundation ===================================== debian/orig-tar.sh deleted ===================================== @@ -1,22 +0,0 @@ -#!/bin/sh -e - -# called by uscan with '--upstream-version' <version> <file> -VERSION=$2 -ORIG_TAR=$3 -TAR=../apache-log4j1.2_$VERSION.orig.tar.gz -DIR=apache-log4j1.2-$VERSION.orig - -# clean up the upstream tarball -tar xvzf $ORIG_TAR -mv apache-log4j-$VERSION $DIR -GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude 'site' --exclude '*.dll' $DIR -rm -rf $DIR - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $3 $origDir - echo "moved $3 to $origDir" -fi - -exit 0 ===================================== debian/patches/disable-examples.patch ===================================== @@ -0,0 +1,15 @@ +Description: No longer build the examples to avoid an error with OpenJDK 17 +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/981854 +--- a/build.xml ++++ b/build.xml +@@ -222,7 +222,7 @@ + <property name="javac.fork" value="false"/> + </target> + +- <target name="build" depends="init, build.core, build.examples, build.xml, ++ <target name="build" depends="init, build.core, build.xml, + build.javamail, build.jms, build.jmx"/> + + <target name="build.core" depends="init"> ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ build_fix.patch remove-activation-framework-dependency.patch add-missing-classes.patch CVE-2019-17571.patch +disable-examples.patch ===================================== debian/rules ===================================== @@ -17,6 +17,3 @@ override_dh_auto_build: mv log4j.jar dist/lib/log4j-$(VERSION).jar rm dist/lib/log4j-*-sources.jar - -get-orig-source: - -uscan --download-current-version --force-download ===================================== debian/watch ===================================== @@ -1,2 +1,2 @@ -version=3 -http://archive.apache.org/dist/logging/log4j/(1.2.[\d]+)/log4j-(1.2.[\d]+).tar.gz debian debian/orig-tar.sh +version=4 +https://archive.apache.org/dist/logging/log4j/(1.2.[\d]+)/log4j-(1.2.[\d]+).tar.gz View it on GitLab: https://salsa.debian.org/java-team/apache-log4j1.2/-/compare/71d384d392f72f2eaaaf2e34441510c70f9e5bdd...cf1271e4e0546dbd64005c70397052548a4fa536 -- View it on GitLab: https://salsa.debian.org/java-team/apache-log4j1.2/-/compare/71d384d392f72f2eaaaf2e34441510c70f9e5bdd...cf1271e4e0546dbd64005c70397052548a4fa536 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
