improve dependencies wrapping
authormirabilos <tg@debian.org>
Sun, 29 Sep 2019 17:40:27 +0000 (19:40 +0200)
committermirabilos <mirabilos@evolvis.org>
Sun, 29 Sep 2019 17:40:27 +0000 (19:40 +0200)
debian/control

index 05cc56d..6f8a970 100644 (file)
@@ -3,37 +3,37 @@ Section: sound
 Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
 Homepage: https://musescore.org/en
-Build-Depends: cmake,
-               debhelper-compat (= 12),
-# for the tests (but useful to ensure installability before building)
-#              imagemagick,
-               mksh,
-               qml-module-qtquick-controls,
-               qml-module-qtquick-dialogs,
-               qml-module-qtquick-layouts,
-               qml-module-qtquick2,
-               xauth,
-               xvfb,
-# to build
-               g++ (>= 4:4.8),
-               libasound2-dev,
-               libfreetype6-dev (>= 2.5.2),
-               libjack-dev,
-               libmp3lame-dev,
-               libportmidi-dev [linux-any],
-               libpulse-dev,
-               libqt5opengl5-dev,
-               libqt5svg5-dev,
-               libqt5xmlpatterns5-dev,
-               libsndfile1-dev (>= 1.0.25),
-               lsb-release,
-               portaudio19-dev,
-               qtbase5-dev,
-               qtdeclarative5-dev (>= 5.4),
-               qtscript5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               zlib1g-dev
+Build-Depends: debhelper-compat (= 12),
+# # for the tests (but useful to ensure installability before building)
+# imagemagick,
+  mksh,
+  qml-module-qtquick-controls,
+  qml-module-qtquick-dialogs,
+  qml-module-qtquick-layouts,
+  qml-module-qtquick2,
+  xauth,
+  xvfb,
+# # to build
+  cmake,
+  g++ (>= 4:4.8),
+  libasound2-dev,
+  libfreetype6-dev (>= 2.5.2),
+  libjack-dev,
+  libmp3lame-dev,
+  libportmidi-dev [linux-any],
+  libpulse-dev,
+  libqt5opengl5-dev,
+  libqt5svg5-dev,
+  libqt5xmlpatterns5-dev,
+  libsndfile1-dev (>= 1.0.25),
+  lsb-release,
+  portaudio19-dev,
+  qtbase5-dev,
+  qtdeclarative5-dev (>= 5.4),
+  qtscript5-dev,
+  qttools5-dev,
+  qttools5-dev-tools,
+  zlib1g-dev
 Standards-Version: 4.4.0
 Rules-Requires-Root: no
 VCS-git: https://evolvis.org/anonscm/git/alioth/musescore.git -b rochade
@@ -43,8 +43,8 @@ Package: musescore-common
 Architecture: all
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
-Depends: musescore-general-soundfont-small | musescore-compatible-soundfont,
- ${misc:Depends}
+Depends: ${misc:Depends},
+ musescore-general-soundfont-small | musescore-compatible-soundfont
 Description: MuseScore 2 (music composition and notation) shared files
  Demonstration scores and templates, styles, localisations, some
  plugins for MuseScore, the Open Source (GNU GPL) cross-platform
@@ -66,20 +66,18 @@ Package: musescore
 Architecture: any
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
-Depends: desktop-file-utils,
-         libqt5sql5-sqlite,
-# dependent on MSCORE_INSTALL_SUFFIX from debian/rules
-# and MUSESCORE_VERSION_{MAJOR,MINOR} from CMakeLists.txt
-         musescore-common (>> 2.3~),
-         musescore-common (<< 2.4~),
-         qml-module-qtquick-controls,
-         qml-module-qtquick-dialogs,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick2,
-         shared-mime-info,
-         xdg-utils,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+  desktop-file-utils,
+  libqt5sql5-sqlite,
+  qml-module-qtquick-controls,
+  qml-module-qtquick-dialogs,
+  qml-module-qtquick-layouts,
+  qml-module-qtquick2,
+  shared-mime-info,
+  xdg-utils,
+# # dependent on MSCORE_INSTALL_SUFFIX from debian/rules
+# # and MUSESCORE_VERSION_{MAJOR,MINOR} from CMakeLists.txt
+  musescore-common (>> 2.3~), musescore-common (<< 2.4~)
 Recommends: libmp3lame0, pulseaudio-utils
 Description: cross-platform multi-lingual music composition and notation (old)
  MuseScore is an Open Source (GNU GPL) music notation software that runs