diff -Nru libitext-java-2.1.7/debian/changelog libitext-java-2.1.7/debian/changelog
--- libitext-java-2.1.7/debian/changelog	2012-04-18 21:47:02.000000000 +0200
+++ libitext-java-2.1.7/debian/changelog	2012-12-20 13:44:58.000000000 +0100
@@ -1,3 +1,14 @@
+libitext-java (2.1.7-3+deb7u1) wheezy; urgency=low
+
+  * Team upload.
+  * Add missing the Class-Path for the java packages.
+    - Use javahelper to set the classpath.
+    - Use javahelper to compute dependencies.
+  * Add versioned upper bound on (Build-)Dependency on libbcprov-java
+    due to #687694.
+
+ -- Niels Thykier <niels@thykier.net>  Sat, 15 Sep 2012 11:02:37 +0200
+
 libitext-java (2.1.7-3) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff -Nru libitext-java-2.1.7/debian/control libitext-java-2.1.7/debian/control
--- libitext-java-2.1.7/debian/control	2012-04-18 17:08:25.000000000 +0200
+++ libitext-java-2.1.7/debian/control	2012-12-20 13:44:02.000000000 +0100
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Adriaan Peeters <apeeters@lashout.net>, Torsten Werner <twerner@debian.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java,
- libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java, gcj-native-helper
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java (<< 1.45~),
+ libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java, gcj-native-helper,
+ javahelper (>= 0.43)
 Standards-Version: 3.9.3
 Homepage: http://www.lowagie.com/iText/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libitext-java
@@ -12,7 +13,7 @@
 
 Package: libitext-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libbcprov-java (<< 1.45~), ${java:Depends}
 Suggests: libitext-java-gcj
 Description: Java Library to create and manipulate PDF on the fly
  iText is a library that allows you to generate PDF files on the fly.
@@ -37,14 +38,14 @@
 
 Package: libitext-rtf-java
 Architecture: all
-Depends: libitext-java (= ${binary:Version}), ${misc:Depends}
+Depends: libitext-java (= ${binary:Version}), ${misc:Depends}, ${java:Depends}
 Description: Java Library to create and manipulate RTF files on the fly
  iText RTF is a library that allows you to generate RTF files on the fly in
  a similar fashion to iText itself.
 
 Package: libitext-rups-java
 Architecture: all
-Depends: libitext-java (= ${binary:Version}), ${misc:Depends}
+Depends: libitext-java (= ${binary:Version}), ${misc:Depends}, ${java:Depends}
 Description: graphical tool for Reading and Updating PDF Syntax (RUPS)
  iText RUPS provides a GUI for visualizing PDF files and investigating their
  internal structure.
diff -Nru libitext-java-2.1.7/debian/rules libitext-java-2.1.7/debian/rules
--- libitext-java-2.1.7/debian/rules	2012-04-18 17:08:25.000000000 +0200
+++ libitext-java-2.1.7/debian/rules	2012-12-20 13:43:39.000000000 +0100
@@ -9,7 +9,9 @@
 DEB_ANT_CLEAN_TARGET :=
 DEB_ANT_BUILDFILE    := src/build.xml
 DEB_JARS             := bcprov bcmail bctsp dom4j pdfrenderer
-CLASS_PATH           := /usr/share/java/itext.jar
+CORE_CLASS_PATH      := /usr/share/java/bcprov.jar /usr/share/java/bcmail.jar /usr/share/java/bctsp.jar 
+RTF_CLASS_PATH       := /usr/share/java/itext.jar /usr/share/java/pdfrenderer.jar /usr/share/java/dom4j.jar
+RUPS_CLASS_PATH      := /usr/share/java/itext.jar
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
@@ -26,27 +28,28 @@
 
 install/lib$(LIBRARY_PACKAGE)-java::
 	dh_installdirs -plib$(LIBRARY_PACKAGE)-java usr/share/java
+	# Add Class-Path
+	jh_manifest -c "$(CORE_CLASS_PATH)" lib/iText.jar
 	install -m 644 lib/iText.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -plib$(LIBRARY_PACKAGE)-java usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE).jar
+	jh_depends -plib$(LIBRARY_PACKAGE)-java
 
 install/lib$(LIBRARY_PACKAGE)-rtf-java::
 	dh_installdirs -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java
-	# repack with Class-Path
-	cd lib && \
-	jar=iText-rtf.jar ; \
-	file=META-INF/MANIFEST.MF ; \
-	jar -xf $$jar && \
-		sed -i '/^[ \r\t]*$$/d' $$file && \
-		/bin/echo -e "Class-Path: $(CLASS_PATH)\r" >> $$file && \
-	jar -cfm $$jar $$file com
+	# Add Class-Path
+	jh_manifest -c "$(RTF_CLASS_PATH)" lib/iText-rtf.jar
 	# install
 	install -m 644 lib/iText-rtf.jar debian/lib$(LIBRARY_PACKAGE)-rtf-java/usr/share/java/$(LIBRARY_PACKAGE)-rtf-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java/$(LIBRARY_PACKAGE)-rtf-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE)-rtf.jar
+	jh_depends -plib$(LIBRARY_PACKAGE)-rtf-java
 
 install/lib$(LIBRARY_PACKAGE)-rups-java::
 	dh_installdirs -plib$(LIBRARY_PACKAGE)-rups-java usr/share/java
+	# Add Class-Path
+	jh_manifest -c "$(RUPS_CLASS_PATH)" lib/iText-rups.jar
 	install -m 644 lib/iText-rups.jar debian/lib$(LIBRARY_PACKAGE)-rups-java/usr/share/java/$(LIBRARY_PACKAGE)-rups-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -plib$(LIBRARY_PACKAGE)-rups-java usr/share/java/$(LIBRARY_PACKAGE)-rups-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE)-rups.jar
+	jh_depends -plib$(LIBRARY_PACKAGE)-rups-java
 
 ifeq ($(with_gcj_native),yes)
 install/libitext-java-gcj:: install/libitext-java