From 897e1d1d5f799fdac08868180e73f705b02d488c Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 28 Apr 2020 17:34:13 -0500 Subject: [PATCH] Run wrap-and-sort. --- debian/changelog | 1 + debian/control | 28 +++++++++------------------- debian/copyright | 1 - debian/libfm-qt-dev.install | 4 +--- debian/libfm-qt6.install | 2 +- 5 files changed, 12 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7b4224..c8d933b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libfm-qt (0.15.0-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. - Update upstream signing key. * Bump Standards-version to 4.5.0, no changes needed. + * Run wrap-and-sort. -- Simon Quigley Tue, 28 Apr 2020 17:31:38 -0500 diff --git a/debian/control b/debian/control index 686172e..9c08094 100644 --- a/debian/control +++ b/debian/control @@ -23,21 +23,12 @@ Homepage: https://github.com/lxqt/libfm-qt Package: libfm-qt6 Provides: libfm-qt Conflicts: libfm-qt -Replaces: libfm-qt5-2, - libfm-qt5, - libfm-qt3, - libfm-qt2 -Breaks: libfm-qt5-2, - libfm-qt5, - libfm-qt3, - libfm-qt2 +Replaces: libfm-qt2, libfm-qt3, libfm-qt5, libfm-qt5-2 +Breaks: libfm-qt2, libfm-qt3, libfm-qt5, libfm-qt5-2 Architecture: any Multi-Arch: same Section: libs -Depends: ${misc:Depends}, - ${shlibs:Depends}, - libglib2.0-bin, - shared-mime-info +Depends: libglib2.0-bin, shared-mime-info, ${misc:Depends}, ${shlibs:Depends} Recommends: libfm-qt-l10n Pre-Depends: ${misc:Pre-Depends} Description: file management support for pcmanfm-qt @@ -51,10 +42,10 @@ Replaces: libfm-qt5-dev Breaks: libfm-qt5-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, - libexif-dev, +Depends: libexif-dev, libfm-qt6 (= ${binary:Version}), - libmenu-cache-dev + libmenu-cache-dev, + ${misc:Depends} Description: file management support library for pcmanfm-qt (development files) Libfm-Qt is a companion library providing components to build desktop file managers. @@ -65,10 +56,9 @@ Package: libfm-qt-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: ${misc:Depends}, - qttranslations5-l10n -Breaks: libfm-qt3 (<< 0.11.1), libfm-qt-l10n (<< 0.14.0) -Replaces: libfm-qt3 (<< 0.11.1), libfm-qt-l10n (<< 0.14.0) +Depends: qttranslations5-l10n, ${misc:Depends} +Breaks: libfm-qt-l10n (<< 0.14.0), libfm-qt3 (<< 0.11.1) +Replaces: libfm-qt-l10n (<< 0.14.0), libfm-qt3 (<< 0.11.1) Description: Language package for libfm-qt Libfm-Qt is a companion library providing components to build desktop file managers. diff --git a/debian/copyright b/debian/copyright index f7f9d49..3216d64 100644 --- a/debian/copyright +++ b/debian/copyright @@ -59,4 +59,3 @@ License: LGPL-2.1+ On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". - diff --git a/debian/libfm-qt-dev.install b/debian/libfm-qt-dev.install index 801b020..17881de 100644 --- a/debian/libfm-qt-dev.install +++ b/debian/libfm-qt-dev.install @@ -1,10 +1,8 @@ usr/include/libfm-qt/*.h -usr/include/libfm-qt/customactions/*.h usr/include/libfm-qt/core/*.h usr/include/libfm-qt/core/legacy/*.h usr/include/libfm-qt/core/vfs/*.h - +usr/include/libfm-qt/customactions/*.h usr/lib/*/*.so usr/lib/*/pkgconfig/* - usr/share/cmake/fm-qt/*.cmake diff --git a/debian/libfm-qt6.install b/debian/libfm-qt6.install index 40baa6d..4d9d6f3 100644 --- a/debian/libfm-qt6.install +++ b/debian/libfm-qt6.install @@ -1,4 +1,4 @@ usr/lib/*/*.so.* -usr/share/libfm-qt/terminals.list usr/share/libfm-qt/archivers.list +usr/share/libfm-qt/terminals.list usr/share/mime/packages/libfm-qt-mimetypes.xml