[Debian-ha-commits] [crmsh] 01/01: Added patch to fix build error

Thu May 7 22:57:26 UTC 2015

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

devrik-guest pushed a commit to branch master
in repository crmsh.

commit 6243316d78b9efe83aea412bd3302c5ff8f24edb
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu May 7 18:09:32 2015 -0400

    Added patch to fix build error
    
     - Patch run through gbp pq, new patch set as patch 0001 and
       the rest incremented appropriately.
     - Rules updated to include setting of --datadir for configure
       just for sanity sake
     - debian/source/include-binaries updated to reflect change in
       file name
    
    
    Change-Id: Ia0e38d9857cf124dab3af9e68f77e5fafb050229
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...for-supporting-triplet-paths-with-pacemak.patch |  36 +++++++++++++++++++++
 ... 0002-Add-remote-resource-to-local-cache.patch} | Bin 10133 -> 10132 bytes
 ...breach-generic-caused-by-footer-template.patch} |   4 +--
 ...breach-generic-caused-by-atom-xml-templa.patch} |   2 +-
 debian/patches/series                              |   7 ++--
 debian/rules                                       |   5 ++-
 debian/source/include-binaries                     |   2 +-
 7 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0001-Fix-CFLAGS-for-supporting-triplet-paths-with-pacemak.patch b/debian/patches/0001-Fix-CFLAGS-for-supporting-triplet-paths-with-pacemak.patch
new file mode 100644
index 0000000..3efbf51
--- /dev/null
+++ b/debian/patches/0001-Fix-CFLAGS-for-supporting-triplet-paths-with-pacemak.patch
@@ -0,0 +1,36 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Thu, 7 May 2015 18:49:05 -0400
+Subject: Fix CFLAGS for supporting triplet paths with pacemaker
+
+ - On debian we enabled multiarch support for pacemaker, and 
+   so the includes install to /usr/include/<triplet_path>/
+   pacemaker; requiring configure.ac to be updated to include 
+   said path.
+
+Change-Id: I8a18dda2229caaf4a398561a0f4e239c9964e239
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 747301e..1b2f2a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,6 +113,7 @@ eval datadir="`eval echo ${datadir}`"
+ eval sysconfdir="`eval echo ${sysconfdir}`"
+ eval sharedstatedir="`eval echo ${sharedstatedir}`"
+ eval localstatedir="`eval echo ${localstatedir}`"
++eval includedir="`eval echo ${includedir}`"
+ eval libdir="`eval echo ${libdir}`"
+ eval infodir="`eval echo ${infodir}`"
+ eval mandir="`eval echo ${mandir}`"
+@@ -125,7 +126,7 @@ if test x"${docdir}" = x""; then
+ fi
+ AC_SUBST(docdir)
+ 
+-CFLAGS="$CFLAGS -I${prefix}/include/heartbeat -I${prefix}/include/pacemaker"
++CFLAGS="$CFLAGS -I${prefix}/include/heartbeat -I${includedir}/heartbeat -I${prefix}/include/pacemaker -I${includedir}/pacemaker"
+ 
+ for j in prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir \
+     sharedstatedir localstatedir libdir infodir \
diff --git a/debian/patches/0001-Add-remote-resource-to-local-cache.patch b/debian/patches/0002-Add-remote-resource-to-local-cache.patch
similarity index 99%
rename from debian/patches/0001-Add-remote-resource-to-local-cache.patch
rename to debian/patches/0002-Add-remote-resource-to-local-cache.patch
index 6490541..acf9f82 100644
Binary files a/debian/patches/0001-Add-remote-resource-to-local-cache.patch and b/debian/patches/0002-Add-remote-resource-to-local-cache.patch differ
diff --git a/debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch b/debian/patches/0003-Fix-privacy-breach-generic-caused-by-footer-template.patch
similarity index 91%
rename from debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
rename to debian/patches/0003-Fix-privacy-breach-generic-caused-by-footer-template.patch
index c7f6abc..821a9c8 100644
--- a/debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
+++ b/debian/patches/0003-Fix-privacy-breach-generic-caused-by-footer-template.patch
@@ -2,8 +2,8 @@ From: Richard B Winters <rik at mmogp.com>
 Date: Thu, 30 Apr 2015 19:38:33 -0400
 Subject: Fix privacy-breach-generic caused by footer template
 
- - An image fetched from githubuserconent needs to be replaced 
-   with a local cache to avoid the aforementioned lintian 
+ - An image fetched from githubuserconent needs to be replaced
+   with a local cache to avoid the aforementioned lintian
    informational warning
 
 Change-Id: Id4dba22e08e36dbe701f87832c7f7a839a653ffe
diff --git a/debian/patches/0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch b/debian/patches/0004-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
similarity index 99%
rename from debian/patches/0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
rename to debian/patches/0004-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
index 29f9854..6636347 100644
--- a/debian/patches/0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
+++ b/debian/patches/0004-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
@@ -2,7 +2,7 @@ From: Richard B Winters <rik at mmogp.com>
 Date: Thu, 30 Apr 2015 20:19:29 -0400
 Subject: Fix privacy-breach-generic caused by atom xml template
 
- - Modifies the atom xml template so as not to breach privacy by 
+ - Modifies the atom xml template so as not to breach privacy by
    using remote resources.
 ---
  doc/website-v1/make-news.py | 4 ++--
diff --git a/debian/patches/series b/debian/patches/series
index d276360..9efaf7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-0001-Add-remote-resource-to-local-cache.patch
-0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
-0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
+0001-Fix-CFLAGS-for-supporting-triplet-paths-with-pacemak.patch
+0002-Add-remote-resource-to-local-cache.patch
+0003-Fix-privacy-breach-generic-caused-by-footer-template.patch
+0004-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
diff --git a/debian/rules b/debian/rules
index fd81c32..31cd96f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # Ensure that we link against all needed libraries (cf. Policy 10.2)
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 
+# Properly support multi-arch triplet paths
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
+
 # main packaging script based on dh7 syntax
 %:
 	dh $@ --with autoreconf,python2 --fail-missing
@@ -16,7 +19,7 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 override_dh_auto_configure:
 	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc \
 	    --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --includedir=/usr/include/$(DEB_HOST_MULTIARCH) \
-	    --docdir=/usr/share/doc/crmsh --htmldir=/usr/share/doc/crmsh/html
+	    --datadir=/usr/share --docdir=/usr/share/doc/crmsh --htmldir=/usr/share/doc/crmsh/html
 
 override_dh_auto_build:
 	dh_auto_build
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index c246ee3..4258761 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1 @@
-debian/patches/0001-Add-remote-resource-to-local-cache.patch
+debian/patches/0002-Add-remote-resource-to-local-cache.patch

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

