[mb2md] 01/02: Fix UW-IMAP misspelling in multiple places

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository mb2md.

commit 55d8c7db600c743642eeab27ed8efe5ddcd24870
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Aug 10 14:29:13 2014 +0200

    Fix UW-IMAP misspelling in multiple places
    
    Thanks Jonas Smedegaard!
    
    Closes: #757601
---
 debian/USAGE                                  |  4 ++--
 debian/changelog                              |  2 ++
 debian/mb2md.sgml                             |  4 ++--
 debian/patches/fix-uw-imap-misspellings.patch | 28 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/debian/USAGE b/debian/USAGE
index 31c98e3..728e16d 100644
--- a/debian/USAGE
+++ b/debian/USAGE
@@ -76,8 +76,8 @@
 #                the corresponding maildir. The extension must be
 #                given without the leading dot ("."). See the example below.
 #
-#  -l WU-file    File containing the list of subscribed folders.  If
-#                migrating from WU-IMAP the list of subscribed folders will
+#  -l UW-file    File containing the list of subscribed folders.  If
+#                migrating from UW-IMAP the list of subscribed folders will
 #                be found in the file called .mailboxlist in the users
 #                home directory.  This will convert all subscribed folders
 #                for a single user:
diff --git a/debian/changelog b/debian/changelog
index 911300d..dd7565d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mb2md (3.20-6) UNRELEASED; urgency=low
   * Redact short and long description
   * Bump Standards-Version to 3.9.5 (no changes).
   * Fix typo in previous changelog entry.
+  * Fix UW-IMAP misspelling in multiple places. Thanks Jonas Smedegaard!
+    (Closes: #757601)
 
   [ gregor herrmann ]
   * debian/watch: don't try to run uupdate.
diff --git a/debian/mb2md.sgml b/debian/mb2md.sgml
index bd5f0ff..5faffda 100644
--- a/debian/mb2md.sgml
+++ b/debian/mb2md.sgml
@@ -199,11 +199,11 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>-l</option> <replaceable>WU-file</replaceable>
+        <term><option>-l</option> <replaceable>UW-file</replaceable>
         </term>
         <listitem>
           <para>File containing the list of subscribed folders.  If
-		migrating from WU-IMAP the list of subscribed folders will
+		migrating from UW-IMAP the list of subscribed folders will
 		be found in the file called .mailboxlist in the users
 		home directory.  This will convert all subscribed folders
 		for a single user:</para>
diff --git a/debian/patches/fix-uw-imap-misspellings.patch b/debian/patches/fix-uw-imap-misspellings.patch
new file mode 100644
index 0000000..4477242
--- /dev/null
+++ b/debian/patches/fix-uw-imap-misspellings.patch
@@ -0,0 +1,28 @@
+Description: Fix UW-IMAP misspellings
+Bug-Debian: https://bugs.debian.org/757601
+Author: Axel Beckert <abe at debian.org>
+
+Index: mb2md/mb2md-3.20.pl
+===================================================================
+--- mb2md.orig/mb2md-3.20.pl	2014-08-10 14:26:10.536087525 +0200
++++ mb2md/mb2md-3.20.pl	2014-08-10 14:26:48.218778318 +0200
+@@ -172,8 +172,8 @@
+ #                the corresponding maildir. The extension must be
+ #                given without the leading dot ("."). See the example below.
+ #
+-#  -l WU-file    File containing the list of subscribed folders.  If
+-#                migrating from WU-IMAP the list of subscribed folders will
++#  -l UW-file    File containing the list of subscribed folders.  If
++#                migrating from UW-IMAP the list of subscribed folders will
+ #                be found in the file called .mailboxlist in the users
+ #                home directory.  This will convert all subscribed folders
+ #                for a single user:
+@@ -705,7 +705,7 @@
+ # ------------------------
+ #
+ # It checks that the folder to be converted is in the list of subscribed
+-# folders in WU-IMAP
++# folders in UW-IMAP
+ #
+ sub inlist
+ {
diff --git a/debian/patches/series b/debian/patches/series
index bdf5a03..2c0e2d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-path-expansion.patch
 fix-dash-r-option.patch
 better-separator-line-detection.patch
+fix-uw-imap-misspellings.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/mb2md.git