[neon/kde/extra-cmake-modules/Neon/unstable] debian: manually merge with Debian until I can push the git merge

[Jonathan Esk-Riddell]

Git commit a838dff813e260c9dbd1bcb913a4562d16904543 by Jonathan Esk-Riddell.
Committed on 29/04/2022 at 10:05.
Pushed by jriddell into branch 'Neon/unstable'.

manually merge with Debian until I can push the git merge

M  +41   -20   debian/control
A  +7    -0    debian/extra-cmake-modules-doc.doc-base
A  +1    -0    debian/extra-cmake-modules-doc.install
A  +2    -0    debian/extra-cmake-modules.install

https://invent.kde.org/neon/kde/extra-cmake-modules/commit/a838dff813e260c9dbd1bcb913a4562d16904543

diff --git a/debian/control b/debian/control
index c1e72fc..54f7005 100644
--- a/debian/control
+++ b/debian/control
@@ -1,29 +1,29 @@
 Source: extra-cmake-modules
-Section: libs
+Section: devel
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 11~),
-               dh-linktree,
-               libjs-jquery,
-               libjs-underscore,
+Uploaders: Aurélien COUDERC <coucouf at debian.org>,
+           Norbert Preining <norbert at preining.info>,
+Build-Depends: cmake (>= 3.16~),
+               debhelper-compat (= 13),
+               libjs-jquery (>= 3.5.1+dfsg-3) <!nodoc>,
+               libjs-underscore <!nodoc>,
                pkg-kde-tools (>= 0.15.16~),
-               python3-distutils,
-               python3-setuptools,
-               python3-sphinx,
-               qtdeclarative5-dev,
-               qttools5-dev (>= 5.4),
-               qttools5-dev-tools (>= 5.4)
-Standards-Version: 4.1.4
-Homepage: https://projects.kde.org/projects/kdesupport/extra-cmake-modules
+               python3-distutils <!nodoc>,
+               python3-setuptools <!nodoc>,
+               python3-sphinx <!nodoc>,
+               python3-sphinxcontrib.qthelp <!nodoc>,
+               python3-sphinxcontrib.serializinghtml <!nodoc>,
+Build-Depends-Indep: dh-sequence-sphinxdoc
+Standards-Version: 4.6.0
+Rules-Requires-Root: no
+Homepage: https://invent.kde.org/frameworks/extra-cmake-modules
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/extra-cmake-modules
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/extra-cmake-modules.git
 
 Package: extra-cmake-modules
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: qt5-default
+Depends: ${misc:Depends}
 Suggests: qt5-qmake, qtbase5-dev
 Description: Extra modules and scripts for CMake
  Extra CMake Modules, or ECM, aims to augment CMake with additional modules. It
@@ -35,7 +35,28 @@ Description: Extra modules and scripts for CMake
  other projects will find it useful, and outside contributions are always
  welcome. The main rule for new modules is that there must be at least two
  downstream users.
-Breaks: libkf5package-dev (<< 5.51),
-        libkf5plasma-dev (<< 5.51),
-        libkf5runner-dev (<< 5.51)
+Breaks: libkf5package-dev (<< 5.54),
+        libkf5plasma-dev (<< 5.54),
+        libkf5runner-dev (<< 5.54),
 
+Package: extra-cmake-modules-doc
+Build-Profiles: <!nodoc>
+Architecture: all
+Multi-Arch: foreign
+Section: doc
+Built-Using: ${sphinxdoc:Built-Using}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Breaks: extra-cmake-modules (<< 5.74.0-1)
+Replaces: extra-cmake-modules (<< 5.74.0-1)
+Description: Extra modules and scripts for CMake
+ Extra CMake Modules, or ECM, aims to augment CMake with additional modules. It
+ serves as both a staging ground for new modules before they are moved upstream
+ to CMake and a place for modules that, for whatever reason, are not a good fit
+ for CMake itself.
+ .
+ It is primarily driven by the needs of the KDE community, but it is hoped that
+ other projects will find it useful, and outside contributions are always
+ welcome. The main rule for new modules is that there must be at least two
+ downstream users.
+ .
+ This package contains HTML documentation and man pages.
diff --git a/debian/extra-cmake-modules-doc.doc-base b/debian/extra-cmake-modules-doc.doc-base
new file mode 100644
index 0000000..799e66e
--- /dev/null
+++ b/debian/extra-cmake-modules-doc.doc-base
@@ -0,0 +1,7 @@
+Document: extra-cmake-modules
+Title: Extra-Cmake-Modules documenation
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/ECM/html/index.html
+Files: /usr/share/doc/ECM/html/*
diff --git a/debian/extra-cmake-modules-doc.install b/debian/extra-cmake-modules-doc.install
new file mode 100644
index 0000000..f3a3e78
--- /dev/null
+++ b/debian/extra-cmake-modules-doc.install
@@ -0,0 +1 @@
+usr/share/doc/ECM
diff --git a/debian/extra-cmake-modules.install b/debian/extra-cmake-modules.install
new file mode 100644
index 0000000..ceca159
--- /dev/null
+++ b/debian/extra-cmake-modules.install
@@ -0,0 +1,2 @@
+usr/share/ECM
+usr/share/man