diff -Nru esvn-0.6.11+1/debian/changelog esvn-0.6.11+1/debian/changelog
--- esvn-0.6.11+1/debian/changelog	2007-07-02 16:09:08.000000000 +0200
+++ esvn-0.6.11+1/debian/changelog	2007-07-02 16:09:09.000000000 +0200
@@ -1,3 +1,11 @@
+esvn (0.6.11+1-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Changed doc directory to /usr/share/doc/esvn/ (Closes: LP#73913)
+    - Update maintainer in field debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Mon,  2 Jul 2007 16:07:14 +0200
+
 esvn (0.6.11+1-4) unstable; urgency=low
 
   * Implement parser for .svn/entries with format > 6 (Damien Caliste).
@@ -5,6 +13,14 @@
 
  -- Pierre Chifflier <chifflier@inl.fr>  Fri, 29 Jun 2007 11:20:02 +0200
 
+esvn (0.6.11+1-3ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+  * Changed doc directory to /usr/share/doc/esvn/ (Closes: LP#73913) 
+  * Changed maintainer field to MOTU.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 19 May 2007 13:08:15 +1000
+
 esvn (0.6.11+1-3) unstable; urgency=low
 
   * Fix FTBFS with GCC 4.3 (Closes: #417175)
@@ -13,6 +29,13 @@
 
  -- Pierre Chifflier <chifflier@inl.fr>  Tue, 03 Apr 2007 10:20:05 +0200
 
+esvn (0.6.11+1-2ubuntu1) feisty; urgency=low
+
+  * Changed doc directory to /usr/share/doc/esvn/ (Closes: LP#73913) 
+  * Changed maintainer field to MOTU.
+
+ -- Cesare Tirabassi <norsetto@alice.it>  Sun, 11 Mar 2007 11:12:33 +0100
+
 esvn (0.6.11+1-2) unstable; urgency=low
 
   * Recommend ssh-askpass (Closes: #328281)
diff -Nru esvn-0.6.11+1/debian/control esvn-0.6.11+1/debian/control
--- esvn-0.6.11+1/debian/control	2007-07-02 16:09:08.000000000 +0200
+++ esvn-0.6.11+1/debian/control	2007-07-02 16:09:09.000000000 +0200
@@ -1,7 +1,8 @@
 Source: esvn
 Section: x11
 Priority: optional
-Maintainer: Pierre Chifflier <chifflier@inl.fr>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Pierre Chifflier <chifflier@inl.fr>
 Build-Depends: debhelper (>= 4.0.0), libqt3-mt-dev (>= 3:3.3.4-7), qt3-dev-tools, imagemagick
 Standards-Version: 3.7.2
 
diff -Nru esvn-0.6.11+1/debian/esvn-doc.dirs esvn-0.6.11+1/debian/esvn-doc.dirs
--- esvn-0.6.11+1/debian/esvn-doc.dirs	2007-07-02 16:09:08.000000000 +0200
+++ esvn-0.6.11+1/debian/esvn-doc.dirs	2007-07-02 16:09:09.000000000 +0200
@@ -1 +1 @@
-usr/share/doc/esvn-doc
+usr/share/doc/esvn
diff -Nru esvn-0.6.11+1/debian/esvn-doc.doc-base esvn-0.6.11+1/debian/esvn-doc.doc-base
--- esvn-0.6.11+1/debian/esvn-doc.doc-base	2007-07-02 16:09:08.000000000 +0200
+++ esvn-0.6.11+1/debian/esvn-doc.doc-base	2007-07-02 16:09:09.000000000 +0200
@@ -6,7 +6,7 @@
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/esvn-doc/html-docs/index.html
-Files: /usr/share/doc/esvn-doc/html-docs/*.html
+Index: /usr/share/doc/esvn/html-docs/index.html
+Files: /usr/share/doc/esvn/html-docs/*.html
 
   
diff -Nru esvn-0.6.11+1/debian/rules esvn-0.6.11+1/debian/rules
--- esvn-0.6.11+1/debian/rules	2007-07-02 16:09:08.000000000 +0200
+++ esvn-0.6.11+1/debian/rules	2007-07-02 16:09:09.000000000 +0200
@@ -71,7 +71,7 @@
 	# Add here commands to install the indep part of the package into
 	# debian/<package>-doc.
 	#INSTALLDOC#
-	cp -r html-docs $(CURDIR)/debian/esvn-doc/usr/share/doc/esvn-doc/
+	cp -r html-docs $(CURDIR)/debian/esvn-doc/usr/share/doc/esvn/
 
 	dh_install -i