diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 27 | ||||
| -rw-r--r-- | debian/gbp.conf | 1 | ||||
| -rw-r--r-- | debian/libapt-pkg4.12.symbols | 82 |
3 files changed, 104 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 525a50f30..eba44dea4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,31 @@ -apt (0.9.13.1ubuntu1) trusty; urgency=low +apt (0.9.14ubuntu1) trusty; urgency=low * Merged from debian/sid - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Nov 2013 22:59:22 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 07 Dec 2013 17:53:59 +0100 + +apt (0.9.14) unstable; urgency=low + + [ David Kalnischkies ] + * merge ubuntus apport reporting changes to reduce diff + * enable NOISE for build logs to enable analyse + * introduce a vendor system to change sources.list + * add a vendor specific file to have configurable entities + * use a substvar to set the archive-keyring in debian/control + * cherry-pick ubuntus (disabled) net-update fixes + * generate apt-key script with vendor info about keys + * drop old /var/state to /var/lib transition artefacts + + [ Steve Langasek ] + * prepare-release: declare the packages needed as source build deps. + + [ Michael Vogt ] + * enable release based selection for deb-src (closes: 731102) + * document Dpkg::Progress-Fancy (closes: 726169), thanks to James McCoy + * vendor/makefile: fix build error for parallel builds + * Handle SIGWINCH in APT::Progress-Fancy=1 + + -- Michael Vogt <mvo@debian.org> Sat, 07 Dec 2013 14:54:31 +0100 apt (0.9.13.1) unstable; urgency=low diff --git a/debian/gbp.conf b/debian/gbp.conf index a9da2423b..0b205c1fd 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,5 @@ [DEFAULT] prebuild = ./prepare-release pre-export postbuild = ./prepare-release post-build -export-dir = ../build-area debian-branch = ubuntu/master debian-tag = %(version)s diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 2b86c9676..af43a7b07 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -698,11 +698,9 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"metaIndex::~metaIndex()@Base" 0.8.0 (c++)"pkgDPkgPM::SendV2Pkgs(_IO_FILE*)@Base" 0.8.0 (c++)"pkgDPkgPM::DoTerminalPty(int)@Base" 0.8.0 - (c++)"pkgDPkgPM::DoDpkgStatusFd(int, int)@Base" 0.8.0 (c++)"pkgDPkgPM::WriteHistoryTag(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0 (c++)"pkgDPkgPM::WriteApportReport(char const*, char const*)@Base" 0.8.0 (c++)"pkgDPkgPM::RunScriptsWithPkgs(char const*)@Base" 0.8.0 - (c++)"pkgDPkgPM::ProcessDpkgStatusLine(int, char*)@Base" 0.8.0 (c++)"pkgDPkgPM::handleDisappearAction(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0 (c++)"pkgDPkgPM::Go(int)@Base" 0.8.0 (c++)"pkgDPkgPM::Reset()@Base" 0.8.0 @@ -1453,6 +1451,67 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"vtable for APT::PackageContainerInterface@Base" 0.8.16~exp9 (c++)"vtable for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9 (c++)"vtable for APT::VersionContainerInterface@Base" 0.8.16~exp9 +### rework of the packagemanager rework + (c++)"APT::Progress::PackageManager::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::GetNumberTerminalRows()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::HandleSIGWINCH(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::Start()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::GetPulseInterval()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::~PackageManager()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::~PackageManagerProgressDeb822Fd()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::PackageManagerProgressDeb822Fd(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::StartDpkg()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFactory()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::~PackageManagerProgressFd()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::PackageManagerProgressFd(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::StartDpkg()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Start()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerText::~PackageManagerText()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerText::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 + (c++)"APT::String::Strip(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.9.13~exp1 + (c++)"APT::Upgrade::Upgrade(pkgDepCache&, int)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::BuildPackagesProgressMap()@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::DoDpkgStatusFd(int)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager*)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::ProcessDpkgStatusLine(char*)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::StartPtyMagic()@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::StopPtyMagic()@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManager@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManager@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManager@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 ### mixed stuff (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp13 (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10 @@ -1493,12 +1552,29 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 (c++)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1 (c++)"pkgCache::VerIterator::MultiArchType() const@Base" 0.9.9.1 + (c++)"CommandLine::GetCommand(CommandLine::Dispatch const*, unsigned int, char const* const*)@Base" 0.9.11 + (c++)"CommandLine::MakeArgs(char, char const*, char const*, unsigned long)@Base" 0.9.11 + (c++)"Configuration::Clear()@Base" 0.9.11 + (c++)"Glob(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0.9.11 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::GrpIterator const&)@Base" 0.9.11 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::PkgIterator const&)@Base" 0.9.11 + (c++)"APT::PackageContainerInterface::FromFnmatch(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.9.11 + (c++|optional=private)"pkgTagFile::Resize(unsigned long long)@Base" 0.9.11 + (c++)"pkgTagSection::pkgTagSection()@Base" 0.9.11 + (c++)"strv_length(char const**)@Base" 0.9.11 + (c++)"StringSplit(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0.9.11.3 + (c++)"pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState)@Base" 0.9.12 + (c++)"APT::String::Endswith(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.9.13.1 + (c++)"ExecFork(std::set<int, std::less<int>, std::allocator<int> >)@Base" 0.9.13.1 + (c++)"MergeKeepFdsFromConfiguration(std::set<int, std::less<int>, std::allocator<int> >&)@Base" 0.9.13.1 + (c++)"HashString::FromFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13.1 + (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1 + (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0 ### gcc artefacts (c++|regex|optional=std)"^std::vector<DiffInfo, .+@Base$" 0.8.0 (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 - (c++|optional=std)"std::ctype<char>::widen(char) const@Base" 0.8.0 (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<char const*>(char const*, char const*, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0 |