[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.1.3-13-g51def36
Sandro Knauß
bugs at sandroknauss.de
Sun Dec 16 23:52:10 UTC 2012
The following commit has been merged in the master branch:
commit 51def3647a63d4f52152b067cef3a3f14588a4b5
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Mon Dec 17 00:51:32 2012 +0100
creating doc package and manpage
diff --git a/debian/control b/debian/control
index fa47011..2ce6089 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,24 @@ Section: net
Priority: optional
Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>, Paul van Tilburg <paulvt at debian.org>
-Build-Depends: debhelper (>= 9), cmake, libqt4-dev (>= 4.7), libocsync-dev (>= 0.60.3)
+Build-Depends: debhelper (>= 9), cmake, libqt4-dev (>= 4.7), libocsync-dev (>= 0.60.3),
+ sphinx-common, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, qt4-dev-tools
+Vcs-Git: git://git.debian.org/git/pkg-owncloud/owncloud-client.git
+Vcs-browser: http://git.debian.org/?p=pkg-owncloud/owncloud-client.git
Standards-Version: 3.9.3
+Homepage: http://owncloud.org/dev/sync-clients/linux-build/
Package: owncloud-client
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, oxygen-icon-theme, libocsync-plugin-owncloud (>= 0.60.3)
Description: GUI app to sync a folder to ownCloud
GUI to sync your local folders with an ownCloud server.
+
+Package: owncloud-client-doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Section: doc
+Description: GUI app to sync a folder to ownCloud (documentation)
+ GUI to sync your local folders with an ownCloud server.
+ .
+ These are the Documenation files.
diff --git a/debian/owncloud-client-doc.docs b/debian/owncloud-client-doc.docs
new file mode 100644
index 0000000..a253361
--- /dev/null
+++ b/debian/owncloud-client-doc.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/mirall/* /usr/share/doc/owncloud-client/
diff --git a/debian/owncloud-client.docs b/debian/owncloud-client.docs
new file mode 100644
index 0000000..b43bf86
--- /dev/null
+++ b/debian/owncloud-client.docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/owncloud-client.install b/debian/owncloud-client.install
index 0204fdc..0f6970d 100644
--- a/debian/owncloud-client.install
+++ b/debian/owncloud-client.install
@@ -1 +1,6 @@
+usr/lib/libowncloudsync.so
+etc/
+usr/bin/owncloud
+usr/share/mirall/i18n/
+usr/share/icons/*/*/apps/owncloud.png
debian/extrafiles/owncloud-client.desktop /usr/share/applications/
diff --git a/debian/owncloud-client.manpages b/debian/owncloud-client.manpages
new file mode 100644
index 0000000..21ecd43
--- /dev/null
+++ b/debian/owncloud-client.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man/*
diff --git a/debian/patches/doc2default b/debian/patches/doc2default
new file mode 100644
index 0000000..1154a6b
--- /dev/null
+++ b/debian/patches/doc2default
@@ -0,0 +1,42 @@
+Index: owncloud-client-1.1.3/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')
+
+ 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(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 @@
+ add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
+ DEPENDS doc-latex )
+ add_dependencies(doc doc-pdf)
++ install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ endif(PDFLATEX_FOUND)
+ if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
+ add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
+@@ -34,17 +35,20 @@
+ ${SPHINX_QCH_DIR}/*.qhcp
+ DEPENDS doc-qch-sphinx )
+ add_dependencies(doc doc-qch)
++ install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ endif()
+ add_custom_target( doc-html ${SPHINX_EXECUTABLE}
+ -q -c . -b html
+ -d ${SPHINX_CACHE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${SPHINX_HTML_DIR} )
++ install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ add_custom_target( doc-man ${SPHINX_EXECUTABLE}
+ -q -c . -b man
+ -d ${SPHINX_CACHE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${SPHINX_MAN_DIR} )
++ install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
+ ## Building CHM files requires HTML Help Workshop. Since it requires wine
+ ## with special dependencies, it's impossible to write a cmake check for it.
+ ## This is why doc-chm is not a dependency for doc. Instead, run
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..a41ba87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+doc2default
diff --git a/debian/rules b/debian/rules
index 3d842d8..1dcfb5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,7 @@
export CSYNC_DIR=/usr/include/ocsync
%:
- dh $@
+ dh $@ --with sphinxdoc
override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc/ownCloud
-
-override_dh_install:
- dh_install
- install -m 644 -D $(CURDIR)/debian/extrafiles/owncloud-client.desktop $(CURDIR)/debian/owncloud-client/usr/share/applications/owncloud-client.desktop
- rm $(CURDIR)/debian/owncloud-client/usr/bin/mirall
- rm $(CURDIR)/debian/owncloud-client/usr/share/icons/hicolor/48x48/apps/mirall.png
--
owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list