[neon/extras/qtav/Neon/release] debian: Merge remote-tracking branch 'salsa/master' into Neon/release
Jonathan Esk-Riddell
null at kde.org
Tue Aug 9 13:25:36 BST 2022
Git commit 64c7495aecbe02d9b408b383cd9a0b4a0f770e0d by Jonathan Esk-Riddell.
Committed on 09/08/2022 at 12:25.
Pushed by jriddell into branch 'Neon/release'.
Merge remote-tracking branch 'salsa/master' into Neon/release
M +13 -9 debian/control
M +2 -4 debian/rules
https://invent.kde.org/neon/extras/qtav/commit/64c7495aecbe02d9b408b383cd9a0b4a0f770e0d
diff --cc debian/control
index 0ffe200,573a190..22e6b00
--- a/debian/control
+++ b/debian/control
@@@ -3,27 -3,28 +3,31 @@@ Maintainer: Debian Qt extras Maintainer
Uploaders: Steve M. Robbins <smr at debian.org>
Section: video
Priority: optional
- Build-Depends: debhelper (>= 11~),
+ Build-Depends: debhelper-compat (= 11),
+ qt5-qmake,
+ libqt5opengl5-dev,
+ libqt5svg5-dev,
+ qtdeclarative5-dev,
+ libqt5x11extras5-dev,
libass-dev,
+ libavutil-dev,
libavcodec-dev,
- libavformat-dev,
libavdevice-dev,
libavfilter-dev,
- libavformat-dev,
- libavresample-dev,
- libavutil-dev,
- libegl1-mesa-dev,
+ libswresample-dev,
+ libswscale-dev,
libopenal-dev,
libpulse-dev,
- libxv-dev,
+ libqt5opengl5-dev,
+ libqt5svg5-dev,
+ libqt5x11extras5-dev,
+ libswscale-dev,
+ libuchardet-dev,
libva-dev [!hurd-any],
- libxv-dev,
- qt5-qmake,
- qtdeclarative5-dev
- Standards-Version: 4.1.5
+ libegl1-mesa-dev,
+ libuchardet-dev
+ Standards-Version: 4.6.0
+ Rules-Requires-Root: no
Homepage: http://qtav.org
Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/qtav
Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/qtav.git
diff --cc debian/rules
index c2100e3,b2f7dfe..673950d
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,9 +1,9 @@@
#!/usr/bin/make -f
- DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
export QT_SELECT=qt5
- export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
- export DH_VERBOSE=1
+ %:
+ dh $@ --buildsystem qmake
-override_dh_auto_configure:
- dh_auto_configure -Sqmake -- CONFIG+="no_rpath recheck config_libass_link config_openal_link no-tests"
+%:
+ dh $@ --buildsystem cmake
More information about the Neon-commits
mailing list