diff options
Diffstat (limited to 'debian/patches')
8 files changed, 24 insertions, 40 deletions
diff --git a/debian/patches/Always-format-time_t-values-as-long-long.patch b/debian/patches/Always-format-time_t-values-as-long-long.patch index 444991b..afcad60 100644 --- a/debian/patches/Always-format-time_t-values-as-long-long.patch +++ b/debian/patches/Always-format-time_t-values-as-long-long.patch @@ -21,7 +21,7 @@ Signed-off-by: Ferenc Wágner <wferi@debian.org> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemons/fenced/fenced_remote.c b/daemons/fenced/fenced_remote.c -index dc67947..ef2237a 100644 +index 843b3d4..9616e8e 100644 --- a/daemons/fenced/fenced_remote.c +++ b/daemons/fenced/fenced_remote.c @@ -1042,8 +1042,8 @@ merge_duplicates(remote_fencing_op_t *op) diff --git a/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch b/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch index ac8898b..076daac 100644 --- a/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch +++ b/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch @@ -7,10 +7,10 @@ Subject: Always run Inkscape under the C.UTF-8 locale 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am -index c4ade5c..6ecb9ab 100644 +index e48e19a..54e2896 100644 --- a/doc/sphinx/Makefile.am +++ b/doc/sphinx/Makefile.am -@@ -98,7 +98,7 @@ DEPS_Pacemaker_Remote = $(PNGS_Pacemaker_Remote) +@@ -104,7 +104,7 @@ DEPS_Pacemaker_Remote = $(PNGS_Pacemaker_Remote) if BUILD_SPHINX_DOCS diff --git a/debian/patches/Fix-typos-resouce-resource.patch b/debian/patches/Fix-typos-resouce-resource.patch index d0e85a5..7f3ed87 100644 --- a/debian/patches/Fix-typos-resouce-resource.patch +++ b/debian/patches/Fix-typos-resouce-resource.patch @@ -4,9 +4,8 @@ Subject: Fix typos: resouce -> resource --- cts/cts-exec.in | 2 +- - cts/lab/CTStests.py | 2 +- lib/pacemaker/pcmk_sched_primitive.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cts/cts-exec.in b/cts/cts-exec.in index a89eb0e..be19d07 100644 @@ -21,24 +20,11 @@ index a89eb0e..be19d07 100644 common_cmds = self._common_cmds # do not use service and systemd at the same time, it is the same resource. -diff --git a/cts/lab/CTStests.py b/cts/lab/CTStests.py -index 61766ce..00fe2d9 100644 ---- a/cts/lab/CTStests.py -+++ b/cts/lab/CTStests.py -@@ -743,7 +743,7 @@ class StandbyTest(CTSTest): - # set the node to standby mode - # check resources, none resource should be running on the node - # set the node to active mode -- # check resouces, resources should have been migrated back (SHOULD THEY?) -+ # check resources, resources should have been migrated back (SHOULD THEY?) - - def __call__(self, node): - diff --git a/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c -index aefbf9a..d612b22 100644 +index 96acf1c..91adbff 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c -@@ -1250,7 +1250,7 @@ start_resource(pe_resource_t *rsc, pe_node_t *node, bool optional) +@@ -1326,7 +1326,7 @@ start_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) * reasons later. */ pe_rsc_trace(rsc, @@ -46,8 +32,8 @@ index aefbf9a..d612b22 100644 + "Start of multiply active resource %s " "on expected node %s will be a pseudo-action", rsc->id, pe__node_name(node)); - pe__set_action_flags(start, pe_action_pseudo); -@@ -1297,7 +1297,7 @@ promote_resource(pe_resource_t *rsc, pe_node_t *node, bool optional) + pe__set_action_flags(start, pcmk_action_pseudo); +@@ -1373,7 +1373,7 @@ promote_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) * other reasons later. */ pe_rsc_trace(rsc, @@ -55,4 +41,4 @@ index aefbf9a..d612b22 100644 + "Promotion of multiply active resource %s " "on expected node %s will be a pseudo-action", rsc->id, pe__node_name(node)); - pe__set_action_flags(promote, pe_action_pseudo); + pe__set_action_flags(promote, pcmk_action_pseudo); diff --git a/debian/patches/Make-the-asciidoc-documentation-reproducible.patch b/debian/patches/Make-the-asciidoc-documentation-reproducible.patch index 5434e8b..b0cfc58 100644 --- a/debian/patches/Make-the-asciidoc-documentation-reproducible.patch +++ b/debian/patches/Make-the-asciidoc-documentation-reproducible.patch @@ -7,10 +7,10 @@ Subject: Make the asciidoc documentation reproducible 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am -index 1400145..b6c254c 100644 +index a40ddfe..4b614fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -42,7 +42,7 @@ RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html +@@ -46,7 +46,7 @@ RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html RSYNC_OPTS = -rlptvzxS --progress if IS_ASCIIDOC diff --git a/debian/patches/Remove-references-to-the-build-directory.patch b/debian/patches/Remove-references-to-the-build-directory.patch index 10315b0..30c6321 100644 --- a/debian/patches/Remove-references-to-the-build-directory.patch +++ b/debian/patches/Remove-references-to-the-build-directory.patch @@ -65,7 +65,7 @@ index 51dd1e6..ccd8730 100644 $(abs_builddir)/$< --output $@ ; \ fi diff --git a/python/pacemaker/buildoptions.py.in b/python/pacemaker/buildoptions.py.in -index 53b492b..34da8de 100644 +index 17fe981..3bb85c1 100644 --- a/python/pacemaker/buildoptions.py.in +++ b/python/pacemaker/buildoptions.py.in @@ -13,12 +13,6 @@ class BuildOptions: diff --git a/debian/patches/alerts-make-the-scripts-executable.patch b/debian/patches/alerts-make-the-scripts-executable.patch index 89f62cf..9bab37d 100644 --- a/debian/patches/alerts-make-the-scripts-executable.patch +++ b/debian/patches/alerts-make-the-scripts-executable.patch @@ -11,14 +11,12 @@ Signed-off-by: Ferenc Wágner <wferi@niif.hu> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/alerts/Makefile.am b/agents/alerts/Makefile.am -index fdb294f..b8cc756 100644 +index a3fe891..c9c77f8 100644 --- a/agents/alerts/Makefile.am +++ b/agents/alerts/Makefile.am -@@ -10,6 +10,6 @@ +@@ -10,4 +10,4 @@ include $(top_srcdir)/mk/common.mk samplesdir = $(datadir)/$(PACKAGE)/alerts/ --dist_samples_DATA = alert_file.sh.sample \ -+dist_samples_SCRIPTS = alert_file.sh.sample \ - alert_smtp.sh.sample \ - alert_snmp.sh.sample +-dist_samples_DATA = $(wildcard *.sample) ++dist_samples_SCRIPTS = $(wildcard *.sample) diff --git a/debian/patches/cts-do-not-capture-the-build-directory.patch b/debian/patches/cts-do-not-capture-the-build-directory.patch index b6d641e..f36112a 100644 --- a/debian/patches/cts-do-not-capture-the-build-directory.patch +++ b/debian/patches/cts-do-not-capture-the-build-directory.patch @@ -11,7 +11,7 @@ Subject: cts: do not capture the build directory 5 files changed, 46 deletions(-) diff --git a/cts/cts-attrd.in b/cts/cts-attrd.in -index b7ad538..89e476f 100644 +index b594ac3..f0cba42 100644 --- a/cts/cts-attrd.in +++ b/cts/cts-attrd.in @@ -17,16 +17,6 @@ import subprocess @@ -92,7 +92,7 @@ index c6837c4..c32ae96 100644 from pacemaker.exitstatus import ExitStatus diff --git a/cts/cts-scheduler.in b/cts/cts-scheduler.in -index ee0cb7b..99f90fc 100644 +index 50c32f6..4e186b0 100644 --- a/cts/cts-scheduler.in +++ b/cts/cts-scheduler.in @@ -17,15 +17,6 @@ import subprocess diff --git a/debian/patches/python-clean-up-the-__pycache__-directories.patch b/debian/patches/python-clean-up-the-__pycache__-directories.patch index 144e5b3..c52a049 100644 --- a/debian/patches/python-clean-up-the-__pycache__-directories.patch +++ b/debian/patches/python-clean-up-the-__pycache__-directories.patch @@ -8,10 +8,10 @@ Subject: python: clean up the __pycache__ directories 2 files changed, 6 insertions(+) diff --git a/python/pacemaker/Makefile.am b/python/pacemaker/Makefile.am -index f209bba..f722d48 100644 +index df9cc46..06322d7 100644 --- a/python/pacemaker/Makefile.am +++ b/python/pacemaker/Makefile.am -@@ -15,3 +15,6 @@ pkgpython_PYTHON = __init__.py \ +@@ -15,3 +15,6 @@ pkgpython_PYTHON = __init__.py \ nodist_pkgpython_PYTHON = buildoptions.py SUBDIRS = _cts @@ -19,13 +19,13 @@ index f209bba..f722d48 100644 +clean-local: + rm -rf __pycache__ diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am -index 490b272..6f93823 100644 +index 219812c..e6d303c 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am -@@ -10,3 +10,6 @@ - MAINTAINERCLEANFILES = Makefile.in +@@ -11,3 +11,6 @@ MAINTAINERCLEANFILES = Makefile.in - EXTRA_DIST = $(wildcard test_*) + EXTRA_DIST = $(wildcard test_*) \ + __init__.py + +clean-local: + rm -rf __pycache__ |