[exim-cvs] Bug 1547: Omit RFCs from release tarball docs dir

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Exim Git Commits Mailing List
Date:  
À: exim-cvs
Sujet: [exim-cvs] Bug 1547: Omit RFCs from release tarball docs dir
Gitweb: http://git.exim.org/exim.git/commitdiff/3394b36a12dad7e106db7d7e59497cb24b10e67f
Commit:     3394b36a12dad7e106db7d7e59497cb24b10e67f
Parent:     a60f6c07eea74e79b88828295a191e79595d8960
Author:     Todd Lyons <tlyons@???>
AuthorDate: Mon Dec 22 05:30:59 2014 -0800
Committer:  Todd Lyons <tlyons@???>
CommitDate: Mon Dec 22 05:30:59 2014 -0800


    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.
---
 doc/doc-txt/ChangeLog                      |    6 +++++-
 release-process/scripts/mk_exim_release.pl |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4d68c97..9d18d7c 100644
--- 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.


-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.


+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
 -----------------
diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index e3267fd..bb63306 100755
--- 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' )
-            || ( $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 ) );
     }
 }