[Debian-ha-commits] [crmsh] 06/16: Removed old patches due to newly imported sources

Richard Winters devrik-guest at moszumanska.debian.org
Tue Jan 26 22:25:04 UTC 2016 

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

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

commit c96238c9499dc8a583ea3d5bb7a3eefdfbc1df56
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue Jan 26 15:56:57 2016 -0500

    Removed old patches due to newly imported sources
    
    Change-Id: I3261229f380db2da3bf921792587e023bd479a85
    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 10132 -> 0 bytes
 ...-breach-generic-caused-by-footer-template.patch |  27 ----------------
 ...-breach-generic-caused-by-atom-xml-templa.patch |  25 --------------
 debian/patches/series                              |   4 ---
 5 files changed, 92 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
deleted file mode 100644
index 3efbf51..0000000
--- a/debian/patches/0001-Fix-CFLAGS-for-supporting-triplet-paths-with-pacemak.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/0002-Add-remote-resource-to-local-cache.patch b/debian/patches/0002-Add-remote-resource-to-local-cache.patch
deleted file mode 100644
index acf9f82..0000000
Binary files a/debian/patches/0002-Add-remote-resource-to-local-cache.patch and /dev/null differ
diff --git a/debian/patches/0003-Fix-privacy-breach-generic-caused-by-footer-template.patch b/debian/patches/0003-Fix-privacy-breach-generic-caused-by-footer-template.patch
deleted file mode 100644
index 821a9c8..0000000
--- a/debian/patches/0003-Fix-privacy-breach-generic-caused-by-footer-template.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-   informational warning
-
-Change-Id: Id4dba22e08e36dbe701f87832c7f7a839a653ffe
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- doc/website-v1/crm.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/website-v1/crm.conf b/doc/website-v1/crm.conf
-index 44dcc41..df24263 100644
---- a/doc/website-v1/crm.conf
-+++ b/doc/website-v1/crm.conf
-@@ -575,7 +575,7 @@ bodydata=<td class="tableblock halign-{colalign=left}">|</td>
- </div>
- </div>
- 
--<a href="https://github.com/ClusterLabs/crmsh"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
-+<a href="https://github.com/ClusterLabs/crmsh"><img style="position: absolute; top: 0; right: 0; border: 0;" src="/img/fork-me-on-github.png" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
- 
- </body>
- </html>
diff --git a/debian/patches/0004-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch b/debian/patches/0004-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
deleted file mode 100644
index 6636347..0000000
--- a/debian/patches/0004-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-   using remote resources.
----
- doc/website-v1/make-news.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/website-v1/make-news.py b/doc/website-v1/make-news.py
-index 22fb77a..d17c3ad 100644
---- a/doc/website-v1/make-news.py
-+++ b/doc/website-v1/make-news.py
-@@ -21,8 +21,8 @@ ATOM_TEMPLATE = """<?xml version="1.0" encoding="utf-8"?>
- <feed xmlns="http://www.w3.org/2005/Atom">
- <title>crmsh</title>
- <subtitle>Cluster manager shell news</subtitle>
--<link href="http://crmsh.github.io/atom.xml" rel="self" />
--<link href="http://crmsh.github.io/" />
-+<link href="/atom.xml" rel="self" />
-+<link href="/" />
- <id>%(id)s</id>
- <updated>%(updated)s</updated>
- %(entries)s
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9efaf7a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-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

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

More information about the Debian-HA-Commits mailing list