[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.2.0+debian-48-ga3c7391
Sandro Knauß
bugs at sandroknauss.de
Mon Feb 4 20:25:25 UTC 2013
The following commit has been merged in the master branch:
commit 5757ddb0f8f246900da1e0caf2e04bf972793f41
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Mon Feb 4 19:57:03 2013 +0100
now using patches, that will be pushed to mirall upstream:
see https://github.com/owncloud/mirall/pull/313
and https://github.com/owncloud/mirall/pull/312
diff --git a/debian/patches/doc2default b/debian/patches/doc2default-0001-adding-doc-to-default-if-CREATEDOC-is-set.patch
similarity index 68%
rename from debian/patches/doc2default
rename to debian/patches/doc2default-0001-adding-doc-to-default-if-CREATEDOC-is-set.patch
index ed54a22..9d10d22 100644
--- a/debian/patches/doc2default
+++ b/debian/patches/doc2default-0001-adding-doc-to-default-if-CREATEDOC-is-set.patch
@@ -1,20 +1,32 @@
-Index: owncloud-client/doc/CMakeLists.txt
-adds the doc target to default target.
-With this patch the documentation can be build via debian/rules and it can
-be installed to /usr/share/doc/
-===================================================================
---- 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 @@
+From edb4ff6b98c26c925b54025375ec49ec227ad346 Mon Sep 17 00:00:00 2001
+From: hefee <hefee at netzguerilla.net>
+Date: Mon, 4 Feb 2013 18:10:51 +0100
+Subject: [PATCH 1/2] adding doc to default if CREATEDOC is set
+
+---
+ doc/CMakeLists.txt | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 084eb16..dc18876 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -13,7 +13,13 @@ if(SPHINX_FOUND)
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...")
-+ add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
++
++ if(CREATEDOC)
++ add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
++ else()
++ add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
++ endif()
++
if(PDFLATEX_FOUND)
# if this still fails on Debian/Ubuntu, run
# apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-@@ -26,6 +26,7 @@
+@@ -26,6 +32,7 @@ if(SPHINX_FOUND)
add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
DEPENDS doc-latex )
add_dependencies(doc doc-pdf)
@@ -22,7 +34,7 @@ be installed to /usr/share/doc/
endif(PDFLATEX_FOUND)
if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
-@@ -37,17 +38,20 @@
+@@ -37,17 +44,20 @@ if(SPHINX_FOUND)
${SPHINX_QCH_DIR}/*.qhcp
DEPENDS doc-qch-sphinx )
add_dependencies(doc doc-qch)
@@ -43,3 +55,6 @@ be installed to /usr/share/doc/
## 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
+--
+1.7.10.4
+
diff --git a/debian/patches/doc2default-0002-only-add-instalation-dir-if-we-are-creating-doc.patch b/debian/patches/doc2default-0002-only-add-instalation-dir-if-we-are-creating-doc.patch
new file mode 100644
index 0000000..5a6f94a
--- /dev/null
+++ b/debian/patches/doc2default-0002-only-add-instalation-dir-if-we-are-creating-doc.patch
@@ -0,0 +1,60 @@
+From 1f4ea2c60eeba14d4c26837ba3f12685b5cbbbfa Mon Sep 17 00:00:00 2001
+From: hefee <hefee at netzguerilla.net>
+Date: Mon, 4 Feb 2013 18:31:48 +0100
+Subject: [PATCH 2/2] only add instalation dir if we are creating doc
+
+---
+ doc/CMakeLists.txt | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index dc18876..bd6fc8c 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -16,6 +16,8 @@ if(SPHINX_FOUND)
+
+ if(CREATEDOC)
+ 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()
+ add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
+ endif()
+@@ -32,7 +34,9 @@ if(SPHINX_FOUND)
+ 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})
++ if(CREATEDOC)
++ install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
++ endif()
+ endif(PDFLATEX_FOUND)
+ if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
+ add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
+@@ -44,20 +48,20 @@ if(SPHINX_FOUND)
+ ${SPHINX_QCH_DIR}/*.qhcp
+ DEPENDS doc-qch-sphinx )
+ add_dependencies(doc doc-qch)
+- install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
++ if(CREATEDOC)
++ install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
++ endif()
+ 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
+--
+1.7.10.4
+
diff --git a/debian/patches/manpage-0001-adding-monoicons-option-to-usage.rst.patch b/debian/patches/manpage-0001-adding-monoicons-option-to-usage.rst.patch
new file mode 100644
index 0000000..1b250cb
--- /dev/null
+++ b/debian/patches/manpage-0001-adding-monoicons-option-to-usage.rst.patch
@@ -0,0 +1,26 @@
+From 0e6e614318a5cf8148870d70a6579c74f595ea2e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <bugs at sandroknauss.de>
+Date: Mon, 4 Feb 2013 16:55:50 +0100
+Subject: [PATCH 1/3] adding --monoicons option to usage.rst
+
+---
+ doc/usage.rst | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doc/usage.rst b/doc/usage.rst
+index cef8404..cd4424a 100644
+--- a/doc/usage.rst
++++ b/doc/usage.rst
+@@ -30,6 +30,9 @@ ownCloud Client supports the following command line switches:
+ +--------------------------+------------------------------------------------+
+ | ``--flushlog`` | flush the log file after every write. |
+ +--------------------------+------------------------------------------------+
++| ``--monoicons`` | Use black/white pictograms for systray. |
+++--------------------------+------------------------------------------------+
++
+
+ Config File
+ -----------
+--
+1.7.10.4
+
diff --git a/debian/patches/manpage-0002-adding-manpages-for-mirall-and-owncloud.patch b/debian/patches/manpage-0002-adding-manpages-for-mirall-and-owncloud.patch
new file mode 100644
index 0000000..78febe7
--- /dev/null
+++ b/debian/patches/manpage-0002-adding-manpages-for-mirall-and-owncloud.patch
@@ -0,0 +1,237 @@
+From 7ef92748ea4c707b6f97f09412a05fd30ab614d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <bugs at sandroknauss.de>
+Date: Mon, 4 Feb 2013 16:56:39 +0100
+Subject: [PATCH 2/3] adding manpages for mirall and owncloud
+
+---
+ doc/asciidoc.conf | 9 +++++
+ doc/makeman.sh | 9 +++++
+ doc/mirall.1.txt | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ doc/owncloud.1.txt | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 201 insertions(+)
+ create mode 100644 doc/asciidoc.conf
+ create mode 100755 doc/makeman.sh
+ create mode 100644 doc/mirall.1.txt
+ create mode 100644 doc/owncloud.1.txt
+
+Index: owncloud-client/doc/asciidoc.conf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ owncloud-client/doc/asciidoc.conf 2013-02-04 19:43:17.882263033 +0100
+@@ -0,0 +1,9 @@
++#
++# Customization for owncloud documentation.
++#
++[specialwords]
++ifndef::doctype-manpage[]
++emphasizedwords=(?u)\\?\bownCloud\b
++monospacedwords=(?u)\\?\bowncloud\(1\)
++monospacedwords=(?u)\\?\bmirall\(1\)
++endif::doctype-manpage[]
+Index: owncloud-client/doc/makeman.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ owncloud-client/doc/makeman.sh 2013-02-04 19:43:17.883263036 +0100
+@@ -0,0 +1,9 @@
++#!/bin/bash
++# Last Change: 2008-07-03 11:08:54
++
++for f in $@; do
++ test "${f##*/}" = "CMakeLists.txt" && continue
++ echo -e "\e[32mCreating manpage ${f%.*}\e[0m"
++ a2x --doctype=manpage --format=manpage $f
++ rm -f ${f%.*}.xml
++done
+Index: owncloud-client/doc/mirall.1.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ owncloud-client/doc/mirall.1.txt 2013-02-04 19:43:17.883263036 +0100
+@@ -0,0 +1,92 @@
++mirall(1)
++========
++
++NAME
++----
++
++mirall - File synchronisation desktop utility.
++
++
++SYNOPSIS
++--------
++
++*mirall* ['OPTION'...]
++
++
++DESCRIPTION
++-----------
++
++mirall is a file synchronisation desktop utility.
++It synchronizes files on your local machine with an ownCloud Server. If you
++make a change to the files on one computer, it will flow across the others
++using this desktop sync clients.
++
++Normally you start the client by clickck on the desktoop icon or start from the
++application menu. After starting an ownCloud icon appears in the system tray.
++
++
++OPTIONS
++-------
++
++*--logwindow*::
++ Open a window to show log output at startup.
++
++*--logfile '<filename>'*::
++ write log output to file.
++
++*--flushlog*::
++ flush the log file after every write.
++
++*--monoicons*::
++ Use black/white pictograms for systray.
++
++*--help*::
++ Print the help list
++
++
++Config File
++-----------
++
++ownCloud Client reads a configuration file which on Linux can be found at
++'$HOME/.local/share/data/ownCloud/owncloud.cfg'
++
++On Windows and Mac, it can be found in
++'\Users\<name>\AppData\Local\ownCloud\owncloud.cfg'
++
++*Changes here should be done carefully as wrong settings can cause disfunctionality.*
++
++
++These are config settings that may be changed:
++
++*remotePollinterval*::
++ Poll time for the remote repository in milliseconds (default 30000)
++
++*maxLogLines*::
++ Maximum count of log lines shown in the log window (default 20000)
++
++*remotePollinterval*::
++ The frequency used for polling for remote changes on the ownCloud Server.
++
++
++BUGS
++----
++
++Please report bugs at 'https://github.com/owncloud/core/issues'.
++
++
++SEE ALSO
++--------
++
++*csync*(1), *owncloud*(1)
++
++
++AUTHORS
++-------
++
++The ownCloud developers
++
++
++COPYING
++-------
++Copyright (c) 2013 the ownCloud developers. Free use of this software is granted under the terms of the GNU General Public License (GPL2+).
++
+Index: owncloud-client/doc/owncloud.1.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ owncloud-client/doc/owncloud.1.txt 2013-02-04 19:43:17.884263039 +0100
+@@ -0,0 +1,91 @@
++owncloud(1)
++===========
++
++NAME
++----
++
++owncloud - File synchronisation desktop utility.
++
++
++SYNOPSIS
++--------
++
++*owncloud* ['OPTION'...]
++
++
++DESCRIPTION
++-----------
++
++owncloud is a file synchronisation desktop utility it is based on mirall.
++It synchronizes files on your local machine with an ownCloud Server. If you
++make a change to the files on one computer, it will flow across the others
++using this desktop sync clients.
++
++Normally you start the client by clickck on the desktoop icon or start from the
++application menu. After starting an ownCloud icon appears in the system tray.
++
++
++OPTIONS
++-------
++
++*--logwindow*::
++ Open a window to show log output at startup.
++
++*--logfile '<filename>'*::
++ write log output to file.
++
++*--flushlog*::
++ flush the log file after every write.
++
++*--monoicons*::
++ Use black/white pictograms for systray.
++
++*--help*::
++ Print the help list
++
++
++Config File
++-----------
++
++ownCloud Client reads a configuration file which on Linux can be found at
++'$HOME/.local/share/data/ownCloud/owncloud.cfg'
++
++On Windows and Mac, it can be found in
++'\Users\<name>\AppData\Local\ownCloud\owncloud.cfg'
++
++*Changes here should be done carefully as wrong settings can cause disfunctionality.*
++
++
++These are config settings that may be changed:
++
++*remotePollinterval*::
++ Poll time for the remote repository in milliseconds (default 30000)
++
++*maxLogLines*::
++ Maximum count of log lines shown in the log window (default 20000)
++
++*remotePollinterval*::
++ The frequency used for polling for remote changes on the ownCloud Server.
++
++
++BUGS
++----
++
++Please report bugs at 'https://github.com/owncloud/core/issues'.
++
++
++SEE ALSO
++--------
++
++*csync*(1), *mirall*(1)
++
++
++AUTHORS
++-------
++
++The ownCloud developers
++
++
++COPYING
++-------
++Copyright (c) 2013 the ownCloud developers. Free use of this software is granted under the terms of the GNU General Public License (GPL2+).
diff --git a/debian/patches/manpage-0003-add-creating-manpages-to-CMakeLists.patch b/debian/patches/manpage-0003-add-creating-manpages-to-CMakeLists.patch
new file mode 100644
index 0000000..bb6a655
--- /dev/null
+++ b/debian/patches/manpage-0003-add-creating-manpages-to-CMakeLists.patch
@@ -0,0 +1,60 @@
+From 279bb47ab4797d3abe0227863f025d8c09acbccf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <bugs at sandroknauss.de>
+Date: Mon, 4 Feb 2013 17:36:56 +0100
+Subject: [PATCH 3/3] add creating manpages to CMakeLists
+
+---
+ doc/CMakeLists.txt | 11 ++++++++++-
+ doc/makeman.sh | 8 +++++++-
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 084eb16..f135e0e 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -43,11 +43,20 @@ if(SPHINX_FOUND)
+ -d ${SPHINX_CACHE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${SPHINX_HTML_DIR} )
+- add_custom_target( doc-man ${SPHINX_EXECUTABLE}
++ add_custom_target( doc-sphinx-man ${SPHINX_EXECUTABLE}
+ -q -c . -b man
+ -d ${SPHINX_CACHE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${SPHINX_MAN_DIR} )
++
++ file(GLOB _manpages *.[0-9].txt)
++ add_custom_target(doc-man
++ COMMAND
++ MAN_DIR=${SPHINX_MAN_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/makeman.sh ${_manpages}
++ WORKING_DIRECTORY
++ ${CMAKE_CURRENT_SOURCE_DIR}
++ )
++
+ ## 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/doc/makeman.sh b/doc/makeman.sh
+index 913d0f0..52917cc 100755
+--- a/doc/makeman.sh
++++ b/doc/makeman.sh
+@@ -1,9 +1,15 @@
+ #!/bin/bash
+ # Last Change: 2008-07-03 11:08:54
+
++if [ "x${MAN_DIR}" == 'x' ]; then
++ MAN_DIR=`pwd`
++fi
++
++mkdir -p ${MAN_DIR}
++
+ for f in $@; do
+ test "${f##*/}" = "CMakeLists.txt" && continue
+ echo -e "\e[32mCreating manpage ${f%.*}\e[0m"
+- a2x --doctype=manpage --format=manpage $f
++ a2x --doctype=manpage --format=manpage $f --destination-dir ${MAN_DIR}
+ rm -f ${f%.*}.xml
+ done
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 9db6faa..8e0be7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
-doc2default
+doc2default-0001-adding-doc-to-default-if-CREATEDOC-is-set.patch
+doc2default-0002-only-add-instalation-dir-if-we-are-creating-doc.patch
+manpage-0001-adding-monoicons-option-to-usage.rst.patch
+manpage-0002-adding-manpages-for-mirall-and-owncloud.patch
+manpage-0003-add-creating-manpages-to-CMakeLists.patch
soname
diff --git a/debian/rules b/debian/rules
index 39ad7c4..f78982d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,4 @@ export CSYNC_DIR=/usr/include/ocsync
dh $@ --with sphinxdoc --with kde --parallel
override_dh_auto_configure:
- dh_auto_configure --buildsystem=kde -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc/owncloud
+ dh_auto_configure --buildsystem=kde -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc/owncloud -DCREATEDOC=ON
--
owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list