[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2.0-1-2-gda5d310

[Jakub Adam]

The following commit has been merged in the master branch:
commit da5d310edf824b5682fe7de869f07861d68493fd
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Feb 7 17:12:08 2012 +0100

    Migrate dependency on libservlet2.4-java to libservlet-2.5-java.

diff --git a/debian/changelog b/debian/changelog
index 35be589..1e3e1ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jgit (1.2.0-2) UNRELEASED; urgency=low
 
   * Add d/watch.
+  * Migrate dependency on libservlet2.4-java to libservlet-2.5-java.
+    (Closes: #658807)
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 03 Jan 2012 19:49:36 +0100
 
diff --git a/debian/libjgit-java.classpath b/debian/libjgit-java.classpath
index 49c5134..8c1c74d 100644
--- a/debian/libjgit-java.classpath
+++ b/debian/libjgit-java.classpath
@@ -1,4 +1,4 @@
 usr/share/java/org.eclipse.jgit.jar /usr/share/java/jsch.jar
 usr/share/java/org.eclipse.jgit.ant.jar /usr/share/java/org.eclipse.jgit.jar /usr/share/java/ant.jar
-usr/share/java/org.eclipse.jgit.http.server.jar /usr/share/java/org.eclipse.jgit.jar /usr/share/java/servlet-api.jar
+usr/share/java/org.eclipse.jgit.http.server.jar /usr/share/java/org.eclipse.jgit.jar /usr/share/java/servlet-api-2.5.jar
 usr/share/java/org.eclipse.jgit.junit.jar /usr/share/java/org.eclipse.jgit.jar /usr/share/java/junit4.jar

-- 
UNNAMED PROJECT