[Commit-womb] gnumaint Makefile maintfileupgrade

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       07/01/25 17:40:29

Modified files:
        .              : Makefile maintfileupgrade 

Log message:
        do not lose comments

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnumaint/maintfileupgrade?cvsroot=womb&r1=1.2&r2=1.3

Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Makefile    22 Jan 2007 19:47:59 -0000      1.4
+++ Makefile    25 Jan 2007 17:40:29 -0000      1.5
@@ -5,7 +5,8 @@
 # notice and this notice are preserved.
 
 test-maint-convert:
-       maintfileupgrade $(gorg)/maintainers | dos2unix
+#      maintfileupgrade $(gorg)/maintainers | dos2unix
+       maintfileupgrade m.src | dos2unix | tee m.new
 
 sep = 2>&1 | dos2unix; true ------------------------------
 

Index: maintfileupgrade
===================================================================
RCS file: /sources/womb/gnumaint/maintfileupgrade,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- maintfileupgrade    28 Dec 2006 19:34:21 -0000      1.2
+++ maintfileupgrade    25 Jan 2007 17:40:29 -0000      1.3
@@ -2,7 +2,7 @@
 #
 # maintfileupgrade - GNU maintainers file upgrade to new format
 #
-# Copyright (C) 2006 Free Software Foundation Inc.
+# Copyright 2007 Free Software Foundation Inc.
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -81,7 +81,7 @@
     }
 
     regexp -- $package_line_regexp $line entire_match pkg_name pkg_comments 
pkg_contacts
-
+    #puts "parse: $pkg_name | $pkg_comments | $pkg_contacts"
     return [list [string trim $pkg_name] \
                [string trim $pkg_comments] \
                [parse_contacts [string trim $pkg_contacts]]]
@@ -123,6 +123,7 @@
        
        set pkginfo [parse_package_line $line]
        lappend maintainersdb $pkginfo
+       #puts "lappe: [lindex $pkginfo 1]"
        gets $finput line
     }
     
@@ -139,8 +140,8 @@
     puts {}
 
     foreach pkg $maintainersdb {
-
        if {[lindex $pkg 2] == ""} then {
+        #puts "regen: [lindex $pkg 0] -- [lindex $pkg 1] -- [lindex $pkg 2]"
            
            set maintainer_name "Unmaintained"
            set maintainer_email($maintainer_name) {}
@@ -149,12 +150,9 @@
        }
 
         foreach maintainer [lindex $pkg 2] {
-
-
-
             set maintainer_name [lindex $maintainer 0]
             set m_email [lindex $maintainer 1]
-            set m_notes [lindex $maintainer 2]
+            set m_notes [lindex $pkg 1]
 
             set maintainer_email($maintainer_name) $m_email
             set maintainer_notes($maintainer_name) $m_notes