[Debian-ha-commits] [pacemaker] 67/69: Delete upstreamed patch

Christoph Berg myon at debian.org
Tue Jan 26 09:14:31 UTC 2016


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

myon pushed a commit to branch debian/master
in repository pacemaker.

commit cf25e778812eb98a88a07ebf13de4b162f17540c
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Sun Jan 17 21:52:17 2016 +0100

    Delete upstreamed patch
---
 .../Don-t-override-a-libdir-containing.patch        | 21 ---------------------
 debian/patches/series                               |  1 -
 2 files changed, 22 deletions(-)

diff --git a/debian/patches/Don-t-override-a-libdir-containing.patch b/debian/patches/Don-t-override-a-libdir-containing.patch
deleted file mode 100644
index 8913e0d..0000000
--- a/debian/patches/Don-t-override-a-libdir-containing.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Sat, 9 Jan 2016 19:57:35 +0100
-Subject: Don't override a libdir containing
-
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b9a863a..1d1dc3d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -378,7 +378,7 @@ AC_SUBST(INITDIR)
- AC_MSG_NOTICE(Sanitizing libdir: ${libdir})
- case $libdir in
-   dnl For consistency with Heartbeat, map NONE->$prefix
--  *prefix*|NONE)
-+  prefix|NONE)
-     AC_MSG_CHECKING(which lib directory to use)
-     for aDir in lib64 lib
-     do
diff --git a/debian/patches/series b/debian/patches/series
index b6af1ce..bde2a86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ Debianize-pacemaker_remote.service.patch
 Synchronize-the-provided-name-with-the-filename.patch
 Restarting-pacemaker-adds-confusion-only.patch
 Enable-redirecting-etc-init.d-script-calls-to-system.patch
-Don-t-override-a-libdir-containing.patch
 Extend-the-description-of-the-remote-agent-script.patch

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



More information about the Debian-HA-Commits mailing list