X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makePatch;h=a7681f59d1121b2a16106cee0cbc8cd175855b4d;hp=ab5913c298593614150d572b085a5f9c2c91f212;hb=617af75f7419e95a9c3ea05b05cf21957acc331c;hpb=8c30bb82b66f26ccf7e261e2c42711251d0d6ccd

diff --git a/makePatch b/makePatch
index ab5913c..a7681f5 100755
--- a/makePatch
+++ b/makePatch
@@ -8,7 +8,7 @@ use strict;
 use File::Find;
 use File::Path;
 
-my $BaseVersion  = "2.1.0beta2";
+my $BaseVersion  = "2.1.2";
 my $PatchLevel   = "pl1";
 my $PatchVersion = "$BaseVersion$PatchLevel";
 
@@ -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 *=> .*)'.*',/ ) {