[osgi-compendium] 01/02: Transition to the Servlet API 3.1

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository osgi-compendium.

commit 4f003c1f9ab2aa2c02a24176e29959fbe8d80e33
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 16 17:51:30 2015 +0100

    Transition to the Servlet API 3.1
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a83932c..9196ef9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+osgi-compendium (5.0.0-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Dec 2015 17:51:14 +0100
+
 osgi-compendium (5.0.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 4e6828d..90d7908 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libgeronimo-jpa-2.0-spec-java,
  libosgi-core-java (>= 5.0.0~),
  libosgi-foundation-ee-java,
- libservlet2.5-java,
+ libservlet3.1-java,
  maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/osgi-compendium.git
diff --git a/debian/rules b/debian/rules
index c8bcf33..a24b778 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME	:= /usr/lib/jvm/default-java
-export CLASSPATH	:= /usr/share/java/osgi.core.jar:/usr/share/java/servlet-api-2.5.jar:/usr/share/java/ee.foundation.jar:/usr/share/java/geronimo-jpa-2.0-spec.jar
+export CLASSPATH	:= /usr/share/java/osgi.core.jar:/usr/share/java/servlet-api-3.1.jar:/usr/share/java/ee.foundation.jar:/usr/share/java/geronimo-jpa-2.0-spec.jar
 
 MAVEN_REPO		:= http://repo1.maven.org/maven2/org/osgi/org.osgi.compendium
 VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//')

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