Merge lp:~james-page/ubuntu/oneiric/jcaptcha/827651 into lp:ubuntu/oneiric/jcaptcha

[James Page]

Remove servlet-api-2.5.jar from generated MANIFEST Class-Path as this should always be provided and generated class conflicts when it is.

[lp:~james-page/ubuntu/oneiric/jcaptcha/827651]

4. By James Page on 2011-09-01

* Fix FTBFS due to changes in dependency chain causing no fonts to be
  installed:
  - debian/control: added ttf-dejavu-core to Build-Depends-Indep.

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-07 13:51:50 +0000
+++ debian/changelog	2011-09-01 14:05:21 +0000
@@ -1,3 +1,18 @@
+jcaptcha (2.0~alpha1-1ubuntu2) oneiric; urgency=low
+
+  * Fix FTBFS due to changes in dependency chain causing no fonts to be 
+    installed:
+    - debian/control: added ttf-dejavu-core to Build-Depends-Indep.
+
+ -- James Page <[e-mail]>  Thu, 01 Sep 2011 14:55:42 +0100
+
+jcaptcha (2.0~alpha1-1ubuntu1) oneiric; urgency=low
+
+  * debian/libjcaptcha-java.classpath: removed servlet-api-2.5.jar from 
+    classpath as this should always be provided (LP: #827651). 
+
+ -- James Page <[e-mail]>  Thu, 18 Aug 2011 10:55:44 +0100
+
 jcaptcha (2.0~alpha1-1) unstable; urgency=low
 
   * Initial release. (Closes: #629529)

=== modified file 'debian/control'
--- debian/control	2011-06-07 13:51:50 +0000
+++ debian/control	2011-09-01 14:05:21 +0000
@@ -1,7 +1,8 @@
 Source: jcaptcha
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: James Page <[e-mail]>
 Build-Depends:
  cdbs,
@@ -19,7 +20,8 @@
  libmaven-javadoc-plugin-java,
  libservlet2.5-java,
  libservlet2.5-java-doc,
- libslf4j-java
+ libslf4j-java,
+ ttf-dejavu-core
 Standards-Version: 3.9.2
 Homepage: http://www.jcaptcha.net/
 Vcs-Git: git://git.debian.org/git/pkg-java/jcaptcha.git

=== modified file 'debian/libjcaptcha-java.classpath'
--- debian/libjcaptcha-java.classpath	2011-06-07 13:51:50 +0000
+++ debian/libjcaptcha-java.classpath	2011-09-01 14:05:21 +0000
@@ -1,2 +1,2 @@
-usr/share/java/jcaptcha-integration-simple-servlet.jar /usr/share/java/jcaptcha.jar
-usr/share/java/jcaptcha.jar /usr/share/java/jcaptcha-api.jar /usr/share/java/jhlabs-filters.jar /usr/share/java/commons-collections3.jar /usr/share/java/servlet-api-2.5.jar /usr/share/java/slf4j-api.jar
+usr/share/java/jcaptcha-integration-simple-servlet.jar jcaptcha.jar
+usr/share/java/jcaptcha.jar jcaptcha-api.jar jhlabs-filters.jar commons-collections3.jar servlet-api-2.5.jar slf4j-api.jar