This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository excalibur-logkit.
commit 0b62528a68f7d76d5bcfb962d64139f7bf13a63b
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Wed Oct 22 08:27:18 2014 +0000
Updated the dependency on the Servlet API (3.0 -> 3.1)
---
debian/changelog | 1 +
debian/control | 4 ++--
debian/patches/02_fix_build_xml.patch | 2 +-
debian/rules | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c12bd1..adb933d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
excalibur-logkit (2.0-11) UNRELEASED; urgency=medium
* debian/control:
+ - Updated the dependency on the Servlet API (3.0 -> 3.1)
- Updated standards version to 3.9.6 (no changes)
- Use canonical URLs for the Vcs-* fields
* Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index 2f6d50b..71b4310 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.or
Uploaders: Onkar Shinde <onkarshi...@ubuntu.com>, Emmanuel Bourg
<ebo...@apache.org>
Build-Depends: debhelper (>= 9), cdbs, javahelper, ant
Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, junit,
- libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java,
libservlet3.0-java,
- libgnumail-java-doc, liblog4j1.2-java-doc, libservlet3.0-java-doc,
maven-repo-helper
+ libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java,
libservlet3.1-java,
+ libgnumail-java-doc, liblog4j1.2-java-doc, libservlet3.1-java-doc,
maven-repo-helper
Standards-Version: 3.9.6
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/excalibur-logkit/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/excalibur-logkit/
diff --git a/debian/patches/02_fix_build_xml.patch
b/debian/patches/02_fix_build_xml.patch
index 6a7d806..9bd53ee 100644
--- a/debian/patches/02_fix_build_xml.patch
+++ b/debian/patches/02_fix_build_xml.patch
@@ -35,7 +35,7 @@ Author: Onkar Shinde <onshi...@ubuntu.com>
+ <link offline="true"
packagelistLoc="/usr/share/doc/default-jdk-doc/api/"
href="/usr/share/doc/default-jdk-doc/api/" />
+ <link offline="true"
packagelistLoc="/usr/share/doc/libgnumail-java/api/"
href="/usr/share/doc/libgnumail-java/api/" />
+ <link offline="true"
packagelistLoc="/usr/share/doc/liblog4j1.2-java/api/"
href="/usr/share/doc/liblog4j1.2-java/api/" />
-+ <link offline="true"
packagelistLoc="/usr/share/doc/libservlet3.0-java/api/"
href="/usr/share/doc/libservlet3.0-java/api/" />
++ <link offline="true"
packagelistLoc="/usr/share/doc/libservlet3.1-java/api/"
href="/usr/share/doc/libservlet3.1-java/api/" />
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
diff --git a/debian/rules b/debian/rules
index 74cc88c..89a2123 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-DEB_JARS := ant-junit geronimo-jms-1.1-spec gnumail.jar junit
log4j-1.2 servlet-api-3.0
+DEB_JARS := ant-junit geronimo-jms-1.1-spec gnumail.jar junit
log4j-1.2 servlet-api-3.1
DEB_ANT_BUILD_TARGET := dist
DEB_ANT_ARGS := -Dnoget=true -Dfinal.name=excalibur-logkit
-Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
-Dlibdir=/usr/share/java
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/excalibur-logkit.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
