Bug 1547: Omit RFCs from release tarball docs dir

RFC Drafts and RFCs have licenses which are problematic for Debian
  distribution. Omit them from the release tarball.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4d68c97f4d0b71eec169701cf25e3367881c8af2..9d18d7c7215206cdbe5d8013ff77561cbc06a945 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -78,11 +78,15 @@ JH/12 Bug 1527: Autogrow buffer used in reading spool files.  Since they now
       include certificate info, eximon was claiming there were spoolfile
       syntax errors.
 
       include certificate info, eximon was claiming there were spoolfile
       syntax errors.
 

-JH/13 Buf 1521: Fix ldap lookup for single-attr request, multiple-attr return.
+JH/13 Bug 1521: Fix ldap lookup for single-attr request, multiple-attr return.

 
 JH/14 Log delivery-related information more consistently, using the sequence
       "H=<name> [<ip>]" wherever possible.
 
 
 JH/14 Log delivery-related information more consistently, using the sequence
       "H=<name> [<ip>]" wherever possible.
 

+TL/07 Bug 1547: Omit RFCs from release. Draft and RFCs have licenses which
+      are problematic for Debian distribution, omit them from the release
+      tarball.
+

 
 Exim version 4.84
 -----------------
 
 Exim version 4.84
 -----------------

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index e3267fd3e80efb5f5ecf8e68252681a1dbac557e..bb633061bb93afb5de3de52ae0dbcf180af3d887 100755 (executable)
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -223,7 +223,11 @@ sub move_text_docs_into_pkg {
         next
           if ( ( $fn eq 'ABOUT' )
             || ( $fn eq 'ChangeLog.0' )
         next
           if ( ( $fn eq 'ABOUT' )
             || ( $fn eq 'ChangeLog.0' )

-            || ( $fn eq 'test-harness.txt' ) );
+            || ( $fn eq 'test-harness.txt' )
+            # Debian issue re licensing of RFCs
+            || ( $fn =~ /^draft-ietf-.*/ )
+            || ( $fn =~ /^rfc.*/ )
+             );

         move( $file, File::Spec->catfile( $new_docdir, $fn ) );
     }
 }
         move( $file, File::Spec->catfile( $new_docdir, $fn ) );
     }
 }