This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-logging-java.
commit ea1e2a1c7388e139979d4c907de78d70f815483c Author: Emmanuel Bourg <[email protected]> Date: Sun Jul 13 23:36:26 2014 +0000 Build depend on libservlet3.1-java instead of libservlet3.0-java --- debian/changelog | 1 + debian/control | 2 +- debian/maven.rules | 4 ++-- debian/rules | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e9dae1..6855cae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libcommons-logging-java (1.2-1) UNRELEASED; urgency=medium * New upstream release. * Refreshed the patches * debian/control: + - Build depend on libservlet3.1-java instead of libservlet3.0-java - Standards-Version updated to 3.9.5 (no changes) - Use canonical URLs for the Vcs-* fields - Removed the suggested dependency on libservlet3.0-java diff --git a/debian/control b/debian/control index 744b6fb..f5e5dcb 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: junit, libcommons-parent-java, libexcalibur-logkit-java, liblog4j1.2-java, - libservlet3.0-java, + libservlet3.1-java, maven-repo-helper Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-logging-java diff --git a/debian/maven.rules b/debian/maven.rules index fbb22ce..362e41c 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,6 +1,6 @@ junit junit jar s/3\..*/3.x/ log4j log4j jar s/1\.2\..*/1.2.x/ -# force using servlet 3.0 -javax.servlet * * s/.*/3.0/ +# force using servlet 3.1 +javax.servlet * * s/.*/3.1/ s/avalon-framework/org.apache.avalon/ avalon-framework jar s/.*/debian/ diff --git a/debian/rules b/debian/rules index 3cb3d0e..1c9e140 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := dist -DEB_JARS := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.0 junit ant-junit +DEB_JARS := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.1 junit ant-junit makebuilddir/lib$(PACKAGE)-java:: # copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-logging-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
