diff -Nru salliere-0.7/changelog salliere-0.7.1/changelog
--- salliere-0.7/changelog	2009-03-08 23:11:41.000000000 +0100
+++ salliere-0.7.1/changelog	2009-06-25 09:31:13.000000000 +0200
@@ -1,3 +1,7 @@
+Version 0.7.1:
+
+	* Patch to build with itext 2.x
+
 Version 0.7:
 
 	* Support any number of names (currently only in cmd line).
diff -Nru salliere-0.7/cx/ath/matthew/salliere/PDFTablePrinter.java salliere-0.7.1/cx/ath/matthew/salliere/PDFTablePrinter.java
--- salliere-0.7/cx/ath/matthew/salliere/PDFTablePrinter.java	2009-01-19 00:21:41.000000000 +0100
+++ salliere-0.7.1/cx/ath/matthew/salliere/PDFTablePrinter.java	2009-04-02 00:54:28.000000000 +0200
@@ -50,9 +50,9 @@
          Table table = new Table(headers.length);
          table.setBorderWidth(1);
          table.setBorderColor(new Color(0, 0, 0));
-         table.setSpaceInsideCell(2);
-         table.setDefaultVerticalAlignment(Table.ALIGN_MIDDLE);
-         table.setDefaultCellBorder(Table.NO_BORDER);
+         table.setPadding(2);
+         table.getDefaultCell().setVerticalAlignment(Table.ALIGN_MIDDLE);
+         table.getDefaultCell().setBorder(Table.NO_BORDER);
 
          // print headers
          for (int i = 0; i < headers.length; i++) {
Binary files /tmp/Xg1eXvPOVA/salliere-0.7/cx/ath/matthew/salliere/.Salliere.java.swp and /tmp/EoORuTWDEo/salliere-0.7.1/cx/ath/matthew/salliere/.Salliere.java.swp differ
diff -Nru salliere-0.7/debian/changelog salliere-0.7.1/debian/changelog
--- salliere-0.7/debian/changelog	2009-08-21 14:13:49.000000000 +0200
+++ salliere-0.7.1/debian/changelog	2009-08-21 14:13:49.000000000 +0200
@@ -1,3 +1,21 @@
+salliere (0.7.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, delta: (LP: #416907)
+  * debian/rules:
+   - Changed call to jh_depends to only use it on package salliere
+  * debian/control:
+   - Modified gsalliere Depends: to salliere
+   - Bump Standards-Version
+
+ -- Nicolas Van Wambeke <nicolasvw@free.fr>  Thu, 20 Aug 2009 22:41:30 +0200
+
+salliere (0.7.1-1) unstable; urgency=low
+
+  * New Upstream release
+   - patch to work on itext 2.x (Closes: #521967)
+
+ -- Matthew Johnson <mjj29@debian.org>  Thu, 25 Jun 2009 08:32:05 +0100
+
 salliere (0.7-1) unstable; urgency=low
 
   * New Upstream Release
diff -Nru salliere-0.7/debian/control salliere-0.7.1/debian/control
--- salliere-0.7/debian/control	2009-08-21 14:13:49.000000000 +0200
+++ salliere-0.7.1/debian/control	2009-08-21 14:13:49.000000000 +0200
@@ -1,8 +1,9 @@
 Source: salliere
 Priority: optional
-Maintainer: Matthew Johnson <mjj29@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matthew Johnson <mjj29@debian.org>
 Build-Depends: debhelper (>= 5), default-jdk, fastjar, docbook-to-man, libmatthew-debug-java, libcsv-java, libitext-java, gettext, javahelper, libcommons-net-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Section: games
 
 Package: salliere
@@ -18,7 +19,7 @@
 Package: gsalliere
 Section: games
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: salliere (= 0.7.1-1), ${misc:Depends}
 Description: Bridge duplicate scorer (GUI frontend)
  Salliere is a scoring program for duplicate bridge.  It will take a file of
  pair numbers and contracts then score and match point them for duplicate
diff -Nru salliere-0.7/debian/rules salliere-0.7.1/debian/rules
--- salliere-0.7/debian/rules	2009-08-21 14:13:49.000000000 +0200
+++ salliere-0.7.1/debian/rules	2009-08-21 14:13:49.000000000 +0200
@@ -55,7 +55,7 @@
 	dh_link -psalliere usr/share/salliere/salliere-$(VERSION).jar usr/games/salliere
 	dh_link -pgsalliere usr/share/salliere/gsalliere-$(VERSION).jar usr/games/gsalliere
 	jh_exec -i
-	jh_depends -i -j
+	jh_depends -j -psalliere
 	dh_compress -i
 	dh_fixperms -i 
 	dh_installdeb -i 
diff -Nru salliere-0.7/INSTALL salliere-0.7.1/INSTALL
--- salliere-0.7/INSTALL	2009-01-19 00:21:41.000000000 +0100
+++ salliere-0.7.1/INSTALL	2009-04-02 00:55:06.000000000 +0200
@@ -4,7 +4,7 @@
 To build salliere you will need a 1.5 compatible Java compiler with at least
 1.4 compatible java libraries, libcsv-java
 (http://sourceforge.net/projects/javacsv/), libmatthew-debug-java
-(http://www.matthew.ath.cx/projects/java/) and libitext-java
+(http://www.matthew.ath.cx/projects/java/) and libitext-java (v2 or higher)
 (http://www.lowagie.com/iText/)
 
 To build: