From 841a30dda29bd332221220001ddadec92357223b Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Tue, 14 Dec 2021 14:18:05 +0100 Subject: [PATCH] Apply 'wrap-and-sort -ast' --- debian/control | 49 ++++++++++++++----------- debian/juce-modules-source-data.install | 2 +- debian/juce-tools.install | 4 +- debian/tests/control | 7 +++- 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/debian/control b/debian/control index fbcc9f63..7d9ad1ab 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Debian Multimedia Maintainers Uploaders: IOhannes m zmölnig (Debian/GNU) , Build-Depends: - debhelper-compat (= 13), cmake, - pkg-config, + debhelper-compat (= 13), + help2man, libasound2-dev, libcurl4-gnutls-dev | libcurl-dev, libfreetype6-dev, @@ -16,14 +16,14 @@ Build-Depends: libjpeg-dev, libwebkit2gtk-4.0-dev, libx11-dev, + libxcomposite-dev, + libxcursor-dev, libxext-dev, libxinerama-dev, libxrandr-dev, - libxcomposite-dev, - libxcursor-dev, + pkg-config, python3:any, zlib1g-dev, - help2man, Build-Depends-Indep: doxygen, graphviz, @@ -37,24 +37,24 @@ Package: juce-modules-source Architecture: any Multi-Arch: same Depends: - ${shlibs:Depends}, - ${misc:Depends}, juce-modules-source-data (= ${source:Version}), libasound2-dev, libcurl4-gnutls-dev | libcurl-dev, + libflac-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, + libgtk-3-dev, + libjpeg-dev, + libpng-dev, + libvorbis-dev, + libwebkit2gtk-4.0-dev, libx11-dev, libxext-dev, libxinerama-dev, libxrandr-dev, zlib1g-dev | libz-dev, - libwebkit2gtk-4.0-dev, - libgtk-3-dev, - libflac-dev, - libjpeg-dev, - libpng-dev, - libvorbis-dev, + ${misc:Depends}, + ${shlibs:Depends}, Recommends: lv2-dev, Replaces: @@ -78,8 +78,10 @@ Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, -Replaces: juce-modules-source (<< 6.0.0~), -Breaks: juce-modules-source (<< 6.0.0~), +Replaces: + juce-modules-source (<< 6.0.0~), +Breaks: + juce-modules-source (<< 6.0.0~), Description: Jules' Utility Class Extensions (platform independent module sources) JUCE (Jules' Utility Class Extensions) is an all-encompassing C++ framework for developing cross-platform software. @@ -93,12 +95,16 @@ Description: Jules' Utility Class Extensions (platform independent module source Package: juce-tools Architecture: any Depends: - ${shlibs:Depends}, ${misc:Depends}, -Recommends: juce-modules-source -Breaks: introjucer -Replaces: introjucer -Conflicts: introjucer + ${shlibs:Depends}, +Recommends: + juce-modules-source, +Breaks: + introjucer, +Replaces: + introjucer, +Conflicts: + introjucer, Description: JUCE's project management tools JUCE (Jules' Utility Class Extensions) is an all-encompassing C++ framework for developing cross-platform software. @@ -119,7 +125,8 @@ Multi-Arch: foreign Section: doc Depends: ${misc:Depends}, -Suggests: juce-modules-source +Suggests: + juce-modules-source, Description: Jules' Utility Class Extensions (documentation) JUCE (Jules' Utility Class Extensions) is an all-encompassing C++ framework for developing cross-platform software. diff --git a/debian/juce-modules-source-data.install b/debian/juce-modules-source-data.install index d30e7db9..3ded38a5 100644 --- a/debian/juce-modules-source-data.install +++ b/debian/juce-modules-source-data.install @@ -1,3 +1,3 @@ -usr/include/JUCE*/* /usr/share/juce/ debian/extra/juce_audio_plugin_client/* /usr/share/juce/modules/juce_audio_plugin_client/ debian/extra/juce_audio_processors/format_types/juce_VSTInterface.h /usr/share/juce/modules/juce_audio_processors/format_types/ +usr/include/JUCE*/* /usr/share/juce/ diff --git a/debian/juce-tools.install b/debian/juce-tools.install index 7ba43bc3..dd0fabc7 100644 --- a/debian/juce-tools.install +++ b/debian/juce-tools.install @@ -1,5 +1,5 @@ +debian/Projucer.desktop usr/share/applications/ +debian/artifacts/juce.png usr/share/pixmaps/ extras/Projucer/Builds/LinuxMakefile/build/Projucer usr/bin/ usr/bin/JUCE-*/* usr/bin/ -debian/artifacts/juce.png usr/share/pixmaps/ -debian/Projucer.desktop usr/share/applications/ usr/lib/${DEB_HOST_MULTIARCH} diff --git a/debian/tests/control b/debian/tests/control index 424f4c1a..43f553f9 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,6 +1,9 @@ Tests: juce-unit-tests -Depends: @, @builddeps@, +Depends: libjack-dev, libogg-dev, - xvfb, xauth, + xauth, + xvfb, + @, + @builddeps@, Restrictions: allow-stderr -- 2.30.2