--- pwgen-2.05.orig/pwgen.1
+++ pwgen-2.05/pwgen.1
@@ -31,7 +31,7 @@
 .B pwgen
 program is designed
 to be used both interactively, and in shell scripts.  Hence, 
-its default behavior is differs depending on whether the standard output
+its default behaviour differs depending on whether the standard output
 is a tty device or a pipe to another program.  Used interactively, 
 .B pwgen 
 will display a screenful of passwords, allowing the user to pick a single 
--- pwgen-2.05.orig/debian/changelog
+++ pwgen-2.05/debian/changelog
@@ -1,3 +1,9 @@
+pwgen (2.05-1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 29 Jun 2006 11:53:45 +0100
+
 pwgen (2.05-1) unstable; urgency=low
 
   * Add a udeb for debian-installer.  Thanks to Martin Michlmayr for the
@@ -8,6 +14,12 @@
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 15 Jan 2006 23:16:59 -0500
 
+pwgen (2.04-1ubuntu1) dapper; urgency=low
+
+  * fixed typo in pwgen.1 manpage, malone #26323, thanks to Brian Beck
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue,  4 Apr 2006 19:39:12 +0200
+
 pwgen (2.04-1) unstable; urgency=low
 
   * New upstream version.
@@ -98,7 +110,7 @@
   * Really add /usr/doc/pwgen (NOT sntop!) link (Closes: #90335).
 
  -- Vincent Renardias <vincent@debian.org>  Wed, 13 Jun 2001 11:34:10 +0200
-    
+
 pwgen (1-16) unstable; urgency=low
 
   * Fixed debian/rules
@@ -114,7 +126,7 @@
     closes: #54001: can not build from source.
 
  -- Vincent Renardias <vincent@debian.org>  Tue,  4 Jan 2000 14:53:58 +0100
-    
+
 pwgen (1-14) unstable; urgency=low
 
   * Fix bug #38630.
@@ -234,6 +246,3 @@
 
  -- Christoph Lameter <clameter@debian.org>  Fri, 20 Sep 1996 14:51:46 +0800
 
-Local variables:
-mode: debian-changelog
-End: