Browse Source

use "diff" filetype for .debian.tar.* files (Closes: #554898) in

apt-pkg/deb/debsrcrecords.cc as source format v3 uses this name
scheme for their "diff" files.
debian/1.8.y
David Kalnischkies 13 years ago
parent
commit
164994f54f
  1. 8
      apt-pkg/deb/debsrcrecords.cc
  2. 2
      debian/changelog

8
apt-pkg/deb/debsrcrecords.cc

@ -135,9 +135,15 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
string::size_type Tmp = F.Path.rfind('.',Pos);
if (Tmp == string::npos)
break;
if (F.Type == "tar") {
// source v3 has extension 'debian.tar.*' instead of 'diff.*'
if (string(F.Path, Tmp+1, Pos-Tmp) == "debian")
F.Type = "diff";
break;
}
F.Type = string(F.Path,Tmp+1,Pos-Tmp);
if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma")
if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" || F.Type == "tar")
{
Pos = Tmp-1;
continue;

2
debian/changelog

@ -78,6 +78,8 @@ apt (0.7.25) UNRELEASED; urgency=low
- add https options which default to http ones (Closes: #557085)
* ftparchive/writer.{cc,h}:
- add APT::FTPArchive::LongDescription to be able to disable them
* apt-pkg/deb/debsrcrecords.cc:
- use "diff" filetype for .debian.tar.* files (Closes: #554898)
[ Chris Leick ]
* doc/ various manpages:

Loading…
Cancel
Save