From f2b1f23fdfd0ebaa852f5a98cb399f920c1d80b7 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Thu, 31 Mar 2016 21:45:05 +0200 Subject: [PATCH] Merged changes into unstable Added five new symbols, leave the rest untouched Removed not needed build dependency liblxqt0-dev Removed not needed patches (libfm-qt contains no desktop files, so the desktop translation must not be patched) Fixed VCS-* fields --- debian/changelog | 11 +++++++++++ debian/control | 3 +-- debian/libfm-qt3.symbols | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 651ac0e..ecb88a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libfm-qt (0.11.0-2) unstable; urgency=medium + + * Merged changes into unstable + * Added five new symbols, leave the rest untouched + * Removed not needed build dependency liblxqt0-dev + * Removed not needed patches (libfm-qt contains no desktop files, + so the desktop translation must not be patched) + * Fixed VCS-* fields + + -- Alf Gaida Thu, 31 Mar 2016 21:38:41 +0200 + libfm-qt (0.11.0-1) experimental; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 304842d..d06f19b 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), libfm-dev (>= 1.2.0), libglib2.0-dev, - liblxqt0-dev (>= 0.10.0), libmenu-cache-dev, libqt5x11extras5-dev, libqt5xdg-dev (>= 1.3.0), @@ -18,7 +17,7 @@ Build-Depends: debhelper (>= 9), pkg-config, qtbase5-private-dev, qttools5-dev, - qttools5-dev-tools, + qttools5-dev-tools Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/libfm-qt.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/libfm-qt.git -b debian/sid diff --git a/debian/libfm-qt3.symbols b/debian/libfm-qt3.symbols index 56cef0c..e324472 100644 --- a/debian/libfm-qt3.symbols +++ b/debian/libfm-qt3.symbols @@ -1,4 +1,4 @@ -libfm-qt.so.2 libfm-qt2 #MINVER# +libfm-qt.so.3 libfm-qt3 #MINVER# (c++)"Fm::AppChooserComboBox::~AppChooserComboBox()@Base" 0.10.0 (c++)"Fm::AppChooserComboBox::AppChooserComboBox(QWidget*)@Base" 0.10.0 (c++)"Fm::AppChooserComboBox::isChanged()@Base" 0.10.0 @@ -264,12 +264,14 @@ libfm-qt.so.2 libfm-qt2 #MINVER# (c++)"Fm::FolderItemDelegate::qt_metacast(char const*)@Base" 0.10.0 (c++)"Fm::FolderItemDelegate::sizeHint(QStyleOptionViewItem const&, QModelIndex const&) const@Base" 0.10.0 (c++)"Fm::FolderItemDelegate::staticMetaObject@Base" 0.10.0 + (c++)"Fm::FolderMenu::addCustomActionItem(QMenu*, _FmFileActionItem*)@Base" 0.11.0 (c++)"Fm::FolderMenu::addSortMenuItem(QString, int)@Base" 0.10.0 (c++)"Fm::FolderMenu::createSortMenu()@Base" 0.10.0 (c++)"Fm::FolderMenu::~FolderMenu()@Base" 0.10.0 (c++)"Fm::FolderMenu::FolderMenu(Fm::FolderView*, QWidget*)@Base" 0.10.0 (c++)"Fm::FolderMenu::metaObject() const@Base" 0.10.0 (c++)"Fm::FolderMenu::onCaseSensitiveActionTriggered(bool)@Base" 0.10.0 + (c++)"Fm::FolderMenu::onCustomActionTrigerred()@Base" 0.11.0 (c++)"Fm::FolderMenu::onFolderFirstActionTriggered(bool)@Base" 0.10.0 (c++)"Fm::FolderMenu::onInvertSelectionActionTriggered()@Base" 0.10.0 (c++)"Fm::FolderMenu::onPasteActionTriggered()@Base" 0.10.0 @@ -360,6 +362,7 @@ libfm-qt.so.2 libfm-qt2 #MINVER# (c++)"Fm::FolderView::selectionModel() const@Base" 0.10.0 (c++)"Fm::FolderView::setAutoSelectionDelay(int)@Base" 0.10.0 (c++)"Fm::FolderView::setIconSize(Fm::FolderView::ViewMode, QSize)@Base" 0.10.0 + (c++)"Fm::FolderView::setMargins(QSize)@Base" 0.11.0 (c++)"Fm::FolderView::setModel(Fm::ProxyFolderModel*)@Base" 0.10.0 (c++)"Fm::FolderView::setViewMode(Fm::FolderView::ViewMode)@Base" 0.10.0 (c++)"Fm::FolderView::sortChanged()@Base" 0.10.0 @@ -415,6 +418,8 @@ libfm-qt.so.2 libfm-qt2 #MINVER# (c++)"Fm::MountOperation::staticMetaObject@Base" 0.10.0 (c++)"Fm::MountOperation::wait()@Base" 0.10.0 (c++)"Fm::pasteFilesFromClipboard(_FmPath*, QWidget*)@Base" 0.10.0 + (c++)"Fm::PathEdit::autoComplete()@Base" 0.11.0 + (c++)"Fm::PathEdit::event(QEvent*)@Base" 0.11.0 (c++)"Fm::PathEdit::focusInEvent(QFocusEvent*)@Base" 0.10.0 (c++)"Fm::PathEdit::focusOutEvent(QFocusEvent*)@Base" 0.10.0 (c++)"Fm::PathEdit::freeCompleter()@Base" 0.10.0