kubuntu-council team mailing list archive

[Alexander Volkov <avolkov@xxxxxxxxxxxxx>]

Alexander Volkov has proposed merging ~a-volkov/kubuntu-packaging/+git/extra-cmake-modules:kubuntu_groovy_staging into ~kubuntu-packagers/kubuntu-packaging/+git/extra-cmake-modules:kubuntu_groovy_staging.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~a-volkov/kubuntu-packaging/+git/extra-cmake-modules/+merge/391161
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of ~a-volkov/kubuntu-packaging/+git/extra-cmake-modules:kubuntu_groovy_staging into ~kubuntu-packagers/kubuntu-packaging/+git/extra-cmake-modules:kubuntu_groovy_staging.

diff --git a/debian/control b/debian/control
index ddbd1be..119f7f3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Uploaders: Maximiliano Curia <maxy@xxxxxxxxxx>
 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.75)
+Replaces: extra-cmake-modules (<< 5.75)
+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..4227cd6
--- /dev/null
+++ b/debian/extra-cmake-modules-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc/ECM
+usr/share/man
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..98f6c22
--- /dev/null
+++ b/debian/extra-cmake-modules.install
@@ -0,0 +1 @@
+usr/share/ECM
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