[neon/extras/qtav/Neon/release-lts] debian: update .install, wrap-and-sort
Jonathan Riddell
null at kde.org
Fri Nov 20 10:59:45 GMT 2020
Git commit b8ff1867dc5e3e915b017ecfb68c3c68b3445eac by Jonathan Riddell.
Committed on 20/11/2020 at 10:59.
Pushed by jriddell into branch 'Neon/release-lts'.
update .install, wrap-and-sort
M +22 -26 debian/control
M +7 -7 debian/copyright
M +3 -2 debian/libqtav-dev.install
M +1 -0 debian/libqtav1.install
M +1 -0 debian/libqtavwidgets1.install
M +1 -1 debian/qtav-players.install
https://invent.kde.org/neon/extras/qtav/commit/b8ff1867dc5e3e915b017ecfb68c3c68b3445eac
diff --git a/debian/control b/debian/control
index b148e98..0ffe200 100644
--- a/debian/control
+++ b/debian/control
@@ -4,25 +4,25 @@ Uploaders: Steve M. Robbins <smr at debian.org>
Section: video
Priority: optional
Build-Depends: debhelper (>= 11~),
- qt5-qmake,
- libqt5opengl5-dev,
- libqt5svg5-dev,
- qtdeclarative5-dev,
- libqt5x11extras5-dev,
libass-dev,
- libavutil-dev,
- libavresample-dev,
libavcodec-dev,
- libavformat-dev,
libavdevice-dev,
libavfilter-dev,
- libswscale-dev,
+ libavformat-dev,
+ libavresample-dev,
+ libavutil-dev,
+ libegl1-mesa-dev,
libopenal-dev,
libpulse-dev,
- libxv-dev,
+ libqt5opengl5-dev,
+ libqt5svg5-dev,
+ libqt5x11extras5-dev,
+ libswscale-dev,
+ libuchardet-dev,
libva-dev [!hurd-any],
- libegl1-mesa-dev,
- libuchardet-dev
+ libxv-dev,
+ qt5-qmake,
+ qtdeclarative5-dev
Standards-Version: 4.1.5
Homepage: http://qtav.org
Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/qtav
@@ -32,8 +32,7 @@ Package: libqtav1
Architecture: any
Multi-Arch: same
Section: libs
-Depends: ${misc:Depends},
- ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: QtAV library
QtAV is a multimedia playback library based on Qt and FFmpeg.
@@ -45,8 +44,7 @@ Package: libqtavwidgets1
Architecture: any
Multi-Arch: same
Section: libs
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: QtAV Widgets module
QtAV is a multimedia playback library based on Qt and FFmpeg.
@@ -58,10 +56,10 @@ Package: libqtav-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: ${misc:Depends},
+Depends: libqt5opengl5-dev,
libqtav1 (= ${binary:Version}),
libqtavwidgets1 (= ${binary:Version}),
- libqt5opengl5-dev
+ ${misc:Depends}
Description: QtAV development files
QtAV is a multimedia playback framework based on Qt and FFmpeg.
It can help you to write a player with less effort than ever before.
@@ -73,8 +71,7 @@ Package: libqtav-private-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libqtav-dev (= ${binary:Version}),
- ${misc:Depends}
+Depends: libqtav-dev (= ${binary:Version}), ${misc:Depends}
Description: QtAV private development files
QtAV is a multimedia playback library based on Qt and FFmpeg.
It can help you to write a player with less effort than ever before.
@@ -87,8 +84,7 @@ Description: QtAV private development files
Package: qml-module-qtav
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: QtAV QML module
QtAV is a multimedia playback library based on Qt and FFmpeg.
@@ -99,12 +95,12 @@ Description: QtAV QML module
Package: qtav-players
Architecture: any
Multi-Arch: no
-Depends: ${misc:Depends},
- ${shlibs:Depends},
+Depends: qml-module-qt-labs-folderlistmodel,
qml-module-qtav,
- qml-module-qtquick-dialogs,
qml-module-qtquick-controls,
- qml-module-qt-labs-folderlistmodel
+ qml-module-qtquick-dialogs,
+ ${misc:Depends},
+ ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: QtAV/QML players
QtAV is a multimedia playback framework based on Qt and FFmpeg.
diff --git a/debian/copyright b/debian/copyright
index f880e39..5046ee2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,24 +87,24 @@ License: LGPL-2.1 or LGPL-3
License: BSD-2-clause
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
- //
+ //
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
- //
+ //
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
- //
+ //
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
- //
+ //
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- // OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ // OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -121,11 +121,11 @@ License: BSD-3-clause
.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+ documentation and/or other materials provided with the distribution.
.
* Neither the name of foo nor the names of its
contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+ this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/debian/libqtav-dev.install b/debian/libqtav-dev.install
index efbdc9b..b93dfe8 100644
--- a/debian/libqtav-dev.install
+++ b/debian/libqtav-dev.install
@@ -1,5 +1,6 @@
-usr/lib/libQtAV.so
-usr/lib/libQtAVWidgets.so
usr/include/QtAV/
usr/include/QtAV/private/
usr/include/QtAVWidgets/
+usr/lib/cmake/QtAV/
+usr/lib/libQtAV.so
+usr/lib/libQtAVWidgets.so
diff --git a/debian/libqtav1.install b/debian/libqtav1.install
index 6c96e04..6dfc33a 100644
--- a/debian/libqtav1.install
+++ b/debian/libqtav1.install
@@ -1 +1,2 @@
+usr/lib/libQtAV.so.1
usr/lib/libQtAV.so.1.13*
diff --git a/debian/libqtavwidgets1.install b/debian/libqtavwidgets1.install
index 8917bcf..a96a3c8 100644
--- a/debian/libqtavwidgets1.install
+++ b/debian/libqtavwidgets1.install
@@ -1 +1,2 @@
+usr/lib/libQtAVWidgets.so.1
usr/lib/libQtAVWidgets.so.1.13*
diff --git a/debian/qtav-players.install b/debian/qtav-players.install
index 8ba7785..91c9265 100644
--- a/debian/qtav-players.install
+++ b/debian/qtav-players.install
@@ -1,2 +1,2 @@
-usr/bin/QMLPlayer
usr/bin/Player
+usr/bin/QMLPlayer
More information about the Neon-commits
mailing list