[Debian-ha-commits] [pcs] 05/05: New upstream version.

[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 8e670e448bff48fe8f68435bd54ddc406d59dc34
Author: Christoph Berg <myon at debian.org>
Date:   Thu Mar 10 20:20:17 2016 +0100

    New upstream version.
---
 debian/changelog                |  3 ++-
 debian/control                  |  2 +-
 debian/patches/0005-settings.py | 57 ++++++++---------------------------------
 3 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa5c089..0fd4b6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-pcs (0.9.148-2) unstable; urgency=medium
+pcs (0.9.149-1) unstable; urgency=medium
 
+  * New upstream version.
   * Use non-multi-arch settings.py/rb on all architectures.
     (Closes: #814450)
   * Conflict with python-pcs. This (unrelated) python module installs files to
diff --git a/debian/control b/debian/control
index 6b96ae4..d39866c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9.0.0),
  libpam0g-dev,
  python-all (>= 2.6.6-3~),
  systemd
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: https://github.com/feist/pcs
 Vcs-Git: https://alioth.debian.org/anonscm/git/debian-ha/pcs.git
 Vcs-Browser: http://anonscm.debian.org/cgit/debian-ha/pcs.git
diff --git a/debian/patches/0005-settings.py b/debian/patches/0005-settings.py
index 7649061..3aabdea 100644
--- a/debian/patches/0005-settings.py
+++ b/debian/patches/0005-settings.py
@@ -1,63 +1,28 @@
---- 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
+--- a/pcs/settings.py.debian
++++ b/pcs/settings.py.debian
 @@ -4,10 +4,10 @@ ccs_binaries = "/usr/sbin/"
  corosync_conf_file = "/etc/corosync/corosync.conf"
  cluster_conf_file = "/etc/cluster/cluster.conf"
  fence_agent_binaries = "/usr/sbin/"
--pengine_binary = "/usr/libexec/pacemaker/pengine"
--crmd_binary = "/usr/libexec/pacemaker/crmd"
--cib_binary = "/usr/libexec/pacemaker/cib"
--stonithd_binary = "/usr/libexec/pacemaker/stonithd"
+-pengine_binary = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/pengine"
+-crmd_binary = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/crmd"
+-cib_binary = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/cib"
+-stonithd_binary = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/stonithd"
 +pengine_binary = "/usr/lib/pacemaker/pengine"
 +crmd_binary = "/usr/lib/pacemaker/crmd"
 +cib_binary = "/usr/lib/pacemaker/cib"
 +stonithd_binary = "/usr/lib/pacemaker/stonithd"
- pcs_version = "0.9.148"
+ pcs_version = "0.9.149"
  crm_report = pacemaker_binaries + "crm_report"
  crm_verify = pacemaker_binaries + "crm_verify"
-@@ -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'
+--- a/pcsd/settings.rb.debian
++++ b/pcsd/settings.rb.debian
 @@ -9,8 +9,8 @@ OCF_ROOT = "/usr/lib/ocf"
  HEARTBEAT_AGENTS_DIR = "/usr/lib/ocf/resource.d/heartbeat/"
  PACEMAKER_AGENTS_DIR = "/usr/lib/ocf/resource.d/pacemaker/"
  NAGIOS_METADATA_DIR = '/usr/share/pacemaker/nagios/plugins-metadata/'
--PENGINE = "/usr/libexec/pacemaker/pengine"
--CIB_BINARY = '/usr/libexec/pacemaker/cib'
+-PENGINE = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/pengine"
+-CIB_BINARY = '/usr/lib/DEB_HOST_MULTIARCH/pacemaker/cib'
 +PENGINE = "/usr/lib/pacemaker/pengine"
 +CIB_BINARY = '/usr/lib/pacemaker/cib'
  CRM_MON = "/usr/sbin/crm_mon"

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