rev 20249 - kde-extras/lensfun/trunk/debian

[Pino Toscano]

Author: pino
Date: 2016-01-09 08:50:41 +0000 (Sat, 09 Jan 2016)
New Revision: 20249

Modified:
   kde-extras/lensfun/trunk/debian/changelog
   kde-extras/lensfun/trunk/debian/control
   kde-extras/lensfun/trunk/debian/rules
Log:
rework building of documentation

since BUILD_DOC enables other documentation than the API docs, we always
need to enable it:
- move doxygen as proper build dependency
- always enable BUILD_DOC in cmake
- add the python3-docutils build dependency, needed for rst2man


Modified: kde-extras/lensfun/trunk/debian/changelog
===================================================================
--- kde-extras/lensfun/trunk/debian/changelog	2016-01-09 08:42:46 UTC (rev 20248)
+++ kde-extras/lensfun/trunk/debian/changelog	2016-01-09 08:50:41 UTC (rev 20249)
@@ -16,6 +16,11 @@
     - use the python3 dh addon to handle the python3 packaging
   * Rename the DOCDIR parameter for cmake to CMAKE_INSTALL_DOCDIR, as upstream
     uses GNUInstallDirs.cmake now.
+  * Rework the building of the documentation: since BUILD_DOC enables other
+    documentation than the API docs, we always need to enable it:
+    - move doxygen as proper build dependency
+    - always enable BUILD_DOC in cmake
+    - add the python3-docutils build dependency, needed for rst2man
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 09 Jan 2016 08:34:11 +0100
 

Modified: kde-extras/lensfun/trunk/debian/control
===================================================================
--- kde-extras/lensfun/trunk/debian/control	2016-01-09 08:42:46 UTC (rev 20248)
+++ kde-extras/lensfun/trunk/debian/control	2016-01-09 08:50:41 UTC (rev 20249)
@@ -3,8 +3,9 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>
 Build-Depends: debhelper (>= 9), cmake, pkg-config, python3, libglib2.0-dev,
- libpng-dev
-Build-Depends-Indep: doxygen
+ libpng-dev,
+ doxygen,
+ python3-docutils,
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://lensfun.sourceforge.net

Modified: kde-extras/lensfun/trunk/debian/rules
===================================================================
--- kde-extras/lensfun/trunk/debian/rules	2016-01-09 08:42:46 UTC (rev 20248)
+++ kde-extras/lensfun/trunk/debian/rules	2016-01-09 08:50:41 UTC (rev 20249)
@@ -3,11 +3,7 @@
 	dh $@ --parallel --buildsystem=cmake --with=python3
 
 override_dh_auto_configure:
-ifneq (,$(filter %-doc,$(shell dh_listpackages)))
 	dh_auto_configure -- -DBUILD_DOC=ON -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/liblensfun-doc/html"
-else
-	dh_auto_configure -- -DBUILD_DOC=OFF
-endif
 
 override_dh_auto_clean:
 	find -name "*.pyc" -exec rm -f '{}' \;