This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository apache-log4j1.2.
commit 88111fff933d6c9e7ea5c9e21a53504b0d494ce5 Author: Emmanuel Bourg <[email protected]> Date: Thu May 16 12:50:01 2013 +0000 Removed the dependency on the Activation Framework (libgnujaf-java) --- debian/changelog | 7 +++++ debian/control | 2 +- .../remove-activation-framework-dependency.patch | 30 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 7 +++-- 5 files changed, 44 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8cebda..669cb8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apache-log4j1.2 (1.2.17-3) unstable; urgency=low + + * Removed the dependency on the Activation Framework (libgnujaf-java) + * debian/rules: Improved the clean target + + -- Emmanuel Bourg <[email protected]> Thu, 16 May 2013 14:46:43 +0200 + apache-log4j1.2 (1.2.17-2) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index aa62b6f..8114408 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Varun Hiremath <[email protected]>, Ludovic Claude <[email protected]>, Jakub Adam <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, libgnujaf-java, +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, libgnumail-java, maven-repo-helper, default-jdk-doc, libjboss-jmx-java, bnd Standards-Version: 3.9.4 Homepage: http://logging.apache.org/log4j/1.2/ diff --git a/debian/patches/remove-activation-framework-dependency.patch b/debian/patches/remove-activation-framework-dependency.patch new file mode 100644 index 0000000..e8ac569 --- /dev/null +++ b/debian/patches/remove-activation-framework-dependency.patch @@ -0,0 +1,30 @@ +Description: Remove the dependency on the Activation Framework (integrated to Java 6 and later) +Author: Emmanuel Bourg +--- a/build.xml ++++ b/build.xml +@@ -118,7 +118,6 @@ + <path id="compile.classpath"> + <pathelement location="${build.home}/classes"/> + <pathelement location="${javamail.jar}"/> +- <pathelement location="${activation.jar}"/> + <pathelement location="${jaxp.jaxp.jar}"/> + <pathelement location="${jms.jar}"/> + <pathelement location="${jmx.jar}"/> +--- a/tests/build.xml ++++ b/tests/build.xml +@@ -35,7 +35,6 @@ + <property name="checkstyle.version" value="4.1"/> + <property name="checkstyle.jar" location="${m2_repo}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}.jar"/> + <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4.3/mail-1.4.3.jar"/> +- <property name="activation.jar" location="${m2_repo}/javax/activation/activation/1.1/activation-1.1.jar"/> + <property name="junit.version" value="3.8.1"/> + <property name="junit.jar" location="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/> + +@@ -70,7 +69,6 @@ + <pathelement location="${clover.jar}"/> + <pathelement location="${junit.jar}"/> + <pathelement location="${javamail.jar}"/> +- <pathelement location="${activation.jar}"/> + <pathelement path="${java.class.path}"/> + </path> + diff --git a/debian/patches/series b/debian/patches/series index e83cfa1..ce7af09 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ build_fix.patch +remove-activation-framework-dependency.patch diff --git a/debian/rules b/debian/rules index 1c4ccb4..3b3b332 100755 --- a/debian/rules +++ b/debian/rules @@ -7,19 +7,22 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant -DEB_JARS := gnumail activation +DEB_JARS := gnumail DEB_ANT_BUILD_TARGET := jar javadoc DEB_ANT_ARGS := -Dversion=$(VERSION) clean:: -$(RM) -r docs -rm -rf debian/tmp + rm -Rf debian/liblog4j-1.2-java-doc/* + rm -Rf debian/log4j-${VERSION}.bar + mh_clean common-build-indep:: cat debian/log4j.bnd | sed s/VERSION/$(VERSION)/ > debian/.log4j-versioned.bnd java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd \ - -classpath /usr/share/java/jboss-jmx.jar,/usr/share/java/gnumail.jar,/usr/share/java/activation.jar \ + -classpath /usr/share/java/jboss-jmx.jar,/usr/share/java/gnumail.jar \ -output log4j.jar dist/lib/log4j-$(VERSION).jar rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar mv log4j.jar dist/lib/log4j-$(VERSION).jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j1.2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
