apt/apt-0.5.15cnc6-alt-defaults.patch
Kachalov Anton 6e5c25c245 0.5.15cnc6-alt1
- Updated to 0.5.15cnc6
- New:
  + apt-0.5.15cnc6-alt-rpm-order (fix RPM::Order default value)
- Updated:
  + apt-0.5.15cnc6-alt-fixes
  + apt-0.5.15cnc6-alt-defaults
  + apt-0.5.15cnc6-alt-rpm-fancypercent
  + apt-0.5.15cnc6-alt-virtual_scores
- Merged upstream:
  + apt-0.5.15cnc6-alt-install_virtual
2004-05-13 12:23:54 +00:00

29 lines
964 B
Diff

diff -upr apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmpackagedata.cc apt-0.5.15cnc6/apt-pkg/rpm/rpmpackagedata.cc
--- apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmpackagedata.cc 2004-03-09 04:44:08 +1200
+++ apt-0.5.15cnc6/apt-pkg/rpm/rpmpackagedata.cc 2004-04-13 19:47:27 +1300
@@ -21,7 +21,7 @@ RPMPackageData::RPMPackageData()
#endif
{
// Populate priorities
- string FileName = _config->FindFile("Dir::Etc::rpmpriorities");
+ string FileName = _config->FindFile("Dir::Etc") + "pkgpriorities";
FileFd F(FileName, FileFd::ReadOnly);
if (_error->PendingError())
{
diff -upr apt-0.5.15cnc6.orig/buildlib/archtable apt-0.5.15cnc6/buildlib/archtable
--- apt-0.5.15cnc6.orig/buildlib/archtable 2003-04-15 06:15:31 +1300
+++ apt-0.5.15cnc6/buildlib/archtable 2004-04-13 19:50:20 +1300
@@ -5,8 +5,10 @@
# The left side is a regex for awk
-i.86 i386
-pentium i386
+i[34]86 i386
+i.86 i586
+pentium.* i586
+athlon i586
sparc sparc
sparc64 sparc
alpha.* alpha