[Debian-ha-commits] [pcs] 01/01: Use non-multi-arch settings.py/rb on all architectures. (Closes: #814450)

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository pcs.

commit c8484bd293db9458454018634e3c70cc5c26b90e
Author: Christoph Berg <myon at debian.org>
Date:   Thu Mar 10 14:34:04 2016 +0100

    Use non-multi-arch settings.py/rb on all architectures. (Closes: #814450)
---
 debian/changelog                |  7 +++++++
 debian/control                  |  3 ++-
 debian/patches/0005-settings.py | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8a14723..69c3750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pcs (0.9.148-2) UNRELEASED; urgency=medium
+
+  * Use non-multi-arch settings.py/rb on all architectures.
+    (Closes: #814450)
+
+ -- Christoph Berg <myon at debian.org>  Mon, 07 Mar 2016 21:38:05 +0100
+
 pcs (0.9.148-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 277b760..1fad54f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: pcs
 Section: admin
 Priority: extra
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
-Uploaders: Richard B Winters <rik at mmogp.com>
+Uploaders: Richard B Winters <rik at mmogp.com>,
+ Christoph Berg <myon at debian.org>
 Build-Depends: debhelper (>= 9.0.0),
  dh-python,
  dh-systemd,
diff --git a/debian/patches/0005-settings.py b/debian/patches/0005-settings.py
new file mode 100644
index 0000000..63c4e60
--- /dev/null
+++ b/debian/patches/0005-settings.py
@@ -0,0 +1,39 @@
+--- a/Makefile
++++ b/Makefile
+@@ -69,15 +69,8 @@ ifndef install_settings
+   install_settings=false
+ else
+   ifeq ($(install_settings),true)
+-    ifeq ($(settings_x86_64),true)
+-      settings_file=settings.py.x86_64-linux-gnu.debian
+-      settings_file_pcsd=settings.rb.x86_64-linux-gnu.debian
+-    else
+-      ifeq ($(settings_i386),true)
+-        settings_file=settings.py.i386-linux-gnu.debian
+-        settings_file_pcsd=settings.rb.i386-linux-gnu.debian
+-      endif
+-    endif
++    settings_file=settings.py
++    settings_file_pcsd=settings.rb
+   endif
+ endif
+ 
+--- a/pcs/settings.py
++++ b/pcs/settings.py
+@@ -16,7 +16,7 @@ pcsd_key_location = "/var/lib/pcsd/pcsd.
+ pcsd_tokens_location = "/var/lib/pcsd/tokens"
+ pcsd_users_conf_location = "/var/lib/pcsd/pcs_users.conf"
+ pcsd_settings_conf_location = "/var/lib/pcsd/pcs_settings.conf"
+-pcsd_exec_location = "/usr/lib/pcsd/"
++pcsd_exec_location = "/usr/share/pcsd/"
+ corosync_uidgid_dir = "/etc/corosync/uidgid.d/"
+ cib_dir = "/var/lib/pacemaker/cib/"
+ pacemaker_uname = "hacluster"
+--- a/pcsd/settings.rb
++++ b/pcsd/settings.rb
+@@ -1,4 +1,4 @@
+-PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
++PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
+ PCSD_VAR_LOCATION = '/var/lib/pcsd/'
+ 
+ CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
diff --git a/debian/patches/series b/debian/patches/series
index 8a461c9..710d00a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Remove-require-in-pcsd-ssl.rb.patch
 0003-Remove-pcsd-.gitignore-file.patch
 0004-Remove-pcsd-test-.gitignore-file.patch
+0005-settings.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git