From 43dd5584362bc026ea72bfb381a478dbcdad618f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20R=C3=B6hling?= Date: Mon, 30 Sep 2024 00:18:30 +0200 Subject: [PATCH] Wrap and sort Debian package files --- debian/cmake-qt-gui.install | 4 +- debian/control | 67 ++++++++++++++------------ debian/copyright | 1 - debian/tests/control | 95 +++++++++++++++++++------------------ 4 files changed, 87 insertions(+), 80 deletions(-) diff --git a/debian/cmake-qt-gui.install b/debian/cmake-qt-gui.install index 786f85f32..ce217330d 100644 --- a/debian/cmake-qt-gui.install +++ b/debian/cmake-qt-gui.install @@ -1,6 +1,6 @@ +debian/com.kitware.cmake_gui.metainfo.xml usr/share/metainfo usr/bin/cmake-gui usr/share/applications/cmake-gui.desktop +usr/share/icons/hicolor/*/apps/CMakeSetup.png usr/share/man/man1/cmake-gui.1 usr/share/mime/packages/cmakecache.xml -usr/share/icons/hicolor/*/apps/CMakeSetup.png -debian/com.kitware.cmake_gui.metainfo.xml usr/share/metainfo diff --git a/debian/control b/debian/control index c71218caf..6317a9d1f 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Uploaders: Felix Geyer , Timo Röhling , Build-Depends: - debhelper-compat (= 13), cmake , + debhelper-compat (= 13), git , libarchive-dev (>= 3.3.3) , libcppdap-dev , @@ -44,11 +44,13 @@ Package: cmake Architecture: any Multi-Arch: foreign Depends: - ${misc:Depends}, - ${shlibs:Depends}, cmake-data (= ${source:Version}), procps [!hurd-any], -Recommends: gcc, make + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: + gcc, + make, Suggests: cmake-doc, cmake-format, @@ -57,25 +59,13 @@ Suggests: Description: ${source:Synopsis} ${source:Extended-Description} -Package: cmake-data -Architecture: all -Multi-Arch: foreign -Depends: - ${misc:Depends}, -Description: CMake data files (modules, templates and documentation) - ${source:Extended-Description} - . - This package provides CMake architecture independent data files (modules, - templates, documentation etc.). Unless you have cmake installed, you probably - do not need this package. - Package: cmake-curses-gui Architecture: any Build-Profiles: Depends: + cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, - cmake (= ${binary:Version}), Description: curses based user interface for CMake (ccmake) ${source:Extended-Description} . @@ -84,21 +74,17 @@ Description: curses based user interface for CMake (ccmake) are provided at the bottom of the terminal when the program is running. The main executable file for this GUI is "ccmake". -Package: cmake-qt-gui -Architecture: any -Build-Profiles: +Package: cmake-data +Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, - ${shlibs:Depends}, - cmake (= ${binary:Version}), -Provides: cmake-gui -Description: Qt based user interface for CMake (cmake-gui) +Description: CMake data files (modules, templates and documentation) ${source:Extended-Description} . - This package provides the CMake Qt based GUI. Project configuration - settings may be specified interactively. Brief instructions are provided at - the bottom of the window when the program is running. The main executable - file for this GUI is "cmake-gui". + This package provides CMake architecture independent data files (modules, + templates, documentation etc.). Unless you have cmake installed, you probably + do not need this package. Package: cmake-doc Architecture: all @@ -106,13 +92,32 @@ Build-Profiles: Multi-Arch: foreign Section: doc Depends: + cmake-data (= ${source:Version}), ${misc:Depends}, ${sphinxdoc:Depends}, - cmake-data (= ${source:Version}), -Recommends: doc-base -Suggests: cmake +Recommends: + doc-base, +Suggests: + cmake, Description: extended documentation in various formats for CMake ${source:Extended-Description} . This package provides additional documentation in various formats like HTML or plain text. + +Package: cmake-qt-gui +Architecture: any +Build-Profiles: +Depends: + cmake (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Provides: + cmake-gui, +Description: Qt based user interface for CMake (cmake-gui) + ${source:Extended-Description} + . + This package provides the CMake Qt based GUI. Project configuration + settings may be specified interactively. Brief instructions are provided at + the bottom of the window when the program is running. The main executable + file for this GUI is "cmake-gui". diff --git a/debian/copyright b/debian/copyright index 0a56292d1..5e5c79ffc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -609,4 +609,3 @@ License: Zlib 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - diff --git a/debian/tests/control b/debian/tests/control index d10260321..7b084cb4a 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,46 +1,49 @@ -Tests: testsuite testsuite-ninja findmodules -Restrictions: allow-stderr -Depends: cmake, - ninja-build, - @builddeps@, - libasound2-dev, - libarmadillo-dev, - bison, - libboost-dev, - libbz2-dev, - libcups2-dev, - libcurl4-openssl-dev, - cvs, - default-jdk, - doxygen, - libexpat1-dev, - flex, - libfreetype6-dev, - gettext, - libgif-dev, - git, - imagemagick, - libmagickcore-dev, - libmagick++-dev, - libmagickwand-dev, - libgnutls28-dev, - libgtk2.0-dev, - mercurial, - hspell, - icoutils, - libarchive-dev, - liblzma-dev, - libxml2-dev, - libxslt1-dev, - libopenscenegraph-dev, - perl, - python3-dev, - libphysfs-dev, - pkg-config, - ruby-dev, - libprotobuf-dev, - protobuf-compiler, - subversion, - swig, - libtiff5-dev, - zlib1g-dev +Tests: + testsuite testsuite-ninja findmodules, +Restrictions: + allow-stderr, +Depends: + bison, + cmake, + cvs, + default-jdk, + doxygen, + flex, + gettext, + git, + hspell, + icoutils, + imagemagick, + libarchive-dev, + libarmadillo-dev, + libasound2-dev, + libboost-dev, + libbz2-dev, + libcups2-dev, + libcurl4-openssl-dev, + libexpat1-dev, + libfreetype6-dev, + libgif-dev, + libgnutls28-dev, + libgtk2.0-dev, + liblzma-dev, + libmagick++-dev, + libmagickcore-dev, + libmagickwand-dev, + libopenscenegraph-dev, + libphysfs-dev, + libprotobuf-dev, + libtiff5-dev, + libxml2-dev, + libxslt1-dev, + mercurial, + ninja-build, + perl, + pkg-config, + protobuf-compiler, + python3-dev, + ruby-dev, + subversion, + swig, + zlib1g-dev, + @builddeps@,