fink bootstrap.pl,1.49.2.1.2.2,1.49.2.1.2.3

[David R. Morrison]

Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2320

Modified Files:
      Tag: apt_sources
        bootstrap.pl 
Log Message:
we no longer use the local/bootstrap tree


Index: bootstrap.pl
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap.pl,v
retrieving revision 1.49.2.1.2.2
retrieving revision 1.49.2.1.2.3
diff -u -d -r1.49.2.1.2.2 -r1.49.2.1.2.3
--- bootstrap.pl        7 Jul 2004 19:05:39 -0000       1.49.2.1.2.2
+++ bootstrap.pl        8 Jul 2004 17:12:01 -0000       1.49.2.1.2.3
@@ -313,7 +313,7 @@
 
 @dirlist = qw(etc etc/alternatives src fink fink/debs);
 push @dirlist, "fink/$distribution", "fink/$distribution/stable", 
"fink/$distribution/local";
-foreach $dir (qw(local/bootstrap stable/main stable/crypto local/main)) {
+foreach $dir (qw(stable/main stable/crypto local/main)) {
        push @dirlist, "fink/$distribution/$dir", "fink/$distribution/$dir/finkinfo",
                "fink/$distribution/$dir/binary-darwin-$arch";
 }
@@ -341,9 +341,10 @@
 
 ### copy package info needed for bootstrap
 
-$script = "/bin/cp $distribution/*.info $distribution/*.patch 
$installto/fink/dists/local/bootstrap/finkinfo/\n";
+$script = "/bin/mkdir -p $installto/fink/dists/stable/main/finkinfo/base\n ";
+$script .= "/bin/cp $distribution/*.info $distribution/*.patch 
$installto/fink/dists/stable/main/finkinfo/base/\n";
 
-$result = &copy_description($script,$installto, "fink", $packageversion, 
$packagerevision);
+$result = &copy_description($script,$installto, "fink", $packageversion, 
$packagerevision, "stable/main/finkinfo/base");
 if ($result == 1 ) {
        exit 1;
 }
@@ -366,7 +367,7 @@
 # Fink configuration, initially created by bootstrap.pl
 Basepath: $installto
 RootMethod: $rootmethod
-Trees: local/main stable/main stable/crypto local/bootstrap
+Trees: local/main stable/main stable/crypto
 Distribution: $distribution
 EOF
 close(CONFIG) or die "can't write configuration: $!";
@@ -386,6 +387,10 @@
 
 Fink::Bootstrap::bootstrap();
 
+### remove dpkg-bootstrap.info, to avoid later confusion
+
+&execute("/bin/rm -f 
$installto/fink/dists/stable/main/finkinfo/base/dpkg-bootstrap.info");
+
 ### copy included package info tree if present
 
 my $showversion = "";



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits