summaryrefslogtreecommitdiffstats
path: root/packaging/debian
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2021-02-22 23:45:30 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2021-02-22 23:45:30 +0100
commit1728d13dd2aa6631983342b8183245eca54098aa (patch)
treecba635c6b6b22e8d65dcf473af37b74d3e5c8294 /packaging/debian
parentddd8ed67486813359c8ae4a357863f66d6156be4 (diff)
parentf102585cab5531c875a9ca6623b16196c612b31f (diff)
Merge remote-tracking branch 'upstream/2.3' into ppa_m4a
Diffstat (limited to 'packaging/debian')
-rw-r--r--packaging/debian/control.in5
-rw-r--r--packaging/debian/mixxx.manpages1
-rwxr-xr-xpackaging/debian/rules9
3 files changed, 5 insertions, 10 deletions
diff --git a/packaging/debian/control.in b/packaging/debian/control.in
index 85fcd77f82..8687708df3 100644
--- a/packaging/debian/control.in
+++ b/packaging/debian/control.in
@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 11),
# QtSql
# QtWidgets
# QtXml
- qt5-default,
qt5keychain-dev,
# We additionally need headers for QtOpenGL, QtScript, and QtSvg.
qtscript5-dev,
@@ -27,7 +26,7 @@ Build-Depends: debhelper (>= 11),
# Only needed for running tests that use SQLite.
libqt5sql5-sqlite,
libqt5x11extras5-dev,
- cmake (>= 3.13),
+ cmake (>= 3.15),
libjack-dev,
portaudio19-dev,
libid3tag0-dev,
@@ -39,7 +38,7 @@ Build-Depends: debhelper (>= 11),
libfaad-dev,
libportmidi-dev,
libtag1-dev,
- libshout-dev,
+ libshout-idjc-dev,
libssl-dev,
libprotobuf-dev,
protobuf-compiler,
diff --git a/packaging/debian/mixxx.manpages b/packaging/debian/mixxx.manpages
new file mode 100644
index 0000000000..b9275ccd33
--- /dev/null
+++ b/packaging/debian/mixxx.manpages
@@ -0,0 +1 @@
+mixxx.1
diff --git a/packaging/debian/rules b/packaging/debian/rules
index fc060e6deb..a32353631d 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -4,14 +4,9 @@
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_USER_UDEV_RULES=OFF
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_USER_UDEV_RULES=OFF -DKEYFINDER=OFF
-override_dh_auto_build:
- docbook-to-man debian/mixxx.sgml > mixxx.1
- dh_auto_build
-
-override_dh_install:
- dh_install
+override_dh_installudev:
dh_installudev --name=mixxx-usb-uaccess --priority 69
%: