diff -u salliere-0.7.1/debian/rules salliere-0.7.1/debian/rules
--- salliere-0.7.1/debian/rules
+++ salliere-0.7.1/debian/rules
@@ -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 -u salliere-0.7.1/debian/control salliere-0.7.1/debian/control
--- salliere-0.7.1/debian/control
+++ salliere-0.7.1/debian/control
@@ -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 -u salliere-0.7.1/debian/changelog salliere-0.7.1/debian/changelog
--- salliere-0.7.1/debian/changelog
+++ salliere-0.7.1/debian/changelog
@@ -1,3 +1,14 @@
+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