Update of /cvsroot/fink/scripts/10.4-update
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28874
Modified Files:
ChangeLog VERSION update.pl
Added Files:
fink-mirrors.info fink.info-10.3 fink.info-10.4
fink.info-10.4-transitional
Log Message:
if we are not installed in /sw, update everything from source rather than
binary. releasing 0.3
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog 17 Jun 2006 21:57:43 -0000 1.12
+++ ChangeLog 18 Jun 2006 05:02:32 -0000 1.13
@@ -2,7 +2,11 @@
* update.pl: edit sources.list, updating a todai entry if it is
present, or giving the user the option to add one (if using the
- unstable tree and installed in /sw)
+ unstable tree and installed in /sw). Also, if we are not installed
+ in /sw, update everything from source rather than binary.
+ * fink.info-*, fink-mirrors.info: needed if we are updating from
+ source.
+ * VERSION: releasing version 0.3
2006-06-17 Dave Morrison <[EMAIL PROTECTED]>
--- NEW FILE: fink-mirrors.info ---
Package: fink-mirrors
Version: 0.24.15.2
Revision: 1
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
Source-MD5: 03b74eece76744f17d1a2c9a85c34c0c
Depends: fink (>= 0.17.3-1)
Replaces: fink (<< 0.17.2-1)
CompileScript: sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl
InstallScript: ./install.sh %i
PostInstScript: %p/lib/fink/mirror/postinstall.pl
#
Description: Mirror infrastructure
DescDetail: <<
The fink-mirrors package keeps a current list of the mirrors which are used
by fink to download sourcefiles.
<<
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Homepage: http://fink.sourceforge.net/
CustomMirror: <<
Primary: http://west.dl.sourceforge.net/sourceforge/
nam-US: http://us.dl.sourceforge.net/sourceforge/
eur: http://eu.dl.sourceforge.net/sourceforge/
<<
--- NEW FILE: fink.info-10.4 ---
Package: fink
Version: 0.24.18
Revision: 31
Depends: base-files
Suggests: <<
term-readkey-pm586
<<
Recommends: <<
apt (>= 0.5.4-41)
<<
Conflicts: gcc3.1 (= 1175-6)
Replaces: gcc3.1 (= 1175-6)
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
Source-MD5: 984fe0cfba184f96a11460312a7576b3
CompileScript: <<
make test
./setup.sh %p
<<
InstallScript: ./install.sh %i
PostInstScript: <<
%p/lib/fink/postinstall.pl
%p/bin/fink --no-use-binary-dist index
<<
#
Description: The Fink package manager
DescPackaging: <<
Don't use mirror:sourceforge so that older package manager versions
which do not know that mirror can still selfupdate.
Must put "make test" before "./setup.sh %p", because make test runs
the setup script itself, but pointed at the testing directory.
The second run of setup.sh properly points fink at the installed
configuration file.
We are using Conflicts/Replaces against gcc3.1 so that the Fink gcc3.1
package is removed (in favor of an Apple-supplied gcc 3.1, represented
by a virtual package).
<<
DescDetail: <<
fink is the Fink project's package manager. It is responsible for
downloading and compiling source and building binary packages from
it. Binary package handling is then delegated to dpkg.
<<
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Homepage: http://fink.sourceforge.net/
CustomMirror: <<
Primary: http://west.dl.sourceforge.net/sourceforge/
nam-US: http://us.dl.sourceforge.net/sourceforge/
eur: http://eu.dl.sourceforge.net/sourceforge/
<<
--- NEW FILE: fink.info-10.3 ---
Package: fink
Version: 0.24.18
Revision: 11
Depends: base-files
Suggests: <<
term-readkey-pm581
<<
Recommends: <<
apt (>= 0.5.4-41)
<<
Conflicts: gcc3.1 (= 1175-6)
Replaces: gcc3.1 (= 1175-6)
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
Source-MD5: 984fe0cfba184f96a11460312a7576b3
CompileScript: <<
make test
./setup.sh %p
<<
InstallScript: ./install.sh %i
PostInstScript: <<
%p/lib/fink/postinstall.pl
%p/bin/fink --no-use-binary-dist index
<<
#
Description: The Fink package manager
DescPackaging: <<
Don't use mirror:sourceforge so that older package manager versions
which do not know that mirror can still selfupdate.
Must put "make test" before "./setup.sh %p", because make test runs
the setup script itself, but pointed at the testing directory.
The second run of setup.sh properly points fink at the installed
configuration file.
We are using Conflicts/Replaces against gcc3.1 so that the Fink gcc3.1
package is removed (in favor of an Apple-supplied gcc 3.1, represented
by a virtual package).
<<
DescDetail: <<
fink is the Fink project's package manager. It is responsible for
downloading and compiling source and building binary packages from
it. Binary package handling is then delegated to dpkg.
<<
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Homepage: http://fink.sourceforge.net/
CustomMirror: <<
Primary: http://west.dl.sourceforge.net/sourceforge/
nam-US: http://us.dl.sourceforge.net/sourceforge/
eur: http://eu.dl.sourceforge.net/sourceforge/
<<
--- NEW FILE: fink.info-10.4-transitional ---
Package: fink
Version: 0.24.18
Revision: 21
Depends: base-files
Suggests: <<
<<
Recommends: <<
apt (>= 0.5.4-41)
<<
Conflicts: gcc3.1 (= 1175-6)
Replaces: gcc3.1 (= 1175-6)
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
Source-MD5: 984fe0cfba184f96a11460312a7576b3
CompileScript: <<
make test
./setup.sh %p
<<
InstallScript: ./install.sh %i
PostInstScript: <<
%p/lib/fink/postinstall.pl
%p/bin/fink --no-use-binary-dist index
<<
#
Description: The Fink package manager
DescPackaging: <<
Don't use mirror:sourceforge so that older package manager versions
which do not know that mirror can still selfupdate.
Must put "make test" before "./setup.sh %p", because make test runs
the setup script itself, but pointed at the testing directory.
The second run of setup.sh properly points fink at the installed
configuration file.
We are using Conflicts/Replaces against gcc3.1 so that the Fink gcc3.1
package is removed (in favor of an Apple-supplied gcc 3.1, represented
by a virtual package).
<<
DescDetail: <<
fink is the Fink project's package manager. It is responsible for
downloading and compiling source and building binary packages from
it. Binary package handling is then delegated to dpkg.
<<
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Homepage: http://fink.sourceforge.net/
CustomMirror: <<
Primary: http://west.dl.sourceforge.net/sourceforge/
nam-US: http://us.dl.sourceforge.net/sourceforge/
eur: http://eu.dl.sourceforge.net/sourceforge/
<<
Index: update.pl
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/update.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- update.pl 17 Jun 2006 21:57:43 -0000 1.14
+++ update.pl 18 Jun 2006 05:02:32 -0000 1.15
@@ -137,8 +137,14 @@
### FINK-UPDATED environment variable)
if (!(exists $ENV{FINK_UPDATED})) {
- &Fink::Services::execute("dpkg -i base-$distribution/fink-mirrors_*");
- &Fink::Services::execute("dpkg -i base-$distribution/fink_*");
+ if ($basepath eq "/sw") {
+ &Fink::Services::execute("dpkg -i
base-$distribution/fink-mirrors_*");
+ &Fink::Services::execute("dpkg -i base-$distribution/fink_*");
+ } else {
+ &Fink::Services::execute("cp fink-mirrors.info
$basepath/fink/dists/local/main/finkinfo");
+ &Fink::Services::execute("cp fink.info-$distribution
$basepath/fink/dists/local/main/finkinfo/fink.info");
+ &Fink::Services::execute("fink index; fink install
fink-mirrors; fink install fink");
+ }
my $cmd = &protect_args('FINK_UPDATED=true ./update.pl',@ARGV);
&Fink::Services::execute($cmd, quiet=>1);
@@ -151,14 +157,22 @@
&Fink::Services::execute("touch $basepath/fink/10.4/stamp-rel-0.8.0");
&Fink::Services::execute("/usr/bin/perl -pi -e \"s|Distribution:
10.3|Distribution: 10.4|\" $basepath/etc/fink.conf");
&Fink::Services::execute("/usr/bin/perl -pi -e \"s|Distribution:
10.4-transitional|Distribution: 10.4|\" $basepath/etc/fink.conf");
-&Fink::Services::execute("dpkg -i
base-10.4/fink_0.24.18-31_darwin-powerpc.deb");
+if ($basepath eq "/sw") {
+ &Fink::Services::execute("dpkg -i
base-10.4/fink_0.24.18-31_darwin-powerpc.deb");
+} else {
+ &Fink::Services::execute("mkdir -p
$basepath/fink/dists/local/main/finkinfo");
+ &Fink::Services::execute("cp fink.info-10.4
$basepath/fink/dists/local/main/finkinfo/fink.info");
+ &Fink::Services::execute("fink index; fink install fink");
+}
## clean out stale deb symlinks
&Fink::Services::execute("rm -f $basepath/fink/debs/*.deb");
## copy some 10.4 debs into place
-&Fink::Services::execute("mkdir -p
$basepath/fink/10.4/stable/main/binary-darwin-powerpc/base");
-&Fink::Services::execute("cp base-10.4/*.deb
$basepath/fink/10.4/stable/main/binary-darwin-powerpc/base");
+if ($basepath eq "/sw") {
+ &Fink::Services::execute("mkdir -p
$basepath/fink/10.4/stable/main/binary-darwin-powerpc/base");
+ &Fink::Services::execute("cp base-10.4/*.deb
$basepath/fink/10.4/stable/main/binary-darwin-powerpc/base");
+}
## edit sources.list
my $path="$basepath/etc/apt/sources.list";
Index: VERSION
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/VERSION,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VERSION 17 Jun 2006 16:28:17 -0000 1.2
+++ VERSION 18 Jun 2006 05:02:32 -0000 1.3
@@ -1 +1 @@
-0.2.cvs
\ No newline at end of file
+0.3.cvs
\ No newline at end of file
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
