[Commit-womb] gnumaint Makefile gnumaint template-active.txt

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       07/01/10 17:28:36

Modified files:
        .              : Makefile gnumaint template-active.txt 

Log message:
        draft template for rms, etc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnumaint?cvsroot=womb&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnumaint/template-active.txt?cvsroot=womb&r1=1.2&r2=1.3

Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Makefile    4 Jan 2007 19:52:56 -0000       1.2
+++ Makefile    10 Jan 2007 17:28:36 -0000      1.3
@@ -4,7 +4,7 @@
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.
 
-sep = | dos2unix; true ------------------------------------- 
+sep = 2>&1 | dos2unix; true ------------------------------
 
 test-send:
        gnumaint sendemail active $(sep)

Index: gnumaint
===================================================================
RCS file: /sources/womb/gnumaint/gnumaint,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnumaint    5 Jan 2007 00:05:59 -0000       1.16
+++ gnumaint    10 Jan 2007 17:28:36 -0000      1.17
@@ -20,14 +20,14 @@
 #
 # Originally written by Jose Marchesi.
 
-## Global variables (configuration section)
+# Global variables (configuration section)
 
 variable maintainers_file     "maintainers.new"
 variable mailtemplate_active  "template-active.txt"
 variable formail              "/usr/bin/formail"
-variable sendmail             "/usr/sbin/sendmail"
+variable sendmail             "/usr/lib/sendmail"
 variable log_file             "gnumaint.log"
-variable email_originator     "address@hidden"
+variable email_originator     "address@hidden"
 variable email_reply          "address@hidden"
 variable lockfile_command     "/usr/bin/lockfile"
 
@@ -398,6 +398,7 @@
 
         set maintainer_name [lindex $maintainer 0]
         set maintainer_email [lindex $maintainer 1]
+        set maintainer_notes [lindex $maintainer 2]
         set maintainer_pkgs [lindex $maintainer 3]
 
         ;# Skip Unmaintained
@@ -410,32 +411,34 @@
             continue
         }
 
+        # 
+        if {$maintainer_notes == ""} {
+          set maintainer_notes "(none)";
+        }
+        
         ;# Build the packages names list
         set pkg_list_str {}
         foreach pkg $maintainer_pkgs {
-            append pkg_list_str "- ${pkg}"
+            append pkg_list_str "${pkg}\n"
         }
 
         ;# Build the flat packages names list
-        set pkg_list_flat_str
+        set pkg_list_flat_str "" 
         set i 0
         foreach pkg $maintainer_pkgs {
-
             incr i
-
-            append pkg_list_str "${pkg}"
-
+            append pkg_list_flat_str "${pkg}"
             if {$i != [llength $maintainer_pkgs]} then {
-                append pkg_list_str ","
+                append pkg_list_flat_str ","
             }
-
-            append pkg_list_str " "
+            append pkg_list_flat_str " "
         }
 
         ;# Fill the template with this package/maintainer pair info
         set translation_list [list \
                                   [list %PACKAGE_LIST_FLAT $pkg_list_flat_str] 
\
                                   [list %PACKAGE_LIST $pkg_list_str] \
+                                  [list %MAINTAINER_ADDRESS $maintainer_notes] 
\
                                   [list %MAINTAINER_NAME $maintainer_name] \
                                   [list %MAINTAINER_EMAIL $maintainer_email]]
         set email_contents [fill_template $translation_list $email_template]
@@ -451,8 +454,8 @@
         }
         append control_line "\n"
 
-        append email_contents $note_line
-        append email_contents $control_line
+#        append email_contents $note_line
+#        append email_contents $control_line
 
         set subject_contents [fill_template $translation_list 
$subject_template]
            
@@ -468,10 +471,10 @@
             [exec $formail -k -X Date -X Reply-to: -X From: -X Subject: -X To: 
<< $out_email_contents]
 
         ;# Send the email using sendmail
-        exec $sendmail -t -bm << $out_email_contents
-        ;#puts "####################################"
-        ;#puts "- Sending email to $maintainer_name:"
-        ;#puts $out_email_contents
+        ; exec $sendmail -t -bm << $out_email_contents
+        puts "\f ---"
+        puts "     Would send email to $maintainer_name:"
+        puts $out_email_contents
 
         ;# Append an entry into the log file
         add_to_log "sent activity control email to $maintainer_email for 
packages $pkg_list_str" 

Index: template-active.txt
===================================================================
RCS file: /sources/womb/gnumaint/template-active.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- template-active.txt 5 Jan 2007 00:07:59 -0000       1.2
+++ template-active.txt 10 Jan 2007 17:28:36 -0000      1.3
@@ -1,13 +1,33 @@
-ACK %PACKAGE_LIST_FLAT active maintenance 
+ACK GNU package maintenance: %PACKAGE_LIST_FLAT
 
-Dear %MAINTAINER_NAME <%MAINTAINER_EMAIL>,
+Dear %MAINTAINER_NAME,
 
-Please answer this email in order we can make sure you
-are still actively maintaining 
+We are sending you this message because our records list you as the
+maintainer of the following GNU package(s):
 
 %PACKAGE_LIST 
+We list you under this email address: %MAINTAINER_EMAIL
 
-blah blah blah
 
-Sinceresly,
-GNU Project Spamming Section
+If everything is correct, please just reply to this message to
+acknowledge that you are still maintaining your package(s).
+
+If you are no longer maintaining the package(s), or your preferred email
+address has changed, or you have any other changes to note regarding
+your package maintenance, please tell address@hidden so we can
+update our records.
+
+
+We'd also like to systematically collect physical addresses and phone
+number, so that when email addresses stop working, we have some
+recourse.  Here is the information (if any) that we have for you now:
+
+%MAINTAINER_ADDRESS
+
+Again, please inform address@hidden if this is missing or
+incorrect.
+
+In general, if you have any questions or comments regarding your GNU
+package, please let us know, at address@hidden
+
+Thanks for supporting GNU, and happy hacking.