[Debian-ha-commits] [libqb] 07/08: #### Bulk merge of source patches for debian/patches
Richard Winters
devrik-guest at moszumanska.debian.org
Tue Apr 14 00:42:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch debian
in repository libqb.
commit 2602183a9f2624fae0768253c19c16d7b24d7cfc
Author: Richard B Winters <rik at mmogp.com>
Date: Mon Apr 13 20:40:33 2015 -0400
#### Bulk merge of source patches for debian/patches
- Single commits in master for ease of cherry-picking for upstream
- Provided by Feri
---
patches/add-qbipc-common-description.patch | 14 +++++++++++
patches/clear-dot-fontname.patch | 22 ++++++++++++++++
patches/dont-suppress-doxygen-echo.patch | 19 ++++++++++++++
patches/fix-comment-typo-incomming.patch | 29 +++++++++++++++++++++
patches/fix-comment-typo-neccessary.patch | 11 ++++++++
patches/fix-qbutil-description.patch | 15 +++++++++++
patches/remove-obsolete-doxygen-options.patch | 36 +++++++++++++++++++++++++++
patches/series | 7 ++++++
8 files changed, 153 insertions(+)
diff --git a/patches/add-qbipc-common-description.patch b/patches/add-qbipc-common-description.patch
new file mode 100644
index 0000000..32d78bb
--- /dev/null
+++ b/patches/add-qbipc-common-description.patch
@@ -0,0 +1,14 @@
+--- a/include/qb/qbipc_common.h
++++ b/include/qb/qbipc_common.h
+@@ -31,6 +31,11 @@
+ #endif
+ /* *INDENT-ON* */
+
++/**
++ * @file qbipc_common.h
++ * common types and definitions
++ */
++
+ struct qb_ipc_request_header {
+ int32_t id __attribute__ ((aligned(8)));
+ int32_t size __attribute__ ((aligned(8)));
diff --git a/patches/clear-dot-fontname.patch b/patches/clear-dot-fontname.patch
new file mode 100644
index 0000000..0b8469e
--- /dev/null
+++ b/patches/clear-dot-fontname.patch
@@ -0,0 +1,22 @@
+--- a/docs/man.dox.in
++++ b/docs/man.dox.in
+@@ -135,7 +135,7 @@
+ MSCGEN_PATH =
+ HIDE_UNDOC_RELATIONS = YES
+ HAVE_DOT = NO
+-DOT_FONTNAME = FreeSans
++DOT_FONTNAME =
+ DOT_FONTSIZE = 10
+ DOT_FONTPATH =
+ CLASS_GRAPH = NO
+--- a/docs/html.dox.in
++++ b/docs/html.dox.in
+@@ -185,7 +185,7 @@
+ MSCGEN_PATH =
+ HIDE_UNDOC_RELATIONS = YES
+ HAVE_DOT = YES
+-DOT_FONTNAME = FreeSans
++DOT_FONTNAME =
+ DOT_FONTSIZE = 10
+ DOT_FONTPATH =
+ CLASS_GRAPH = YES
diff --git a/patches/dont-suppress-doxygen-echo.patch b/patches/dont-suppress-doxygen-echo.patch
new file mode 100644
index 0000000..7eedd63
--- /dev/null
+++ b/patches/dont-suppress-doxygen-echo.patch
@@ -0,0 +1,19 @@
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -32,12 +32,12 @@
+
+
+ $(dist_man_MANS): man.dox $(dependant_headers)
+- @mkdir -p man3
+- @doxygen man.dox
++ mkdir -p man3
++ doxygen man.dox
+
+ doxygen: html.dox
+- @mkdir -p html
+- @doxygen html.dox
++ mkdir -p html
++ doxygen html.dox
+
+ else
+ doxygen:
diff --git a/patches/fix-comment-typo-incomming.patch b/patches/fix-comment-typo-incomming.patch
new file mode 100644
index 0000000..6345d7b
--- /dev/null
+++ b/patches/fix-comment-typo-incomming.patch
@@ -0,0 +1,29 @@
+--- a/include/qb/qbipcs.h
++++ b/include/qb/qbipcs.h
+@@ -237,7 +237,7 @@
+ void qb_ipcs_destroy(qb_ipcs_service_t* s);
+
+ /**
+- * Limit the incomming request rate.
++ * Limit the incoming request rate.
+ * @param s service instance
+ * @param rl the new rate
+ */
+@@ -245,7 +245,7 @@
+ enum qb_ipcs_rate_limit rl);
+
+ /**
+- * Send a response to a incomming request.
++ * Send a response to a incoming request.
+ *
+ * @param c connection instance
+ * @param data the message to send
+@@ -260,7 +260,7 @@
+ size_t size);
+
+ /**
+- * Send a response to a incomming request.
++ * Send a response to a incoming request.
+ *
+ * @param c connection instance
+ * @param iov the iovec struct that points to the message to send
diff --git a/patches/fix-comment-typo-neccessary.patch b/patches/fix-comment-typo-neccessary.patch
new file mode 100644
index 0000000..1ed90cf
--- /dev/null
+++ b/patches/fix-comment-typo-neccessary.patch
@@ -0,0 +1,11 @@
+--- a/include/qb/qbatomic.h
++++ b/include/qb/qbatomic.h
+@@ -52,7 +52,7 @@
+ * You must not directly read integers or pointers concurrently
+ * accessed by multiple threads, but use the atomic accessor functions
+ * instead. That is, always use qb_atomic_int_get() and qb_atomic_pointer_get()
+- * for read outs. They provide the neccessary synchonization mechanisms
++ * for read outs. They provide the necessary synchonization mechanisms
+ * like memory barriers to access memory locations concurrently.
+ *
+ * If you are using those functions for anything apart from
diff --git a/patches/fix-qbutil-description.patch b/patches/fix-qbutil-description.patch
new file mode 100644
index 0000000..d9e2515
--- /dev/null
+++ b/patches/fix-qbutil-description.patch
@@ -0,0 +1,15 @@
+--- a/include/qb/qbutil.h
++++ b/include/qb/qbutil.h
+@@ -36,10 +36,10 @@
+
+ /**
+ * @file qbutil.h
+- * @author Angus Salkeld <asalkeld at redhat.com>
+- *
+ * These are some convience functions used throughout libqb.
+ *
++ * @author Angus Salkeld <asalkeld at redhat.com>
++ *
+ * @par Locking
+ * - qb_thread_lock_create()
+ * - qb_thread_lock()
diff --git a/patches/remove-obsolete-doxygen-options.patch b/patches/remove-obsolete-doxygen-options.patch
new file mode 100644
index 0000000..e645986
--- /dev/null
+++ b/patches/remove-obsolete-doxygen-options.patch
@@ -0,0 +1,36 @@
+--- a/docs/man.dox.in
++++ b/docs/man.dox.in
+@@ -32,7 +32,6 @@
+ DISTRIBUTE_GROUP_DOC = YES
+ SUBGROUPING = NO
+ TYPEDEF_HIDES_STRUCT = YES
+-SYMBOL_CACHE_SIZE = 0
+ EXTRACT_ALL = YES
+ EXTRACT_PRIVATE = NO
+ EXTRACT_STATIC = YES
+--- a/docs/html.dox.in
++++ b/docs/html.dox.in
+@@ -32,7 +32,6 @@
+ DISTRIBUTE_GROUP_DOC = YES
+ SUBGROUPING = NO
+ TYPEDEF_HIDES_STRUCT = YES
+-SYMBOL_CACHE_SIZE = 0
+ EXTRACT_ALL = YES
+ EXTRACT_PRIVATE = NO
+ EXTRACT_STATIC = YES
+@@ -108,7 +107,6 @@
+ HTML_FOOTER =
+ HTML_TIMESTAMP = NO
+ HTML_STYLESHEET =
+-HTML_ALIGN_MEMBERS = YES
+ HTML_DYNAMIC_SECTIONS = NO
+ GENERATE_DOCSET = NO
+ DOCSET_FEEDNAME = "Doxygen generated docs"
+@@ -131,7 +129,6 @@
+ DISABLE_INDEX = NO
+ ENUM_VALUES_PER_LINE = 4
+ GENERATE_TREEVIEW = NO
+-USE_INLINE_TREES = NO
+ TREEVIEW_WIDTH = 250
+ FORMULA_FONTSIZE = 10
+ SEARCHENGINE = YES
diff --git a/patches/series b/patches/series
index 14ccebf..e6a07a2 100644
--- a/patches/series
+++ b/patches/series
@@ -1 +1,8 @@
non-git-version.patch
+dont-suppress-doxygen-echo.patch
+remove-obsolete-doxygen-options.patch
+clear-dot-fontname.patch
+fix-comment-typo-incomming.patch
+fix-comment-typo-neccessary.patch
+add-qbipc-common-description.patch
+fix-qbutil-description.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/libqb.git
More information about the Debian-ha-commits
mailing list