Merge branch 'for-panu'
authorPanu Matilainen <pmatilai@redhat.com>
Tue, 11 Nov 2008 07:25:23 +0000 (09:25 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Tue, 11 Nov 2008 07:25:23 +0000 (09:25 +0200)
* for-panu:
  multiple vendor fingerprints, based on apt-0.5.15cnc6-alt-vendor.patch
  apt-0.5.15cnc6-alt-pkgcachegen.patch
  rpmpm.cc (pkgRPMLibPM::Process): commented out unused code which breaks gcc-4.1
  rpmhandler.cc (RPMHdrHandler::PRCO): fix for rpm-4.0
  aptcallback.cc: RPMCALLBACK_REPACKAGE* available only in rpm >= 4.1

1  2 
apt-pkg/acquire-item.cc
apt-pkg/pkgcachegen.cc
apt-pkg/repository.h
apt-pkg/rpm/aptcallback.cc
apt-pkg/rpm/rpmhandler.cc
apt-pkg/rpm/rpmindexfile.cc
apt-pkg/rpm/rpmpm.cc
apt-pkg/sourcelist.cc
apt-pkg/sourcelist.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge