diff --git a/debian/changelog b/debian/changelog index 441f5d4..547f7c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +qtermwidget (0.7.0-3) experimental; urgency=medium + + * Followed Multiarch hinter suggestions + - qtermwidget5-data marked as Multi-Arch: foreign + - libqtermwidget5-0 marked as Multi-Arch: same + - libqtermwidget5-0-dev marked as Multi-Arch: same + * simplify optional symbols + + -- Alf Gaida Tue, 27 Sep 2016 18:03:03 +0200 + qtermwidget (0.7.0-2) experimental; urgency=medium * Mark some symbols optional diff --git a/debian/control b/debian/control index 80694d1..ad4a7d3 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Homepage: https://github.com/lxde/qtermwidget Package: libqtermwidget5-0 Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, qtermwidget5-data (= ${source:Version}), @@ -28,6 +29,7 @@ Description: Terminal emulator widget for Qt 5 (shared libraries) Package: libqtermwidget5-0-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, libqtermwidget5-0 (= ${binary:Version}), @@ -39,6 +41,7 @@ Description: Terminal emulator widget for Qt 5 (development files) Package: qtermwidget5-data Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, Description: Terminal emulator widget for Qt 5 (data files) QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as diff --git a/debian/libqtermwidget5-0.symbols b/debian/libqtermwidget5-0.symbols index c8fbb50..33c53a1 100644 --- a/debian/libqtermwidget5-0.symbols +++ b/debian/libqtermwidget5-0.symbols @@ -1223,35 +1223,66 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (c++)"vtable for SearchBar@Base" 0.6.0 # optional symbols - (optional|c++)"add_custom_color_scheme_dir(QString const&)@Base" 0.7.0 - (optional|c++)"get_color_schemes_dirs()@Base" 0.7.0 - (optional|c++)"get_kb_layout_dir()@Base" 0.6.0 - (optional|c++)"moveBlock(_IO_FILE*, int, int, char*)@Base" 0.6.0 - (optional|c++)"string_width(QString const&)@Base" 0.6.0 - (optional|c++)"operator+(QString const&, char)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::at(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::at(unsigned long)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::decreaseBuffer(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::decreaseBuffer(unsigned long)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::has(unsigned int) const@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::has(unsigned long) const@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::setHistorySize(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::setHistorySize(unsigned long)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::setSize(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::BlockArray::setSize(unsigned long)@Base" 0.6.0 + (optional|c++)"Konsole::CompactHistoryBlock::allocate(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::CompactHistoryBlock::allocate(unsigned long)@Base" 0.6.0 + (optional|c++)"Konsole::CompactHistoryBlockList::allocate(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::CompactHistoryBlockList::allocate(unsigned long)@Base" 0.6.0 + (optional|c++)"Konsole::CompactHistoryLine::operator new(unsigned int, Konsole::CompactHistoryBlockList&)@Base" 0.6.0 + (optional|c++)"Konsole::CompactHistoryLine::operator new(unsigned long, Konsole::CompactHistoryBlockList&)@Base" 0.6.0 + (optional|c++)"Konsole::HistoryScrollBlockArray::HistoryScrollBlockArray(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::HistoryScrollBlockArray::HistoryScrollBlockArray(unsigned long)@Base" 0.6.0 + (optional|c++)"Konsole::HistoryTypeBlockArray::HistoryTypeBlockArray(unsigned int)@Base" 0.6.0 + (optional|c++)"Konsole::HistoryTypeBlockArray::HistoryTypeBlockArray(unsigned long)@Base" 0.6.0 + (optional|c++)"QByteArray::~QByteArray()@Base" 0.6.0 (optional|c++)"QHash::detach_helper()@Base" 0.6.0 + (optional|c++)"QHash::findNode(Konsole::Session* const&, unsigned int) const@Base" 0.7.0 (optional|c++)"QHash::findNode(Konsole::Session* const&, unsigned int*) const@Base" 0.7.0 + (optional|c++)"QHash::remove(Konsole::Session* const&)@Base" 0.7.0 (optional|c++)"QHash::detach_helper()@Base" 0.6.0 (optional|c++)"QHash::findNode(QString const&, unsigned int*) const@Base" 0.6.0 + (optional|c++)"QHash::values() const@Base" 0.6.0 + (optional|c++)"QHash::values() const@Base" 0.7.0 (optional|c++)"QHash::detach_helper()@Base" 0.6.0 (optional|c++)"QHash::findNode(QString const&, unsigned int*) const@Base" 0.6.0 + (optional|c++)"QHash::detach_helper()@Base" 0.6.0 + (optional|c++)"QHash::erase(QHash::const_iterator)@Base" 0.7.0 (optional|c++)"QHash::erase(QHash::iterator)@Base" 0.6.0 (optional|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 (optional|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 - + (optional|c++)"QHash::keys() const@Base" 0.6.0 + (optional|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 + (optional|c++)"QHash::detach_helper()@Base" 0.6.0 + (optional|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 (optional|c++)"QHash::findNode(int const&, unsigned int) const@Base" 0.7.0 + (optional|c++)"QHash::findNode(int const&, unsigned int) const@Base" 0.7.0 + (optional|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 + (optional|c++)"QHash::detach_helper()@Base" 0.6.0 + (optional|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 (optional|c++)"QHash::findNode(int const&, unsigned int) const@Base" 0.7.0 (optional|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 (optional|c++)"QHash::detach_helper()@Base" 0.6.0 (optional|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 + (optional|c++)"QLinkedList::append(QByteArray const&)@Base" 0.6.0 (optional|c++)"QLinkedList::detach_helper2(QLinkedList::iterator)@Base" 0.6.0 (optional|c++)"QLinkedList::~QLinkedList()@Base" 0.6.0 + + (optional|c++)"QList::append(Konsole::ColorScheme const* const&)@Base" 0.6.0 (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 (optional|c++)"QList::append(Konsole::CompactHistoryBlock* const&)@Base" 0.6.0 (optional|c++)"QList::detach_helper(int)@Base" 0.6.0 @@ -1259,8 +1290,8 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (optional|c++)"QList::detach_helper(int)@Base" 0.6.0 (optional|c++)"QList::QList(QList const&)@Base" 0.6.0 (optional|c++)"QList::append(Konsole::Filter* const&)@Base" 0.6.0 - (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 (optional|c++)"QList::detach_helper(int)@Base" 0.6.0 + (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 (optional|c++)"QList::removeAll(Konsole::Filter* const&)@Base" 0.6.0 (optional|c++)"QList::QList(QList const&)@Base" 0.6.0 (optional|c++)"QList::append(Konsole::Filter::HotSpot* const&)@Base" 0.6.0 @@ -1272,80 +1303,42 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (optional|c++)"QList::append(Konsole::Session* const&)@Base" 0.6.0 (optional|c++)"QList::QList(QList const&)@Base" 0.6.0 (optional|c++)"QList::append(Konsole::TerminalDisplay* const&)@Base" 0.6.0 + + (optional|c++)"QList::append(QAction* const&)@Base" 0.6.0 + (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 + + (optional|c++)"QList::QList(QList const&)@Base" 0.6.0 + (optional|c++)"QList::append(QString const&)@Base" 0.6.0 + (optional|c++)"QList::detach_helper(int)@Base" 0.6.0 + (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 + (optional|c++)"QList::mid(int, int) const@Base" 0.6.0 + (optional|c++)"QList::operator+=(QList const&)@Base" 0.6.0 + (optional|c++)"QList::removeAll(QString const&)@Base" 0.6.0 + (optional|c++)"QList::~QList()@Base" 0.6.0 + + (optional|c++)"QList::detach_helper(int)@Base" 0.6.0 + (optional|c++)"QList::~QList()@Base" 0.6.0 + (optional|c++)"QList::append(int const&)@Base" 0.6.0 (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 (optional|c++)"QList::~QList()@Base" 0.6.0 - (optional|c++)"QList::append(QAction* const&)@Base" 0.6.0 - (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 - (optional|c++)"QList::append(QString const&)@Base" 0.6.0 - (optional|c++)"QList::detach_helper_grow(int, int)@Base" 0.6.0 - (optional|c++)"QList::detach_helper(int)@Base" 0.6.0 - (optional|c++)"QList::mid(int, int) const@Base" 0.6.0 - (optional|c++)"QList::~QList()@Base" 0.6.0 - (optional|c++)"QList::QList(QList const&)@Base" 0.6.0 - (optional|c++)"QList::removeAll(QString const&)@Base" 0.6.0 - (optional|c++)"QList::detach_helper(int)@Base" 0.6.0 - (optional|c++)"QList::~QList()@Base" 0.6.0 + (optional|c++)"QString::~QString()@Base" 0.6.0 + (optional|c++)"QStringList::~QStringList()@Base" 0.7.0 + (optional|c++)"QVarLengthArray::realloc(int, int)@Base" 0.6.0 + (optional|c++)"QVector::QVector(int)@Base" 0.6.0 (optional|c++)"QVector::insert(Konsole::Character*, int, Konsole::Character const&)@Base" 0.6.0 (optional|c++)"QVector::resize(int)@Base" 0.6.0 (optional|c++)"QVector::~QVector()@Base" 0.6.0 - (optional|c++)"QVector::~QVector()@Base" 0.6.0 (optional|c++)"QVector::reallocData(int, int, QFlags)@Base" 0.6.0 + (optional|c++)"QVector::~QVector()@Base" 0.6.0 -# arch-bits=32 - (arch-bits=32|c++)"Konsole::BlockArray::at(unsigned int)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::BlockArray::decreaseBuffer(unsigned int)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::BlockArray::has(unsigned int) const@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::BlockArray::setHistorySize(unsigned int)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::BlockArray::setSize(unsigned int)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::CompactHistoryBlock::allocate(unsigned int)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::CompactHistoryBlockList::allocate(unsigned int)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::CompactHistoryLine::operator new(unsigned int, Konsole::CompactHistoryBlockList&)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::HistoryScrollBlockArray::HistoryScrollBlockArray(unsigned int)@Base" 0.6.0 - (arch-bits=32|c++)"Konsole::HistoryTypeBlockArray::HistoryTypeBlockArray(unsigned int)@Base" 0.6.0 - -# arch-bits=32 optional - (optional|arch-bits=32|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 - (optional|arch-bits=32|c++)"QHash::detach_helper()@Base" 0.6.0 - (optional|arch-bits=32|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 - -# arch-bits=64 - (arch-bits=64|c++)"Konsole::BlockArray::at(unsigned long)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::BlockArray::decreaseBuffer(unsigned long)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::BlockArray::has(unsigned long) const@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::BlockArray::setHistorySize(unsigned long)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::BlockArray::setSize(unsigned long)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::CompactHistoryBlock::allocate(unsigned long)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::CompactHistoryBlockList::allocate(unsigned long)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::CompactHistoryLine::operator new(unsigned long, Konsole::CompactHistoryBlockList&)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::HistoryScrollBlockArray::HistoryScrollBlockArray(unsigned long)@Base" 0.6.0 - (arch-bits=64|c++)"Konsole::HistoryTypeBlockArray::HistoryTypeBlockArray(unsigned long)@Base" 0.6.0 - -# arch-bits=64 optional - (optional|arch-bits=64|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 - (optional|arch-bits=64|c++)"QHash::detach_helper()@Base" 0.6.0 - (optional|arch-bits=64|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 - -# some really weird symbols -# i don't want do break build with this one, so setting them optional is a good idea for now -# if the symbols file don't fully match, we can refine them with the output of the build - (optional|arch= amd64 arm64 i386 kfreebsd64 m86k powerpc ppc64 ppc64el s390x sh4 sparc64 x32 |c++)"QHash::values() const@Base" 0.6.0 - (optional|arch= armel armhf alpha hppa mips mipsel mips64el |c++)"QList::append(Konsole::ColorScheme const* const&)@Base" 0.6.0 - -# missed in arm64, armel, mips, mipsel, powerpc, ppc64el, s390x, alpha, hppa, -# m68k, mips64el, ppc64, sh4, sparc64 - (optional|c++)"QList::operator+=(QList const&)@Base" 0.6.0 - -# missed in armel, mips, mipsel, alpha, hppa, mips64el, sparc64 - (optional|c++)"QHash::keys() const@Base" 0.6.0 - -# new, possible Qt 5.7 - (optional|c++)"QHash::findNode(Konsole::Session* const&, unsigned int) const@Base" 0.7.0 - (optional|c++)"QHash::remove(Konsole::Session* const&)@Base" 0.7.0 - (optional|c++)"QHash::values() const@Base" 0.7.0 - (optional|c++)"QHash::erase(QHash::const_iterator)@Base" 0.7.0 - (optional|c++)"QHash::findNode(int const&, unsigned int) const@Base" 0.7.0 + (optional|c++)"add_custom_color_scheme_dir(QString const&)@Base" 0.7.0 + (optional|c++)"get_color_schemes_dirs()@Base" 0.7.0 + (optional|c++)"get_kb_layout_dir()@Base" 0.6.0 + (optional|c++)"moveBlock(_IO_FILE*, int, int, char*)@Base" 0.6.0 + (optional|c++)"operator+(QString const&, char)@Base" 0.6.0 + (optional|c++)"string_width(QString const&)@Base" 0.6.0