X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=2ed1a08a7f3aeb8a56868b2216c8ee5a10aabcfe;hp=e58c2162564d18d07b4336feb62dba3be5a58b01;hb=1a2fa2c2a1e0db12dc788216d9f3ba73301a131f;hpb=ce708288691ba7dd95a8dac7a468bc0e4c1d6588

diff --git a/makeDist b/makeDist
index e58c216..2ed1a08 100755
--- a/makeDist
+++ b/makeDist
@@ -42,8 +42,8 @@ use Getopt::Std;
 
 umask(0022);
 
-my $Version     = "2.1.0beta0";
-my $ReleaseDate = "20 Mar 2004";
+my $Version     = "2.1.0beta2";
+my $ReleaseDate = "20 May 2004";
 my $DistDir     = "dist/BackupPC-$Version";
 
 my @PerlSrc = qw(
@@ -188,6 +188,7 @@ foreach my $file ( (@PerlSrc,
 	    qw(
 		conf/config.pl
 		conf/hosts
+		conf/BackupPC_stnd.css
 		init.d/README
 		init.d/src/debian-backuppc
 		init.d/src/gentoo-backuppc
@@ -227,20 +228,20 @@ sub InstallFile
 	binmode(FILE);
 	binmode(OUT);
 	while ( <FILE> ) {
-	    s/^# *Version \d+\.\d+[\.\w]*, released \d+ \w+ \d{4}\.?/# Version __VERSION__, released __RELEASEDATE__./;
+	    s/^([#*\s]+)Version \d+\.\d+[\.\w]*, released \d+ \w+ \d{4}\.?/$1Version __VERSION__, released __RELEASEDATE__./;
 	    s/__VERSION__/$Version/g;
 	    s/__RELEASEDATE__/$ReleaseDate/g;
 	    if ( $file =~ /BackupPC\.html$/ ) {
 		#
 		# fixup for perl 5.6.x
 		#
-		if ( !/A NAME="item_%24Conf/i ) {
+		if ( !/A NAME="item_(%|_)24Conf/i ) {
 		    s/\$Conf{([^}]*)}/
 			defined($ConfName{$1})
 			    ? "\L<A HREF=\"#$ConfName{$1}\">\E\$Conf{$1}<\/A>"
 			    : "\$Conf{$1}"/eg;
 		}
-		s/<(A NAME="item_%24Conf%7B.*?%7D).*?">/\L<$1">/ig;
+		s/<(A NAME="item_(%|_)24Conf(%|_)7B(.*?)(%|_)7D).*?">/\L<A NAME="item_%24Conf%7b$4%7d">/ig;
 		s/^<DD>/<DD><P>/;
 		#
 		# fixup for perl 5.8.x
@@ -406,6 +407,7 @@ sub CheckLangUsage
             s/\$Lang{([^}]*)}/
 		    my $var = $1;
 		    next if ( $var =~ m{^(Reason_|Status_|backupType_)} );
+		    next if ( $var eq "Documentation" );
                     if ( !defined($vars->{$var}) ) {
                         print("Unexpected Lang var $var in $f\n");
                         $errors++;