X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makePatch;h=132206d8b91516bebe98dea4a422e3d80260c283;hp=ab5913c298593614150d572b085a5f9c2c91f212;hb=38abb9a20f4f9562df117185570646049ce126fb;hpb=8c30bb82b66f26ccf7e261e2c42711251d0d6ccd

diff --git a/makePatch b/makePatch
index ab5913c..132206d 100755
--- a/makePatch
+++ b/makePatch
@@ -8,8 +8,8 @@ use strict;
 use File::Find;
 use File::Path;
 
-my $BaseVersion  = "2.1.0beta2";
-my $PatchLevel   = "pl1";
+my $BaseVersion  = "3.2.0";
+my $PatchLevel   = "pl0";
 my $PatchVersion = "$BaseVersion$PatchLevel";
 
 my $Base         = "/home/craig/admin/packages/BackupPC-$BaseVersion";
@@ -49,7 +49,7 @@ print OUT <<EOF;
 EOF
 
 foreach my $dir ( qw(bin lib cgi-bin) ) {
-    open(DIFF, "diff -ur $Base/$dir $TmpDir/$dir|")
+    open(DIFF, "diff -ur -I '^# Version .*, released ' $Base/$dir $TmpDir/$dir|")
 	    || die("can't run diff\n");
     while ( <DIFF> ) {
 	next if ( /^Only/ || /^diff / );
@@ -74,7 +74,7 @@ sub CopyFile
     open(OUT, ">", "$TmpDir/$file")
                     || die("Can't open $TmpDir/$file for output\n");
     while ( <IN> ) {
-        if ( /^use lib ".*BackupPC\/lib";/
+        if ( /^use lib ".*BackupPC[\d.]*\/lib";/
                 || /^use lib "\/home\/pcbackup\/install\/lib";/ ) {
             print OUT "use lib \"__INSTALLDIR__/lib\";\n";
         } elsif ( $file =~ /Lib.pm/ && /(.*TopDir *=> .*)'.*',/ ) {