Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base
In directory vz-cvs-3.sog:/tmp/cvs-serv23641
Modified Files:
apt.info apt.patch
Log Message:
fix formal-variable name-collision/mismatch in prototype
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/apt.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- apt.patch 13 May 2011 07:58:27 -0000 1.8
+++ apt.patch 21 May 2011 04:06:46 -0000 1.9
@@ -456,6 +456,18 @@
vector<pkgIndexFile *> Files(List.begin(),List.end());
unsigned long EndOfSource = Files.size();
+diff -urN apt-0.5.4.orig/apt-pkg/pkgcachegen.h apt-0.5.4/apt-pkg/pkgcachegen.h
+--- apt-0.5.4.orig/apt-pkg/pkgcachegen.h 2001-02-20 02:03:17.000000000
-0500
++++ apt-0.5.4/apt-pkg/pkgcachegen.h 2011-05-21 00:01:31.000000000 -0400
+@@ -50,7 +50,7 @@
+ string PkgFileName;
+ pkgCache::PackageFile *CurrentFile;
+
+- bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
++ bool NewPackage(pkgCache::PkgIterator &Pkg,string Name);
+ bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
+ unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned
long Next);
+
diff -urN apt-0.5.4.orig/apt-pkg/policy.cc apt-0.5.4/apt-pkg/policy.cc
--- apt-0.5.4.orig/apt-pkg/policy.cc 2001-05-28 08:40:56.000000000 +0900
+++ apt-0.5.4/apt-pkg/policy.cc 2005-03-08 13:00:38.000000000 +0900
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/apt.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- apt.info 13 May 2011 07:58:27 -0000 1.15
+++ apt.info 21 May 2011 04:06:46 -0000 1.16
@@ -8,7 +8,7 @@
Source-MD5: 274fb64e2e67318b4c9c94599785c37d
SourceDirectory: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: 9cdb4ed3be59c5b2a69aa294a8c61b1a
+PatchFile-MD5: 6b83d9ba0b19aa525de8f39603938c97
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' < %{PatchFile} | patch -p1
sh patch_flush
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
