Wrap and sort Debian package files

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

debian/control

@@ -7,8 +7,8 @@ Uploaders:
  Felix Geyer <fgeyer@debian.org>,
  Timo Röhling <roehling@debian.org>,
 Build-Depends:
- debhelper-compat (= 13),
  cmake <cross>,
+ debhelper-compat (= 13),
  git <!nocheck>,
  libarchive-dev (>= 3.3.3) <!pkg.cmake.bootstrap>,
  libcppdap-dev <!pkg.cmake.bootstrap>,
@@ -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: <!pkg.cmake.bootstrap !pkg.cmake.nogui>
 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
+Package: cmake-data
-Architecture: any
+Architecture: all
-Build-Profiles: <!pkg.cmake.bootstrap !pkg.cmake.nogui>
+Multi-Arch: foreign
 Depends:
  ${misc:Depends},
- ${shlibs:Depends},
+Description: CMake data files (modules, templates and documentation)
- cmake (= ${binary:Version}),
-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
+ This package provides CMake architecture independent data files (modules,
- settings may be specified interactively. Brief instructions are provided at
+ templates, documentation etc.). Unless you have cmake installed, you probably
- the bottom of the window when the program is running. The main executable
+ do not need this package.
- file for this GUI is "cmake-gui".
 
 Package: cmake-doc
 Architecture: all
@@ -106,13 +92,32 @@ Build-Profiles: <!pkg.cmake.bootstrap>
 Multi-Arch: foreign
 Section: doc
 Depends:
+ cmake-data (= ${source:Version}),
  ${misc:Depends},
  ${sphinxdoc:Depends},
- cmake-data (= ${source:Version}),
+Recommends:
-Recommends: doc-base
+ doc-base,
-Suggests: cmake
+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: <!pkg.cmake.bootstrap !pkg.cmake.nogui>
+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".

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.
-

debian/tests/control

@@ -1,46 +1,49 @@
-Tests: testsuite testsuite-ninja findmodules
+Tests:
-Restrictions: allow-stderr
+ testsuite testsuite-ninja findmodules,
-Depends: cmake,
+Restrictions:
-  ninja-build,
+ allow-stderr,
-  @builddeps@,
+Depends:
-  libasound2-dev,
-  libarmadillo-dev,
  bison,
-  libboost-dev,
+ cmake,
-  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,
+ 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,
-  libopenscenegraph-dev,
+ mercurial,
+ ninja-build,
  perl,
-  python3-dev,
-  libphysfs-dev,
  pkg-config,
-  ruby-dev,
-  libprotobuf-dev,
  protobuf-compiler,
+ python3-dev,
+ ruby-dev,
  subversion,
  swig,
-  libtiff5-dev,
+ zlib1g-dev,
-  zlib1g-dev
+ @builddeps@,