control: tag -1 patch
Hi,
Here is a trivial patch. Updating the symbols file is a better
solution since neither of the reverse dependencies rely on the changed
symbols. I've tested that doomsday builds fine after this patch.
mrpt does fail to build with g++ 5 (I've submitted bug #794990 about
that), which is due to a different problem, not the symbol change from
this package.
Best wishes,
Mike
diff -Nru assimp-3.0~dfsg/debian/changelog assimp-3.0~dfsg/debian/changelog
--- assimp-3.0~dfsg/debian/changelog 2015-04-27 20:28:02.000000000 +0000
+++ assimp-3.0~dfsg/debian/changelog 2015-08-09 05:12:07.000000000 +0000
@@ -1,3 +1,11 @@
+assimp (3.0~dfsg-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build with g++ 5 and update symbols for the libstdc++ ABI change
+ (closes: #794835).
+
+ -- Michael Gilbert <mgilb...@debian.org> Sat, 08 Aug 2015 20:57:10 +0000
+
assimp (3.0~dfsg-4) unstable; urgency=medium
* Export "ai*" in C++-scope (Closes: #775890)
diff -Nru assimp-3.0~dfsg/debian/control assimp-3.0~dfsg/debian/control
--- assimp-3.0~dfsg/debian/control 2015-04-27 20:26:56.000000000 +0000
+++ assimp-3.0~dfsg/debian/control 2015-08-09 05:04:05.000000000 +0000
@@ -11,6 +11,7 @@
python,
python-dev (>= 2.3.5-7),
dpkg-dev (>= 1.15.6),
+ g++ (>=4:5.2.1-1),
pkg-kde-tools,
cmake,
libboost-dev,
diff -Nru assimp-3.0~dfsg/debian/libassimp3.symbols assimp-3.0~dfsg/debian/libassimp3.symbols
--- assimp-3.0~dfsg/debian/libassimp3.symbols 2015-01-22 23:51:40.000000000 +0000
+++ assimp-3.0~dfsg/debian/libassimp3.symbols 2015-08-09 00:42:07.000000000 +0000
@@ -23,7 +23,6 @@
(c++)"Assimp::DefaultLogger::m_pLogger@Base" 2.0.863
(c++)"Assimp::DefaultLogger::DefaultLogger(Assimp::Logger::LogSeverity)@Base" 2.0.863
(c++)"Assimp::DefaultLogger::~DefaultLogger()@Base" 2.0.863
- (c++|optional)"Assimp::ProgressHandler::~ProgressHandler()@Base" 2.0.863
(c++)"Assimp::Intern::AllocateFromAssimpHeap::operator delete[](void*)@Base" 2.0.863
(c++)"Assimp::Intern::AllocateFromAssimpHeap::operator delete(void*)@Base" 2.0.863
(c++|subst)"Assimp::Intern::AllocateFromAssimpHeap::operator new[]({c++:size_t})@Base" 2.0.863
@@ -34,7 +33,6 @@
(c++)"Assimp::Logger::warn(char const*)@Base" 3.0~
(c++)"Assimp::Logger::debug(char const*)@Base" 3.0~
(c++)"Assimp::Logger::error(char const*)@Base" 3.0~
- (c++|optional)"Assimp::Logger::~Logger()@Base" 2.0.863
(c++)"Assimp::Exporter::ExportToBlob(aiScene const*, char const*, unsigned int)@Base" 3.0~
(c++)"Assimp::Exporter::SetIOHandler(Assimp::IOSystem*)@Base" 3.0~
(c++)"Assimp::Exporter::RegisterExporter(Assimp::Exporter::ExportFormatEntry const&)@Base" 3.0~
@@ -43,8 +41,6 @@
(c++)"Assimp::Exporter::FreeBlob()@Base" 3.0~
(c++)"Assimp::Exporter::Exporter()@Base" 3.0~
(c++)"Assimp::Exporter::~Exporter()@Base" 3.0~
- (c++|optional)"Assimp::IOStream::~IOStream()@Base" 2.0.863
- (c++|optional)"Assimp::IOSystem::~IOSystem()@Base" 2.0.863
(c++)"Assimp::Importer::SetIOHandler(Assimp::IOSystem*)@Base" 2.0.863
(c++)"Assimp::Importer::RegisterLoader(Assimp::BaseImporter*)@Base" 2.0.863
(c++)"Assimp::Importer::RegisterPPStep(Assimp::BaseProcess*)@Base" 2.0.863
@@ -53,7 +49,7 @@
(c++)"Assimp::Importer::SetPropertyFloat(char const*, float, bool*)@Base" 2.0.863
(c++)"Assimp::Importer::UnregisterLoader(Assimp::BaseImporter*)@Base" 2.0.863
(c++)"Assimp::Importer::UnregisterPPStep(Assimp::BaseProcess*)@Base" 2.0.863
- (c++)"Assimp::Importer::SetPropertyString(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool*)@Base" 2.0.863
+ (c++)"Assimp::Importer::SetPropertyString(char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool*)@Base" 3.0~dfsg-4.1
(c++|subst)"Assimp::Importer::ReadFileFromMemory(void const*, {c++:size_t}, unsigned int, char const*)@Base" 2.0.863
(c++)"Assimp::Importer::SetProgressHandler(Assimp::ProgressHandler*)@Base" 2.0.863
(c++)"Assimp::Importer::SetPropertyInteger(char const*, int, bool*)@Base" 2.0.863
@@ -64,7 +60,6 @@
(c++)"Assimp::Importer::Importer()@Base" 2.0.863
(c++)"Assimp::Importer::~Importer()@Base" 2.0.863
(c++)"Assimp::LogStream::createDefaultStream(aiDefaultLogStream, char const*, Assimp::IOSystem*)@Base" 2.0.863
- (c++|optional)"Assimp::LogStream::~LogStream()@Base" 2.0.863
(c++)"Assimp::Exporter::GetIOHandler() const@Base" 3.0~
(c++)"Assimp::Exporter::GetErrorString() const@Base" 3.0~
(c++)"Assimp::Exporter::GetOrphanedBlob() const@Base" 3.0~
@@ -83,7 +78,7 @@
(c++)"Assimp::Importer::GetImporterCount() const@Base" 3.0~
(c++)"Assimp::Importer::GetImporterIndex(char const*) const@Base" 3.0~
(c++)"Assimp::Importer::GetPropertyFloat(char const*, float) const@Base" 2.0.863
- (c++)"Assimp::Importer::GetPropertyString(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 2.0.863
+ (c++)"Assimp::Importer::GetPropertyString(char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 3.0~dfsg-4.1
(c++)"Assimp::Importer::GetProgressHandler() const@Base" 2.0.863
(c++)"Assimp::Importer::GetPropertyInteger(char const*, int) const@Base" 2.0.863
(c++)"Assimp::Importer::IsDefaultIOHandler() const@Base" 2.0.863
