Merge lp:~mistrynitesh/ubuntu/natty/diffutils-doc/fix-616119 into lp:ubuntu/natty/diffutils-doc

[Nitesh Mistry]

[Colin Watson (cjwatson)]

Thanks for your proposal. However, this should really be done in Debian - there's no urgent reason to do it in Ubuntu, so I don't think we need to create more divergence from Debian here.

For future changes you submit, please note that debian/changelog entries must describe the change, as well as listing the bug numbers they fix.

review: Disapprove

Unmerged revisions

4. By Nitesh Mistry on 2010-10-24

Closed bug LP: #616119

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-04 11:59:41 +0000
+++ debian/changelog	2010-10-24 07:54:43 +0000
@@ -1,3 +1,9 @@
+diffutils-doc (2.8.1.-13) unstable; urgency=medium
+
+  * Closed bug LP: #616119
+
+ -- Nitesh Mistry <[e-mail]> Sun, 24 Oct 2010 13:05:03 +0530
+
 diffutils-doc (2.8.1-13) unstable; urgency=medium
 
   * Changed debian/* files again for new texi2html behaviour. Closes: #552943.
 
=== modified file 'debian/control'
--- debian/control	2009-11-04 11:59:41 +0000
+++ debian/control	2010-10-24 07:54:43 +0000
@@ -19,4 +19,5 @@
 Depends: diffutils-doc
 Description: dummy transition package for diff-doc -> diffutils-doc
  This is a dummy package to aid in transitioning from diff-doc to
- diffutils-doc. It may be safely removed after upgrading to squeeze.
+ diffutils-doc. It may be safely removed after upgrading from diff-doc
+ to diffutils-doc.