[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.2.3+debian-77-g8dbdd56

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 7312807df8e30be104b94bba8fb423f3e5c50f2b
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Apr 5 01:47:05 2013 +0200

    update patches: buildung doc now with cmake option WITH_DOC

diff --git a/debian/patches/doc2default b/debian/patches/doc2default
deleted file mode 100644
index e850674..0000000
--- a/debian/patches/doc2default
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: owncloud-client/doc/CMakeLists.txt
-===================================================================
---- owncloud-client.orig/doc/CMakeLists.txt	2013-03-05 05:10:19.427710004 +0100
-+++ owncloud-client/doc/CMakeLists.txt	2013-03-05 15:33:21.954794234 +0100
-@@ -14,7 +14,7 @@
- 
-     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
- 
--    add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
-+    add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
-     if (UNIX AND (NOT APPLE))
-         install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-         install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
diff --git a/debian/patches/series b/debian/patches/series
index a41ba87..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-doc2default
diff --git a/debian/rules b/debian/rules
index a5aa6bc..c6b1dfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,4 @@ export CSYNC_DIR=/usr/include/ocsync
 	dh $@ --with sphinxdoc --with kde --parallel --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem=kde -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc/owncloud -DCREATEDOC=ON 
+	dh_auto_configure --buildsystem=kde -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc/owncloud -DCREATEDOC=ON -DWITH_DOC=ON

-- 
owncloud-client.git