X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=edc3c437c1fdc37ba653851959adc4757587b0fa;hp=55ae42c8e17f916c35553cfd68d9201f76bedb0d;hb=e951f787a66c5bd9e9955c3f657a5b44289c0fe1;hpb=3ae3b7557db4829ebfc6f580ceac30376717db6a

diff --git a/makeDist b/makeDist
index 55ae42c..edc3c43 100755
--- a/makeDist
+++ b/makeDist
@@ -42,8 +42,8 @@ use Getopt::Std;
 
 umask(0022);
 
-my $Version     = "2.1.0_CVS";
-my $ReleaseDate = "13 Mar 2004";
+my $Version     = "2.1.0";
+my $ReleaseDate = "20 Jun 2004";
 my $DistDir     = "dist/BackupPC-$Version";
 
 my @PerlSrc = qw(
@@ -92,6 +92,7 @@ my @PerlSrc = qw(
     lib/BackupPC/Lang/es.pm
     lib/BackupPC/Lang/fr.pm
     lib/BackupPC/Lang/it.pm
+    lib/BackupPC/Lang/nl.pm
     lib/BackupPC/Xfer/Archive.pm
     lib/BackupPC/Xfer/Smb.pm
     lib/BackupPC/Xfer/Tar.pm
@@ -188,6 +189,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
@@ -209,6 +211,8 @@ system("cd dist ; tar zcf BackupPC-$Version.tar.gz BackupPC-$Version");
 print("Distribution written to dist/BackupPC-$Version.tar.gz\n");
 unlink("pod2htmd.x~~");
 unlink("pod2htmi.x~~");
+unlink("pod2htmd.tmp");
+unlink("pod2htmi.tmp");
 
 ###########################################################################
 # Subroutines
@@ -227,28 +231,29 @@ 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
+		# Fixup for perl 5.8.x first one no longer needed after
+		# fix in CSS)
 		#
-		if ( /^<\/dt>/ ) {
-		    $_ .= <FILE>;
-		    s/^(<\/dt>\n<dd>)/$1<p>/s;
-		}
+#		if ( /^<\/dt>/ ) {
+#		    $_ .= <FILE>;
+#		    s/^(<\/dt>\n<dd>)/$1<p>/s;
+#		}
 		s/^<li><\/li>/<li>/;
 	    }
 	    if ( /__CONFIGPOD__/ ) {
@@ -406,6 +411,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++;
@@ -437,7 +443,7 @@ sub CheckLangTags
     my($en, $enVars) = LangParse("lib/BackupPC/Lang/en.pm");
     my($errors);
 
-    foreach my $lang ( qw(fr.pm de.pm es.pm it.pm) ) {
+    foreach my $lang ( qw(fr.pm de.pm es.pm it.pm nl.pm) ) {
 	my($d, $dVars) = LangParse("lib/BackupPC/Lang/$lang");
 	foreach my $v1 ( @$en ) {
 	    my $v2 = shift(@$d);