I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is included.
diff -Nru mhonarc-2.6.19/debian/changelog mhonarc-2.6.19/debian/changelog
--- mhonarc-2.6.19/debian/changelog     2024-03-17 16:59:20.000000000 +0000
+++ mhonarc-2.6.19/debian/changelog     2024-03-17 16:50:37.000000000 +0000
@@ -1,3 +1,11 @@
+mhonarc (2.6.19-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to source format 3.0. (closes: #1007589)
+  * d/copyright: Convert to machine-readable format.
+
+ -- Bastian Germann <[email protected]>  Sun, 17 Mar 2024 16:50:37 +0000
+
 mhonarc (2.6.19-2.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru mhonarc-2.6.19/debian/copyright mhonarc-2.6.19/debian/copyright
--- mhonarc-2.6.19/debian/copyright     2024-03-17 16:59:20.000000000 +0000
+++ mhonarc-2.6.19/debian/copyright     2024-03-17 16:50:37.000000000 +0000
@@ -1,13 +1,25 @@
-This package was first debianized by Michael Alan Dorman
-<[email protected]> and is now maintained by others.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This package was first debianized by Michael Alan Dorman
+ <[email protected]> and is now maintained by others.
+Source:
+ http://www.mhonarc.org/
+Upstream-Contact:
+ Earl Hood <[email protected]>
 
-It was downloaded from: http://www.mhonarc.org/
-
-Upstream author: Earl Hood <[email protected]>
-
-This software is copyright 1995-2001, Earl Hood, [email protected]
-
-You are free to distribute this software under the terms of
-the GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+Files: *
+Copyright:
+ This software is copyright 1995-2001, Earl Hood, [email protected]
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+Comment:
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in /usr/share/common-licenses/GPL-2 file.
diff -Nru mhonarc-2.6.19/debian/patches/debian.patch 
mhonarc-2.6.19/debian/patches/debian.patch
--- mhonarc-2.6.19/debian/patches/debian.patch  1970-01-01 00:00:00.000000000 
+0000
+++ mhonarc-2.6.19/debian/patches/debian.patch  2024-03-17 16:50:37.000000000 
+0000
@@ -0,0 +1,63 @@
+--- mhonarc-2.6.19.orig/install.me
++++ mhonarc-2.6.19/install.me
+@@ -255,6 +255,7 @@ my $Root   = '';
+                  noman
+                  perl=s
+                  prefix=s
++                 instprefix=s
+ 
+                  help));
+ 
+@@ -430,6 +431,10 @@ my $Root  = '';
+     my $plprefix  = "#!$OptValues{'perl'}\n";
+        $plprefix .= "use lib qw($OptValues{'libpath'});\n"
+                   if $OptValues{'libpath'};
++    $OptValues{'instprefix'} and $OptValues{'binpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'binpath'});
++    $OptValues{'instprefix'} and $OptValues{'libpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'libpath'});
++    $OptValues{'instprefix'} and $OptValues{'docpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'docpath'});
++    $OptValues{'instprefix'} and $OptValues{'manpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'manpath'});
+     my($file, $destfile);
+     if ($dobin) {
+       print STDOUT qq(Installing programs to "$OptValues{'binpath'}":\n);
+--- mhonarc-2.6.19.orig/lib/mhamain.pl
++++ mhonarc-2.6.19/lib/mhamain.pl
+@@ -1565,7 +1565,7 @@ sub signal_catch {
+ ##
+ sub defineIndex2MsgId {
+     no warnings qw(deprecated);
+-    if (!defined(%Index2MsgId)) {
++    unless (%Index2MsgId) {
+       foreach (keys %MsgId) {
+           $Index2MsgId{$MsgId{$_}} = $_;
+       }
+--- mhonarc-2.6.19.orig/lib/mhmimetypes.pl
++++ mhonarc-2.6.19/lib/mhmimetypes.pl
+@@ -48,6 +48,7 @@ $UnknownExt     = 'bin';
+     'application/ms-powerpoint',      'ppt:MS-Powerpoint presentation',
+     'application/ms-project',         'mpp:MS-Project file',
+     'application/msword',             'doc:MS-Word document',
++    
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',      
          'docx:MS-Word 2007 document',
+     'application/octet-stream',       'bin:Binary data',
+     'application/oda',                        'oda:ODA file',
+     'application/pdf',                        'pdf:Adobe PDF document',
+@@ -71,7 +72,9 @@ $UnknownExt     = 'bin';
+     'application/vnd.lotus-wordpro',    'lwp,sam:Lotus WordPro',
+     'application/vnd.mif',            'mif:Frame MIF document',
+     'application/vnd.ms-excel',         'xls:MS-Excel spreadsheet',
++    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',      
        'xlsx:MS-Excel 2007 spreadsheet',
+     'application/vnd.ms-powerpoint',    'ppt:MS-Powerpoint presentation',
++    
'application/vnd.openxmlformats-officedocument.presentationml.presentation',    
'pptx:MS-Powerpoint 2007 presentation',
+     'application/vnd.ms-project',     'mpp:MS-Project file',
+     'application/vnd.stardivision.calc', 'sdc:StarCalc spreadsheet',
+     'application/vnd.stardivision.chart', 'sds:StarChart document',
+--- mhonarc-2.6.19.orig/lib/mhopt.pl
++++ mhonarc-2.6.19/lib/mhopt.pl
+@@ -865,7 +865,7 @@ sub update_data_1_to_2 {
+ sub update_data_2_1_to_later {
+     no warnings qw(deprecated);
+     # we can preserve filter arguments
+-    if (defined(%main::MIMEFiltersArgs)) {
++    if (%main::MIMEFiltersArgs) {
+       warn qq/         preserving MIMEARGS...\n/;
+       %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
+       $IsDefault{'MIMEARGS'} = 0;
diff -Nru mhonarc-2.6.19/debian/patches/series 
mhonarc-2.6.19/debian/patches/series
--- mhonarc-2.6.19/debian/patches/series        1970-01-01 00:00:00.000000000 
+0000
+++ mhonarc-2.6.19/debian/patches/series        2024-03-17 16:50:37.000000000 
+0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru mhonarc-2.6.19/debian/source/format 
mhonarc-2.6.19/debian/source/format
--- mhonarc-2.6.19/debian/source/format 2024-03-17 16:59:20.000000000 +0000
+++ mhonarc-2.6.19/debian/source/format 2024-03-17 16:50:37.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru mhonarc-2.6.19/install.me mhonarc-2.6.19/install.me
--- mhonarc-2.6.19/install.me   2024-03-17 16:59:20.000000000 +0000
+++ mhonarc-2.6.19/install.me   2014-05-06 02:43:21.000000000 +0000
@@ -255,7 +255,6 @@
                   noman
                   perl=s
                   prefix=s
-                  instprefix=s
 
                   help));
 
@@ -431,10 +430,6 @@
     my $plprefix  = "#!$OptValues{'perl'}\n";
        $plprefix .= "use lib qw($OptValues{'libpath'});\n"
                    if $OptValues{'libpath'};
-    $OptValues{'instprefix'} and $OptValues{'binpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'binpath'});
-    $OptValues{'instprefix'} and $OptValues{'libpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'libpath'});
-    $OptValues{'instprefix'} and $OptValues{'docpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'docpath'});
-    $OptValues{'instprefix'} and $OptValues{'manpath'} = join ('', 
$OptValues{'instprefix'}, $OptValues{'manpath'});
     my($file, $destfile);
     if ($dobin) {
        print STDOUT qq(Installing programs to "$OptValues{'binpath'}":\n);
diff -Nru mhonarc-2.6.19/lib/mhamain.pl mhonarc-2.6.19/lib/mhamain.pl
--- mhonarc-2.6.19/lib/mhamain.pl       2024-03-17 16:59:20.000000000 +0000
+++ mhonarc-2.6.19/lib/mhamain.pl       2014-05-06 02:15:59.000000000 +0000
@@ -1565,7 +1565,7 @@
 ##
 sub defineIndex2MsgId {
     no warnings qw(deprecated);
-    unless (%Index2MsgId) {
+    if (!defined(%Index2MsgId)) {
        foreach (keys %MsgId) {
            $Index2MsgId{$MsgId{$_}} = $_;
        }
diff -Nru mhonarc-2.6.19/lib/mhmimetypes.pl mhonarc-2.6.19/lib/mhmimetypes.pl
--- mhonarc-2.6.19/lib/mhmimetypes.pl   2024-03-17 16:59:20.000000000 +0000
+++ mhonarc-2.6.19/lib/mhmimetypes.pl   2011-01-02 11:20:23.000000000 +0000
@@ -48,7 +48,6 @@
     'application/ms-powerpoint',       'ppt:MS-Powerpoint presentation',
     'application/ms-project',          'mpp:MS-Project file',
     'application/msword',              'doc:MS-Word document',
-    'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 
        'docx:MS-Word 2007 document',
     'application/octet-stream',        'bin:Binary data',
     'application/oda',                         'oda:ODA file',
     'application/pdf',                         'pdf:Adobe PDF document',
@@ -72,9 +71,7 @@
     'application/vnd.lotus-wordpro',    'lwp,sam:Lotus WordPro',
     'application/vnd.mif',             'mif:Frame MIF document',
     'application/vnd.ms-excel',         'xls:MS-Excel spreadsheet',
-    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',       
        'xlsx:MS-Excel 2007 spreadsheet',
     'application/vnd.ms-powerpoint',    'ppt:MS-Powerpoint presentation',
-    
'application/vnd.openxmlformats-officedocument.presentationml.presentation',    
'pptx:MS-Powerpoint 2007 presentation',
     'application/vnd.ms-project',      'mpp:MS-Project file',
     'application/vnd.stardivision.calc', 'sdc:StarCalc spreadsheet',
     'application/vnd.stardivision.chart', 'sds:StarChart document',
diff -Nru mhonarc-2.6.19/lib/mhopt.pl mhonarc-2.6.19/lib/mhopt.pl
--- mhonarc-2.6.19/lib/mhopt.pl 2024-03-17 16:59:20.000000000 +0000
+++ mhonarc-2.6.19/lib/mhopt.pl 2012-01-29 19:45:55.000000000 +0000
@@ -865,7 +865,7 @@
 sub update_data_2_1_to_later {
     no warnings qw(deprecated);
     # we can preserve filter arguments
-    if (%main::MIMEFiltersArgs) {
+    if (defined(%main::MIMEFiltersArgs)) {
        warn qq/         preserving MIMEARGS...\n/;
        %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
        $IsDefault{'MIMEARGS'} = 0;

Reply via email to