[cdi-api] 01/06: Build depend on libservlet3.1-java instead of libservlet2.5-jav

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Sep 9 11:18:12 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository cdi-api.

commit 1499a29976e5c158862733d3f3da1a05f980d1ad
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 9 12:47:46 2014 +0200

    Build depend on libservlet3.1-java instead of libservlet2.5-jav
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4f35ab..7a37bd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cdi-api (1.0-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * debian/control:
+    - Build depend on libservlet3.1-java instead of libservlet2.5-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 09 Sep 2014 12:46:05 +0200
+
 cdi-api (1.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #648644)
diff --git a/debian/control b/debian/control
index 24de3b3..3f05dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7),
                javahelper (>= 0.37),
                libatinject-jsr330-api-java,
                libgeronimo-interceptor-3.0-spec-java,
-               libservlet2.5-java
+               libservlet3.1-java
 Standards-Version: 3.9.2
 Homepage: http://jcp.org/en/jsr/detail?id=299
 Vcs-Git: git://git.debian.org/git/pkg-java/cdi-api.git
diff --git a/debian/rules b/debian/rules
index a991621..295e239 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ MAVEN_REPO		:= http://repo1.maven.org/maven2/javax/enterprise/cdi-api/
 VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//')
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/el-api-2.1.jar:/usr/share/java/geronimo-interceptor-3.0-spec.jar
+export CLASSPATH=/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/el-api-3.0.jar:/usr/share/java/geronimo-interceptor-3.0-spec.jar
 
 %:
 	dh $@ --with javahelper --with jh_maven_repo_helper

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cdi-api.git



More information about the pkg-java-commits mailing list