Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17661
Modified Files:
apt.info apt.patch
Added Files:
fvp.patch
Log Message:
fully working and tested apt upgrade, it required my dpkg branch to be used and
my fvp.patch since it requires a more complete status file from
fink-virtual-pkgs
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apt.patch 20 Jun 2013 22:40:51 -0000 1.2
+++ apt.patch 21 Jun 2013 04:13:59 -0000 1.3
@@ -541,8 +541,8 @@
+ echo "$TESTFAIL"
diff -ruN apt-0.9.8.2.orig/fink/patches/f-v-p.patch
apt-0.9.8.2/fink/patches/f-v-p.patch
--- apt-0.9.8.2.orig/fink/patches/f-v-p.patch 1969-12-31 17:00:00.000000000
-0700
-+++ apt-0.9.8.2/fink/patches/f-v-p.patch 2013-06-20 14:52:56.000000000
-0600
-@@ -0,0 +1,496 @@
++++ apt-0.9.8.2/fink/patches/f-v-p.patch 2013-06-20 21:07:38.000000000
-0600
+@@ -0,0 +1,520 @@
+diff -ruN apt-0.9.8.2.darwin/apt-pkg/deb/debindexfile.cc
apt-0.9.8.2.f-v-p/apt-pkg/deb/debindexfile.cc
+--- apt-0.9.8.2.darwin/apt-pkg/deb/debindexfile.cc 2013-06-06
11:25:59.000000000 -0600
++++ apt-0.9.8.2.f-v-p/apt-pkg/deb/debindexfile.cc 2013-06-20
09:12:54.000000000 -0600
@@ -571,7 +571,7 @@
++}
+diff -ruN apt-0.9.8.2.darwin/apt-pkg/deb/debsystem.cc
apt-0.9.8.2.f-v-p/apt-pkg/deb/debsystem.cc
+--- apt-0.9.8.2.darwin/apt-pkg/deb/debsystem.cc 2013-06-06
11:25:59.000000000 -0600
-++++ apt-0.9.8.2.f-v-p/apt-pkg/deb/debsystem.cc 2013-06-20
14:52:53.000000000 -0600
+++++ apt-0.9.8.2.f-v-p/apt-pkg/deb/debsystem.cc 2013-06-20
18:28:44.000000000 -0600
+@@ -26,6 +26,113 @@
+
+ #include <apti18n.h>
@@ -780,18 +780,21 @@
+ return true;
+ }
+ /*}}}*/
-+@@ -235,12 +401,16 @@
++@@ -235,12 +401,18 @@
+ bool debSystem::FindIndex(pkgCache::PkgFileIterator File,
+ pkgIndexFile *&Found) const
+ {
+- if (d->StatusFile == 0)
-++ if (d->StatusFile == 0 && f->StatusFile == 0)
+++ if (d->StatusFile == 0) {
+ return false;
-+ if (d->StatusFile->FindInCache(*File.Cache()) == File)
++- if (d->StatusFile->FindInCache(*File.Cache()) == File)
+++ } else if (d->StatusFile->FindInCache(*File.Cache()) == File)
+ {
+ Found = d->StatusFile;
+ return true;
-++ } else if (f->StatusFile->FindInCache(*File.Cache()) == File)
+++ } else if (f->StatusFile == 0) {
+++ return false;
+++ } else if (f->StatusFile->FindInCache(*File.Cache()) == File)
++ {
++ Found = f->StatusFile;
++ return true;
@@ -859,8 +862,18 @@
+ AR:=@AR@
+diff -ruN apt-0.9.8.2.darwin/cmdline/apt-get.cc
apt-0.9.8.2.f-v-p/cmdline/apt-get.cc
+--- apt-0.9.8.2.darwin/cmdline/apt-get.cc 2013-06-19 22:30:46.000000000
-0600
-++++ apt-0.9.8.2.f-v-p/cmdline/apt-get.cc 2013-06-19 22:31:23.000000000
-0600
-+@@ -360,7 +360,14 @@
+++++ apt-0.9.8.2.f-v-p/cmdline/apt-get.cc 2013-06-20 21:07:36.000000000
-0600
++@@ -258,7 +258,8 @@
++ */
++ void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
++ {
++- if (Cache->BrokenCount() == 0)
+++ // FINK LOCAL added APT::Get::Ignore-Breakage test
+++ if (Cache->BrokenCount() == 0 ||
_config->FindB("APT::Get::Ignore-Breakage") == true)
++ return;
++
++ out << _("The following packages have unmet dependencies:") << endl;
++@@ -360,7 +361,14 @@
+ if (Cache[Targ].CandidateVerIter(Cache).end() == true)
+ {
+ if (Targ->ProvidesList == 0)
@@ -876,17 +889,18 @@
+ else
+ out << _("but it is a virtual package");
+ }
-+@@ -846,7 +853,8 @@
++@@ -846,7 +854,9 @@
+
+ // Install it with autoinstalling enabled (if we not respect the minial
+ // required deps or the policy)
+- if (FixBroken == false)
+++ // FINK LOCAL added APT::Get::Ignore-Breakage test
++ if (FixBroken == false
++ && _config->FindB("APT::Get::Ignore-Breakage") == false)
+ doAutoInstallLater.insert(Pkg);
+ }
+
-+@@ -1020,7 +1028,9 @@
++@@ -1020,7 +1030,9 @@
+ }
+
+ // Nothing is broken
@@ -897,7 +911,7 @@
+ return true;
+
+ // Attempt to fix broken things
-+@@ -1129,7 +1139,9 @@
++@@ -1129,7 +1141,9 @@
+ Stats(c1out,Cache);
+
+ // Sanity check
@@ -908,7 +922,7 @@
+ {
+ ShowBroken(c1out,Cache,false);
+ return _error->Error(_("Internal error, InstallPackages was called
with broken packages!"));
-+@@ -1954,7 +1966,9 @@
++@@ -1954,7 +1968,9 @@
+ /* If we are in the Broken fixing mode we do not attempt to fix the
+ problems. This is if the user invoked install without -f and gave
+ packages */
@@ -919,7 +933,7 @@
+ {
+ c1out << _("You might want to run 'apt-get -f install' to correct
these:") << endl;
+ ShowBroken(c1out,Cache,false);
-+@@ -1972,7 +1986,8 @@
++@@ -1972,7 +1988,8 @@
+ }
+
+ // Now we check the state of the packages,
@@ -929,7 +943,17 @@
+ {
+ c1out <<
+ _("Some packages could not be installed. This may mean that you
have\n"
-+@@ -3489,6 +3504,8 @@
++@@ -3129,7 +3146,8 @@
++ }
++
++ Fix.InstallProtect();
++- if (Fix.Resolve(true) == false)
+++ // FINK LOCAL added APT::Get::Ignore-Breakage test
+++ if (_config->FindB("APT::Get::Ignore-Breakage") == false &&
Fix.Resolve(true) == false)
++ _error->Discard();
++
++ // Now we check the state of the packages,
++@@ -3489,6 +3507,8 @@
+ {'y',"assume-yes","APT::Get::Assume-Yes",0},
+ {0,"assume-no","APT::Get::Assume-No",0},
+ {'f',"fix-broken","APT::Get::Fix-Broken",0},
@@ -938,7 +962,7 @@
+ {'u',"show-upgraded","APT::Get::Show-Upgraded",0},
+ {'m',"ignore-missing","APT::Get::Fix-Missing",0},
+ {'t',"target-release","APT::Default-Release",CommandLine::HasArg},
-+@@ -3568,6 +3585,22 @@
++@@ -3568,6 +3588,22 @@
+ return 0;
+ }
+
--- NEW FILE: fvp.patch ---
--- fink-virtual-pkgs.in 2013-06-20 22:05:35.000000000 -0600
+++ ../fink.thesin/fink-virtual-pkgs.in 2013-06-20 22:02:37.000000000 -0600
@@ -70,11 +70,35 @@
}
}
} else {
- printf "Package: %s\nStatus: %s\nVersion: %s\n",
$hash->{package},$hash->{status},$hash->{version};
+ printf "Package: %s\nStatus: %s\nPriority:
optional\nArchitecture: all\nVersion: %s\nMaintainer: Fink Devel
<fink-devel\@lists.sourceforge.net>\n",
$hash->{package},$hash->{status},$hash->{version};
foreach $field (keys %$hash)
{
- next if ($field =~
/^(package|status|version|descdetail|compilescript)$/);
- printf "%s: %s\n",$field,$hash->{$field};
+ next if ($field =~
/^(package|status|version|descdetail|compilescript|homepage)$/);
+ if ($field eq "description") {
+ printf "Description:
%s\n",$hash->{$field};
+ if ($hash->{'descdetail'}) {
+ my $descdetail =
$hash->{'descdetail'};
+ chomp($descdetail);
+ my @descdetails;
+ foreach my $line (split("\n",
$descdetail)) {
+ if ($line eq "" ||
$line =~ /^[\s|\t]+?$/) {
+ $line = ".";
+ }
+ $line = " ".$line;
+ push @descdetails,
$line;
+ }
+ $descdetail = join("\n",
@descdetails);
+ printf "%s\n",$descdetail;
+ }
+ if ($hash->{'homepage'}) {
+ printf " .\n";
+ printf " Web site:
%s\n",$hash->{'homepage'};
+ }
+ printf " .\n";
+ printf " Maintainer: Fink Devel
<fink-devel\@lists.sourceforge.net>\n";
+ } else {
+ printf "%s: %s\n",ucfirst
$field,$hash->{$field};
+ }
}
print "\n";
}
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apt.info 20 Jun 2013 22:40:51 -0000 1.3
+++ apt.info 21 Jun 2013 04:13:59 -0000 1.4
@@ -31,7 +31,7 @@
<<
PatchFile: %n.patch
-PatchFile-MD5: b18c35c99ff963379180b9c67e1ff3fd
+PatchFile-MD5: 5eb84aed1a18fdae5a85a33fac572d96
PatchScript: <<
osxversion=$(sw_vers -productVersion | perl -pi -e 's,(\d\.\d)(\.\d)+?,$1,g');
\
sed -e 's|@FINKPREFIX@|%p|g' -e "s|@DIST@|$osxversion|g" < %{PatchFile} |
patch -p1
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
