[Pkg-owncloud-commits] [owncloud-client] 70/70: Removed upstream applied patches.
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat May 17 20:01:32 UTC 2014
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 1437b64df6b3f7c7cec14fdc1b92b1eeec50fdc4
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Sat May 17 21:42:45 2014 +0200
Removed upstream applied patches.
---
debian/patches/0003-freebsd.patch | 55 ----------------------------------
debian/patches/0004-doc-optional.patch | 51 -------------------------------
debian/patches/series | 2 --
3 files changed, 108 deletions(-)
diff --git a/debian/patches/0003-freebsd.patch b/debian/patches/0003-freebsd.patch
deleted file mode 100644
index 8463c03..0000000
--- a/debian/patches/0003-freebsd.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Make Debian GNU/kFreeBSD compile
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Origin: debian
-Bug: https://github.com/owncloud/mirall/pull/1726
-Last-Update: 2014-05-07
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/src/mirall/folderwatcher.cpp
-===================================================================
---- owncloud-client.orig/src/mirall/folderwatcher.cpp 2014-04-30 19:43:20.848684999 +0200
-+++ owncloud-client/src/mirall/folderwatcher.cpp 2014-05-07 19:49:54.000000000 +0200
-@@ -29,7 +29,7 @@
- #include "mirall/folderwatcher_win.h"
- #elif defined(Q_OS_MAC)
- #include "mirall/folderwatcher_mac.h"
--#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
- #include "mirall/folderwatcher_linux.h"
- #endif
-
-Index: owncloud-client/src/mirall/application.cpp
-===================================================================
---- owncloud-client.orig/src/mirall/application.cpp 2014-04-30 19:47:39.267789831 +0200
-+++ owncloud-client/src/mirall/application.cpp 2014-05-07 19:49:54.000000000 +0200
-@@ -64,7 +64,7 @@
-
- QString applicationTrPath()
- {
--#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
- return QString::fromLatin1(DATADIR"/"APPLICATION_EXECUTABLE"/i18n/");
- #endif
- #ifdef Q_OS_MAC
-Index: owncloud-client/src/mirall/utility.cpp
-===================================================================
---- owncloud-client.orig/src/mirall/utility.cpp 2014-04-30 19:47:39.291123384 +0200
-+++ owncloud-client/src/mirall/utility.cpp 2014-05-07 19:49:54.000000000 +0200
-@@ -143,7 +143,7 @@
- return QLatin1String("Linux");
- #elif defined(__DragonFly__) // Q_OS_FREEBSD also defined
- return QLatin1String("DragonFlyBSD");
--#elif defined(Q_OS_FREEBSD)
-+#elif defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
- return QLatin1String("FreeBSD");
- #elif defined(Q_OS_NETBSD)
- return QLatin1String("NetBSD");
-@@ -199,7 +199,7 @@
-
- qint64 Utility::freeDiskSpace(const QString &path, bool *ok)
- {
--#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
-+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
- struct statvfs stat;
- statvfs(path.toUtf8().data(), &stat);
- return (qint64) stat.f_bavail * stat.f_frsize;
diff --git a/debian/patches/0004-doc-optional.patch b/debian/patches/0004-doc-optional.patch
deleted file mode 100644
index d9d3e01..0000000
--- a/debian/patches/0004-doc-optional.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: install doc targets in any case.
- if a user only builds some parts of the documentations and afterwards installs
- it via 'make install', than these built parts should be installed too.
-Author: Sandro Knauß <bugs at sandroknauss.de
-Origin: debian
-Forwarded: https://github.com/owncloud/mirall/pull/1747
-Last-Update: 2014-05-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/doc/CMakeLists.txt
-===================================================================
---- owncloud-client.orig/doc/CMakeLists.txt 2014-05-08 04:26:58.216164473 +0200
-+++ owncloud-client/doc/CMakeLists.txt 2014-05-08 04:28:50.917202173 +0200
-@@ -12,12 +12,15 @@
- # assets
- set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
-
-+ install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
-+ install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
-+ install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
-+ install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
-+
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
-
- if(WITH_DOC)
- 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(WITH_DOC)
- add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
- endif(WITH_DOC)
-@@ -39,9 +42,6 @@
- add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf
- DEPENDS doc-latex )
- add_dependencies(doc doc-pdf)
-- if (WITH_DOC)
-- install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-- endif (WITH_DOC)
- endif(PDFLATEX_FOUND)
- if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
- add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
-@@ -53,9 +53,6 @@
- ${SPHINX_QCH_DIR}/*.qhcp
- DEPENDS doc-qch-sphinx )
- add_dependencies(doc doc-qch)
-- if (WITH_DOC)
-- install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-- endif (WITH_DOC)
- endif()
- add_custom_target( doc-html ${SPHINX_EXECUTABLE}
- -q -c . -b html
diff --git a/debian/patches/series b/debian/patches/series
index 248d161..4c81f72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
0001-disable-updatecheck.patch
0002-debian_version.patch
-0003-freebsd.patch
-0004-doc-optional.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