Added --dsc-file option to debian package maker

diff --git a/os_list.txt b/os_list.txt
index a647be8..6eec20a 100644 (file)
--- a/os_list.txt
+++ b/os_list.txt
@@ -63,7 +63,7 @@ BigBlock                      $1      debian-linux    3.0     `cat /etc/bigblock-revision 2>/dev/null` =~ /Vers
 Ubuntu Linux                   $1      debian-linux    3.1     $etc_issue =~ /Ubuntu.*\s([0-9\.]+)\s/i
 
 # Debian Linux versions with numbers
-Debian Linux                   $1      debian-linux    $1      $etc_issue =~ /Debian.*\s([0-9\.]+)\s/i
+Debian Linux                   $1      debian-linux    $1      $etc_issue =~ /Debian.*\s([0-9\.]+)\s/i || `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/
 Debian Linux                   3.2     debian-linux    3.2     $etc_issue =~ /Debian.*\stesting\/unstable\s/i
 Debian Linux                   4.0     debian-linux    4.0     $etc_issue =~ /Debian.*lenny\/sid\s/i
 
@@ -92,8 +92,8 @@ Mandrake Linux Corporate Server       1.0     redhat-linux    6.2     $etc_issue =~ /Mandrake\s+C
 
 # Mandrake derivatives
 pclinuxos Linux                        2005    mandrake-linux  10.0    `cat /etc/mandrake-release 2>/dev/null` =~ /pclinuxos\s+Linux\s+release\s+2005/i
-pclinuxos Linux                        2006    mandrake-linux  10.0    `cat /etc/mandrake-release 2>/dev/null` =~ /pclinuxos\s+Linux\s+release\s+2006/i
-pclinuxos Linux                        2007    mandrake-linux  10.0    `cat /etc/mandrake-release 2>/dev/null` =~ /PCLinuxOS\s+release\s+2007/i
+pclinuxos Linux                        2006    mandrake-linux  10.2    `cat /etc/mandrake-release 2>/dev/null` =~ /pclinuxos\s+Linux\s+release\s+2006/i
+pclinuxos Linux                        2007    mandrake-linux  10.3    `cat /etc/mandrake-release 2>/dev/null` =~ /PCLinuxOS\s+release\s+2007/i
 
 # Mandrake Linux
 Mandrake Linux                 5.3     redhat-linux    5.0     $etc_issue =~ /Mandrake\s+release\s+5\.3/i

diff --git a/software/find.cgi b/software/find.cgi
index 08f1673..826c2cb 100755 (executable)
--- a/software/find.cgi
+++ b/software/find.cgi
@@ -38,8 +38,10 @@ if ($search) {
        @avail = sort { lc($a->{'name'}) cmp lc($b->{'name'}) } @avail;
 
        if (@avail) {
-               $hasdesc = $avail[0]->{'desc'};
-               $hasver = $avail[0]->{'version'};
+               foreach $a (@avail) {
+                       $hasdesc++ if ($a->{'desc'});
+                       $hasver++ if ($a->{'version'});
+                       }
                print &ui_columns_start(
                        [ $text{'find_name'},
                          $hasver ? ($text{'find_version'}) : ( ),

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index aa7ac7d..03fe01a 100755 (executable)
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -1937,6 +1937,7 @@ sub unflush_file_lines
 {
 local $realfile = &translate_filename($_[0]);
 delete($main::file_cache{$realfile});
+delete($main::file_cache_noflush{$realfile});
 }
 
 # unix_user_input(fieldname, user, [form])