[Pkg-owncloud-commits] [owncloud-client] 01/04: Moved logic from patch 0002-create-manpage.patch -> debian/rules

[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 ee044a12a9cbc77b5be35bc5278cbbbad3e2ee8a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed May 7 20:23:03 2014 +0200

    Moved logic from patch 0002-create-manpage.patch -> debian/rules
---
 debian/patches/0002-create-manpage.patch | 26 --------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  5 ++++-
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/debian/patches/0002-create-manpage.patch b/debian/patches/0002-create-manpage.patch
deleted file mode 100644
index f9efcf0..0000000
--- a/debian/patches/0002-create-manpage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Creates manpages for archs
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Last-Update: 2013-10-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/doc/CMakeLists.txt
-===================================================================
---- owncloud-client.orig/doc/CMakeLists.txt	2013-12-13 15:40:33.669149909 +0100
-+++ owncloud-client/doc/CMakeLists.txt	2013-12-13 15:40:33.662149898 +0100
-@@ -20,6 +20,7 @@
-        install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
-     else(WITH_DOC)
-        add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
-+       install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
-     endif(WITH_DOC)
- 
-     if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ocdoc/_shared_assets")
-@@ -74,7 +75,7 @@
-                                 -D html_theme=owncloud_com
- 				${CMAKE_CURRENT_SOURCE_DIR}
- 				${SPHINX_HTML_DIR}/com )
--    add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
-+    add_custom_target( doc-man ALL ${SPHINX_EXECUTABLE}
- 	                        -q -c . -b man
- 				-d ${SPHINX_CACHE_DIR}/man
- 				${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/debian/patches/series b/debian/patches/series
index f059c93..3af17d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-disable-updatecheck.patch
-0002-create-manpage.patch
 0004-debian_version.patch
 freebsd.patch
diff --git a/debian/rules b/debian/rules
index af0114d..14f4337 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 %:
 	dh $@ --parallel --with sphinxdoc --with pkgkde_symbolshelper
 
-# Only do this for an indep build
 override_dh_auto_test:
 	mkdir obj-$(DEB_HOST_GNU_TYPE)/config
 	XDG_CONFIG_HOME=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/config dh_auto_test
@@ -21,6 +20,10 @@ override_dh_auto_configure-arch:
 override_dh_auto_configure-indep:
 	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DWITH_DOC=ON -DUNIT_TESTING=ON -DDEBIAN_VERSION=$(DEBVERS)
 
+override_dh_auto_build-arch:
+	dh_auto_build --
+	dh_auto_build -- doc-man
+
 override_dh_install:
 	dh_install --list-missing \
 		-Xusr/share/doc/mirall/latex \

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