[Pkg-owncloud-commits] [owncloud-client] 05/09: remove applied patches
Sandro Knauß
hefee at debian.org
Wed Dec 6 19:09:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
hefee pushed a commit to branch experimental
in repository owncloud-client.
commit 7394e73b5cac158c637fe771e5f815d20807d7f7
Author: Sandro Knauß <hefee at debian.org>
Date: Wed Dec 6 18:13:22 2017 +0100
remove applied patches
---
.../0010-move-man-rst-files-to-separate-dir.patch | 158 ---------------------
debian/patches/0011-move-man-dir.patch | 69 ---------
debian/patches/series | 2 -
3 files changed, 229 deletions(-)
diff --git a/debian/patches/0010-move-man-rst-files-to-separate-dir.patch b/debian/patches/0010-move-man-rst-files-to-separate-dir.patch
deleted file mode 100644
index 13639bb..0000000
--- a/debian/patches/0010-move-man-rst-files-to-separate-dir.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 6ab305f8338c6de31ef5dec1c0c6cf14e4ecc9fc Mon Sep 17 00:00:00 2001
-From: Michael Stingl <michaelstingl at users.noreply.github.com>
-Date: Mon, 27 Nov 2017 20:53:04 +0100
-Subject: [PATCH] move man rst files to separate dir
-
----
- man/owncloud.1.rst | 33 ++++++++++++++++++
- man/owncloudcmd.1.rst | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 130 insertions(+)
- create mode 100644 man/owncloud.1.rst
- create mode 100644 man/owncloudcmd.1.rst
-
-diff --git a/man/owncloud.1.rst b/man/owncloud.1.rst
-new file mode 100644
-index 000000000..5f34fbb6e
---- /dev/null
-+++ b/man/owncloud.1.rst
-@@ -0,0 +1,33 @@
-+:orphan:
-+
-+owncloud(1)
-+————
-+
-+SYNOPSIS
-+========
-+*owncloud* [`OPTIONS`...]
-+
-+
-+DESCRIPTION
-+===========
-+The ownCloud Client is a file synchronization desktop utility. It synchronizes files on your local computer, tablet, or handheld device with an ownCloud Server. If you make a change to the files on one device, the change is propagated to all other synchronized devices using the desktop synchronization clients.
-+
-+Normally, you start the client by clicking on the desktop icon or by starting it from the client application menu. After starting, an ownCloud icon appears in the computer system tray or on your tablet or handheld device.
-+
-+Options
-+=======
-+.. include:: ../doc/options.rst
-+
-+Config File
-+===========
-+.. include:: ../doc/conffile.rst
-+
-+BUGS
-+====
-+
-+Please report bugs at https://github.com/owncloud/client/issues.
-+
-+
-+SEE ALSO
-+========
-+:manpage:`owncloudcmd(1)`
-diff --git a/man/owncloudcmd.1.rst b/man/owncloudcmd.1.rst
-new file mode 100644
-index 000000000..8d2e54f9c
---- /dev/null
-+++ b/man/owncloudcmd.1.rst
-@@ -0,0 +1,97 @@
-+:orphan:
-+
-+owncloudcmd(1)
-+—————
-+
-+SYNOPSIS
-+========
-+*owncloudcmd* [`OPTIONS`...] sourcedir owncloudurl
-+
-+DESCRIPTION
-+===========
-+owncloudcmd is the command line tool used for the ownCloud file synchronization
-+desktop utility.
-+
-+Contrary to the :manpage:`owncloud(1)` GUI client, `owncloudcmd` only performs
-+a single sync run and then exits. In so doing, `owncloudcmd` replaces the
-+`ocsync` binary used for the same purpose in earlier releases.
-+
-+A *sync run* synchronizes a single local directory using a WebDAV share on a
-+remote ownCloud server.
-+
-+To invoke the command line client, provide the local and the remote repository:
-+The first parameter is the local directory. The second parameter is
-+the server URL.
-+
-+.. note:: Prior to the 1.6 release of owncloudcmd, the tool only accepted
-+ ``owncloud://`` or ``ownclouds://`` in place of ``http://`` and ``https://`` as
-+ a scheme. See ``Examples`` for details.
-+
-+OPTIONS
-+=======
-+``—user``, ``-u`` ``[user]``
-+ Use ``user`` as the login name.
-+
-+``—password``, ``-p`` ``[password]``
-+ Use ``password`` as the password.
-+
-+``-n``
-+ Use ``netrc (5)`` for login.
-+
-+``—non-interactive``
-+ Do not prompt for questions.
-+
-+``—silent``, ``—s``
-+ Inhibits verbose log output.
-+
-+``—trust``
-+ Trust any SSL certificate, including invalid ones.
-+
-+``—httpproxy http://[user@pass:]<server>:<port>``
-+ Uses ``server`` as HTTP proxy.
-+
-+``—nonshib``
-+ Uses Non Shibboleth WebDAV Authentication
-+
-+``—davpath [path]``
-+ Overrides the WebDAV Path with ``path``
-+
-+``—exclude [file]``
-+ Exclude list file
-+
-+``—unsyncedfolders [file]``
-+ File containing the list of unsynced folders (selective sync)
-+
-+``—max-sync-retries [n]``
-+ Retries maximum n times (defaults to 3)
-+
-+``-h``
-+ Sync hidden files,do not ignore them
-+
-+Example
-+=======
-+To synchronize the ownCloud directory ``Music`` to the local directory ``media/music``
-+through a proxy listening on port ``8080`` on the gateway machine ``192.168.178.1``,
-+the command line would be::
-+
-+ $ owncloudcmd —httpproxy http://192.168.178.1:8080 \
-+ $HOME/media/music \
-+ https://server/owncloud/remote.php/webdav/Music
-+
-+``owncloudcmd`` will enquire user name and password, unless they have
-+been specified on the command line or ``-n`` (see `netrc(5)`) has been passed.
-+
-+Using the legacy scheme, it would be::
-+
-+ $ owncloudcmd —httpproxy http://192.168.178.1:8080 \
-+ $HOME/media/music \
-+ ownclouds://server/owncloud/remote.php/webdav/Music
-+
-+
-+BUGS
-+====
-+Please report bugs at https://github.com/owncloud/client/issues.
-+
-+SEE ALSO
-+========
-+:manpage:`owncloud(1)`
-\ No newline at end of file
---
-2.15.1
-
diff --git a/debian/patches/0011-move-man-dir.patch b/debian/patches/0011-move-man-dir.patch
deleted file mode 100644
index 1697c84..0000000
--- a/debian/patches/0011-move-man-dir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: include man dir for normal build.
-Author: Sandro Kanuß <hefee at debian.org>
-Origin: Debian
-Forwarded: https://github.com/owncloud/client/pull/6193
-Last-Update: 2017-12-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- /dev/null
-+++ b/man/CMakeLists.txt
-@@ -0,0 +1,14 @@
-+if(SPHINX_FOUND)
-+
-+ # Sphinx cache with pickled ReST documents
-+ set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
-+
-+ # HTML output directory
-+ set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man1")
-+ install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
-+ add_custom_target( doc-man ${SPHINX_EXECUTABLE}
-+ -c ${CMAKE_SOURCE_DIR}/doc -b man
-+ -d ${SPHINX_CACHE_DIR}/man
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${SPHINX_MAN_DIR} )
-+endif(SPHINX_FOUND)
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -4,7 +4,6 @@ if(SPHINX_FOUND)
- set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
- # HTML output directory
- set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html")
-- set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man1")
- set(SPHINX_PDF_DIR "${CMAKE_CURRENT_BINARY_DIR}/latex")
- set(SPHINX_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
- set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
-@@ -17,8 +16,6 @@ if(SPHINX_FOUND)
- install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
- install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
-
-- install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
--
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
-
- if(WITH_DOC)
-@@ -73,11 +70,6 @@ if(SPHINX_FOUND)
- -D html_theme=owncloud_com
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${SPHINX_HTML_DIR}/com )
-- add_custom_target( doc-man ${SPHINX_EXECUTABLE}
-- -q -c . -b man
-- -d ${SPHINX_CACHE_DIR}/man
-- ${CMAKE_CURRENT_SOURCE_DIR}
-- ${SPHINX_MAN_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.
---- /dev/null
-+++ b/man/index.rst
-@@ -0,0 +1 @@
-+
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -243,6 +243,7 @@ set(WITH_TESTING ${UNIT_TESTING})
- if(BUILD_CLIENT)
- add_subdirectory(src)
- if(NOT BUILD_LIBRARIES_ONLY)
-+ add_subdirectory(man)
- add_subdirectory(doc)
- add_subdirectory(doc/dev)
- if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin/osx)
diff --git a/debian/patches/series b/debian/patches/series
index a86da1d..dd3cdd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,3 @@
0007-move-translations.patch
0008-make-reproducable.patch
0009-fix-installpath-of-dolphin-plugin.patch
-0010-move-man-rst-files-to-separate-dir.patch
-0011-move-man-dir.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list