Merge ~a-volkov/kubuntu-packaging/+git/extra-cmake-modules:kubuntu_hirsute_staging into ~kubuntu-packagers/kubuntu-packaging/+git/extra-cmake-modules:kubuntu_hirsute_staging

[Alexander Volkov]

[Jose Manuel Santamaria Lema (panfaust)]

NOTES (mostly for us, kubuntu devs reviewing the patch):

1. This change (move documentation to its own extra-cmake-modules-doc package) was included in the package from debian experimental src:extra-cmake-modules version 5.74.0-2

2. The package mentioned above is waiting in Debian's NEW queue: https://ftp-master.debian.org/new/extra-cmake-modules_5.74.0-2.html

3. In the source package mentioned above, extra-cmake-modules-doc declares a Breaks/Replaces against "extra-cmake-modules (>> 5.74.0-1)" I have the impression that this version is incorrect and the Breaks/Replaces should be declared against "extra-cmake-modules (>> 5.74.0-2)" because 5.74.0-2 would be the first package version in debian providing the split package.

4. Relevant commits from debian's git (in the order they were done):

https://salsa.debian.org/qt-kde-team/kde/extra-cmake-modules/-/commit/80bb8c1f6df1316adcc0b363f61195c89e374135

https://salsa.debian.org/qt-kde-team/kde/extra-cmake-modules/-/commit/c0865f8c7d38096c218ba8123e759f2f66f5895a

https://salsa.debian.org/qt-kde-team/kde/extra-cmake-modules/-/commit/8f77efe57e70d776c13e8710b0eb91a175df5cde

https://salsa.debian.org/qt-kde-team/kde/extra-cmake-modules/-/commit/81e87e653e8cb366da4b017929c98bf6628f1bec

https://salsa.debian.org/qt-kde-team/kde/extra-cmake-modules/-/commit/f491b24e8984506366c2b088a06f7b14ce6da858

Unmerged commits

07186d5... by Alexander Volkov on 2020-07-16

Extract extra-cmake-modules-doc package

Don't build it when nodoc profile is enabled.
This makes possible to build extra-cmake-modules without rather
heavy dependency on python-sphinx. Besides, the binary package
extra-cmake-modules will not depend on libjs-underscore and
node-jquery.

diff --git a/debian/control b/debian/control
index ddbd1be..84d0a31 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Uploaders: Maximiliano Curia <[e-mail]>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 11~),
                dh-linktree,
-               libjs-jquery,
-               libjs-underscore,
+               libjs-jquery <!nodoc>,
+               libjs-underscore <!nodoc>,
                pkg-kde-tools (>= 0.15.16~),
-               python3-distutils,
-               python3-setuptools,
-               python3-sphinx,
-               python3-sphinxcontrib.qthelp,
-               python3-sphinxcontrib.serializinghtml,
+               python3-distutils <!nodoc>,
+               python3-setuptools <!nodoc>,
+               python3-sphinx <!nodoc>,
+               python3-sphinxcontrib.qthelp <!nodoc>,
+               python3-sphinxcontrib.serializinghtml <!nodoc>,
                qtdeclarative5-dev (>= 5.6.1),
                qttools5-dev (>= 5.6.1),
                qttools5-dev-tools (>= 5.6.1),
@@ -26,7 +26,7 @@ Package: extra-cmake-modules
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Suggests: qt5-qmake, qtbase5-dev
+Suggests: qt5-qmake, qtbase5-dev, extra-cmake-modules-doc
 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
@@ -37,3 +37,24 @@ 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.
+
+Package: extra-cmake-modules-doc
+Build-Profiles: <!nodoc>
+Architecture: all
+Multi-Arch: foreign
+Section: doc
+Depends: ${misc:Depends}
+Breaks: extra-cmake-modules (<< 5.77)
+Replaces: extra-cmake-modules (<< 5.77)
+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.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/linktrees b/debian/extra-cmake-modules-doc.linktrees
similarity index 100%
rename from debian/linktrees
rename to debian/extra-cmake-modules-doc.linktrees
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
diff --git a/debian/rules b/debian/rules
index 24d9561..c5653d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,12 @@ override_dh_auto_configure:
 
 override_dh_install:
 	$(overridden_command)
-	rm debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/jquery.js
-	ln -s /usr/share/javascript/jquery/jquery.js debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/jquery.js
-	rm debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/underscore.js
-	ln -s /usr/share/javascript/underscore/underscore.js debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/underscore.js
+ifeq (,$(filter $(DEB_BUILD_PROFILES),nodoc))
+	rm debian/extra-cmake-modules-doc/usr/share/doc/ECM/html/_static/jquery.js
+	ln -s /usr/share/javascript/jquery/jquery.js debian/extra-cmake-modules-doc/usr/share/doc/ECM/html/_static/jquery.js
+	rm debian/extra-cmake-modules-doc/usr/share/doc/ECM/html/_static/underscore.js
+	ln -s /usr/share/javascript/underscore/underscore.js debian/extra-cmake-modules-doc/usr/share/doc/ECM/html/_static/underscore.js
+endif
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time