Fixed wording.

[www.jankratochvil.net.git] / project / captive / CVS.html.pl

diff --git a/project/captive/CVS.html.pl b/project/captive/CVS.html.pl
index 5ddca3d..ffcc660 100755 (executable)
--- a/project/captive/CVS.html.pl
+++ b/project/captive/CVS.html.pl
@@ -67,11 +67,12 @@ my %pkg=(
                3=>[qw(captive)],
                );
 my %version=(
-               map(($_=>["1.1.2","0"]),qw(captive captive-lufs captive-install)),
-               "lufs"=>["0.9.7","1captive7"],
+               map(($_=>["1.1.5","0"]),qw(captive captive-lufs captive-install)),
+               "lufs"=>["0.9.7","1captive8"],
                "gnome-vfs-httpcaptive"=>["2.3.8captive2","0"],
                "ntfsprogs"=>["200309071734","1captive1"],
                "ntfsprogs-gnomevfs"=>["1.0.2","0"],
+               "build-captive-static"=>"2003-12-14-00",
                );
 my %has_devel=(map(($_=>1),qw(
                ntfsprogs
@@ -102,19 +103,6 @@ my $ntfsprogs_after=sub ($) {
 
 my @dist=(
                {
-                       "name"=>"Debian GNU/Linux<br />'unstable' i386",
-                       "id"=>"debian",
-                       "out"=>sub {
-                               my($pkg,$version_base,$version_ext)=@_;
-                                       $version_ext=~s/^\d+//;
-                                       my $file="${pkg}_$version_base".($version_ext=~/^\d+$/ ? "" : $version_ext)."_i386.deb";
-                                       my $r=&$a_href_arch("dist/$file",$file);
-                                       (my $filedev=$file)=~s/^\Q$pkg\E_/${pkg}-dev_/;
-                                       $r.="<br />".&$a_href_arch("dist/$filedev",$filedev) if $has_devel{$pkg};
-                                       return $r;
-                               },
-                       },
-               {
                        "name"=>"Sources (.tar.gz)",
                        "id"=>"source",
                        "out"=>sub {
@@ -143,11 +131,39 @@ for my $dist (@dist) {
        print "</tr></a>\n";
        }
 print <<"HERE";
+       <tr>
+               <td>'captive-static' build<br />system patches for Red Hat 9 Shrike<br />(never needed for a&nbsp;regular build)</td>
+               <td colspan="3">
+HERE
+my $build_static_basename=(map("$_-".$version{$_}.".tar.gz","build-captive-static"))[0];
+print a_href "dist/$build_static_basename",$build_static_basename;
+print <<"HERE";
+               </td>
+       </tr>
 </table>
 
 @{[ vskip "3ex" ]}
 
 
+<h2>Pending Integrations</h2>
+
+<dl>
+       <dt>@{[ a_href $W->{"project_viewcvs"}.'/lufs/','lufs-captive' ]}
+                       [@{[ a_href $W->{"project_viewcvs"}.'/*checkout*/lufs/NEWS.captive?rev=1.1.2.11','NEWS' ]}]
+       <dd>
+               <p>@{[ a_href 'http://lufs.sourceforge.net/lufs/','LUFS' ]} still has not yet integrated
+                               the Captive-developed patches. No integration schedule is currently known.</p>
+               <ul>
+                       <li>Linux kernel module has implemented support for statfs(2)/df(1)</li>
+                       <li>Many fixes of the userland lufsd(8) daemon</li>
+                       <li>Scripts for unattended Linux kernel module prebuilds/compilation/installation</li>
+               </ul>
+               <p>The recommended way is to port Captive project to maintained
+               @{[ a_href 'http://fuse.sourceforge.net/','FUSE' ]}.</p>
+       </dd>
+</dl>
+
+
 <h1>@{[ a_href './','Back to Captive Main Page' ]}</h1>
 
 HERE