[Pkg-owncloud-commits] [owncloud-client] 07/15: Removed patches, that came from upstream

[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 1d1af0ac32cfd3b6c96344a798e73e97aff1a030
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed Sep 11 21:59:30 2013 +0200

    Removed patches, that came from upstream
---
 .../desktop-entry-lacks-keywords-entry.patch       |   17 ------
 debian/patches/doc-parallel.patch                  |   54 --------------------
 debian/patches/series                              |    2 -
 3 files changed, 73 deletions(-)

diff --git a/debian/patches/desktop-entry-lacks-keywords-entry.patch b/debian/patches/desktop-entry-lacks-keywords-entry.patch
deleted file mode 100644
index 1478498..0000000
--- a/debian/patches/desktop-entry-lacks-keywords-entry.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Get rid of lintian error desktop-entry-lacks-keywords-entry
-Author: Sandro Knauß
-Origin: debian
-Bug: https://github.com/owncloud/mirall/issues/876
-Last-Update: 2013-08-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/mirall.desktop.in
-===================================================================
---- owncloud-client.orig/mirall.desktop.in	2013-08-15 21:52:48.923472916 +0200
-+++ owncloud-client/mirall.desktop.in	2013-08-15 21:52:48.915472904 +0200
-@@ -4,4 +4,5 @@
- Exec=@APPLICATION_EXECUTABLE@
- Name=@APPLICATION_NAME@ desktop sync client 
- GenericName=Folder Sync
-+Keywords=syncing;ownCloud;file;sharing;
- Icon=@APPLICATION_SHORTNAME@
diff --git a/debian/patches/doc-parallel.patch b/debian/patches/doc-parallel.patch
deleted file mode 100644
index f561bf1..0000000
--- a/debian/patches/doc-parallel.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: FTBFS w/sphinx too: can't rename temporary pickle file
- Use different temp dirs for different sphinx tasks.
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Origin: upstream, https://github.com/owncloud/mirall/commit/066c0ba189cffe8f33b40d2e2948fddc059e1b60
-Bug-Debian: http://bugs.debian.org/719178
-Last-Update: 2013-08-13
----
-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-04-05 04:19:02.213663425 +0200
-+++ owncloud-client/doc/CMakeLists.txt	2013-08-13 20:05:49.753471634 +0200
-@@ -27,7 +27,7 @@
-         # apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-         add_custom_target(doc-latex  ${SPHINX_EXECUTABLE}
- 		                     -q -c . -b latex
--				     -d ${SPHINX_CACHE_DIR}
-+				     -d ${SPHINX_CACHE_DIR}/latex
- 				     -D latex_logo=${LATEX_LOGO}
- 				     ${CMAKE_CURRENT_SOURCE_DIR}
- 				     ${SPHINX_PDF_DIR} )
-@@ -41,7 +41,7 @@
-     if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
-         add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
- 		                          -q -c . -b qthelp
--				          -d ${SPHINX_CACHE_DIR}
-+				          -d ${SPHINX_CACHE_DIR}/qthelp
- 					  ${CMAKE_CURRENT_SOURCE_DIR}
- 					  ${SPHINX_QCH_DIR} )
-         add_custom_target( doc-qch ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}
-@@ -54,12 +54,12 @@
-     endif()
-     add_custom_target( doc-html ${SPHINX_EXECUTABLE}
- 	                        -q -c . -b html
--				-d ${SPHINX_CACHE_DIR}
-+				-d ${SPHINX_CACHE_DIR}/html
- 				${CMAKE_CURRENT_SOURCE_DIR}
- 				${SPHINX_HTML_DIR} )
-     add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
- 	                        -q -c . -b man
--				-d ${SPHINX_CACHE_DIR}
-+				-d ${SPHINX_CACHE_DIR}/man
- 				${CMAKE_CURRENT_SOURCE_DIR}
- 				${SPHINX_MAN_DIR} )
- 
-@@ -71,7 +71,7 @@
-     add_custom_target( doc-chm-sphinx  ${SPHINX_EXECUTABLE}
- 	                               -q -c . -b htmlhelp
- 	                               -D html_theme=basic
--                                       -d ${SPHINX_CACHE_DIR}
-+                                       -d ${SPHINX_CACHE_DIR}/htmlhelp
-                                        ${CMAKE_CURRENT_SOURCE_DIR}
-                                        ${SPHINX_HTMLHELP_DIR} )
-     add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c208e8e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-doc-parallel.patch
-desktop-entry-lacks-keywords-entry.patch

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