[Pkg-owncloud-commits] [owncloud-client] 01/01: make documentation parts installable

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 4e9bd8cb438b13fb2134f6dfb2361023bd52b8e5
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu May 8 04:41:40 2014 +0200

    make documentation parts installable
---
 debian/changelog                       |  1 +
 debian/patches/0004-doc-optional.patch | 50 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4a26ddb..67cb0cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ owncloud-client (1.6.0~beta2+dfsg-2) experimental; urgency=medium
 
   * Run the tests with --max-parallel=1 to fix FTBFS. (Closes: #746278)
     Thanks Dmitry Shachnev
+  * Added patch to make doc parts installable.
 
  -- Sandro Knauß <bugs at sandroknauss.de>  Thu, 08 May 2014 02:07:35 +0200
 
diff --git a/debian/patches/0004-doc-optional.patch b/debian/patches/0004-doc-optional.patch
new file mode 100644
index 0000000..7a99609
--- /dev/null
+++ b/debian/patches/0004-doc-optional.patch
@@ -0,0 +1,50 @@
+Description: install doc targets in any case.
+  if a user only builds some parts of the documentations and afterwards installs
+  it via 'make install', than these built parts should be installed too.
+Author: Sandro Knauß <bugs at sandroknauss.de
+Origin: debian
+Last-Update: 2014-05-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: owncloud-client/doc/CMakeLists.txt
+===================================================================
+--- owncloud-client.orig/doc/CMakeLists.txt	2014-05-08 04:26:58.216164473 +0200
++++ owncloud-client/doc/CMakeLists.txt	2014-05-08 04:28:50.917202173 +0200
+@@ -12,12 +12,15 @@
+     # assets
+     set(LATEX_LOGO          "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
+ 
++    install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
++    install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
++    install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
++    install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
++
+     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
+ 
+     if(WITH_DOC)
+        add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
+-       install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-       install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
+     else(WITH_DOC)
+        add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
+     endif(WITH_DOC)
+@@ -39,9 +42,6 @@
+         add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf
+ 		                  DEPENDS doc-latex )
+         add_dependencies(doc doc-pdf)
+-        if (WITH_DOC)
+-           install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-        endif (WITH_DOC)
+     endif(PDFLATEX_FOUND)
+     if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
+         add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
+@@ -53,9 +53,6 @@
+ 		                   ${SPHINX_QCH_DIR}/*.qhcp
+ 				   DEPENDS doc-qch-sphinx )
+         add_dependencies(doc doc-qch)
+-        if (WITH_DOC)
+-            install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-        endif (WITH_DOC)
+     endif()
+     add_custom_target( doc-html ${SPHINX_EXECUTABLE}
+ 	                        -q -c . -b html
diff --git a/debian/patches/series b/debian/patches/series
index bae1d73..248d161 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-disable-updatecheck.patch
 0002-debian_version.patch
 0003-freebsd.patch
+0004-doc-optional.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git