[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.1.4-28-g7c241b1

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 7c241b1c960f1b5aab2e1e4b9f33d90917215c3f
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu Jan 31 01:00:37 2013 +0100

    update patches/doc2default

diff --git a/debian/patches/doc2default b/debian/patches/doc2default
index 1154a6b..86c7e8d 100644
--- a/debian/patches/doc2default
+++ b/debian/patches/doc2default
@@ -1,9 +1,9 @@
-Index: owncloud-client-1.1.3/doc/CMakeLists.txt
+Index: owncloud-client/doc/CMakeLists.txt
 ===================================================================
---- owncloud-client-1.1.3.orig/doc/CMakeLists.txt	2012-12-16 22:09:03.898373721 +0100
-+++ owncloud-client-1.1.3/doc/CMakeLists.txt	2012-12-16 23:53:08.421415833 +0100
-@@ -11,7 +11,7 @@
-     set(MSHTML_COMPILER     wine 'C:\\Program Files\\HTML Help Workshop\\hhc.exe')
+--- owncloud-client.orig/doc/CMakeLists.txt	2013-01-31 00:58:36.811861394 +0100
++++ owncloud-client/doc/CMakeLists.txt	2013-01-31 00:58:36.803861372 +0100
+@@ -13,7 +13,7 @@
+     set(LATEX_LOGO          "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
  
      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
 -    add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
@@ -11,7 +11,7 @@ Index: owncloud-client-1.1.3/doc/CMakeLists.txt
      if(PDFLATEX_FOUND)
          # if this still fails on Debian/Ubuntu, run
          # apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-@@ -23,6 +23,7 @@
+@@ -26,6 +26,7 @@
          add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
  		                  DEPENDS doc-latex )
          add_dependencies(doc doc-pdf)
@@ -19,7 +19,7 @@ Index: owncloud-client-1.1.3/doc/CMakeLists.txt
      endif(PDFLATEX_FOUND)
      if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
          add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
-@@ -34,17 +35,20 @@
+@@ -37,17 +38,20 @@
  		                   ${SPHINX_QCH_DIR}/*.qhcp
  				   DEPENDS doc-qch-sphinx )
          add_dependencies(doc doc-qch)

-- 
owncloud-client.git