From 5c655544bc66adc5689ff018dcb779361e2b4a65 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 21 Nov 2014 13:32:49 +0100 Subject: [PATCH] MT#9617 Refresh fix_MT9617_debian_jessie_support.patch for usage with sipwise-debian-changes.patch --- debian/patches/fix_MT9617_debian_jessie_support.patch | 10 +++++----- debian/patches/series | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/patches/fix_MT9617_debian_jessie_support.patch b/debian/patches/fix_MT9617_debian_jessie_support.patch index 20da228..5a6c099 100644 --- a/debian/patches/fix_MT9617_debian_jessie_support.patch +++ b/debian/patches/fix_MT9617_debian_jessie_support.patch @@ -11,15 +11,15 @@ --- a/contrib/drbd-outdate-peer/Makefile.in +++ b/contrib/drbd-outdate-peer/Makefile.in -@@ -383,7 +383,7 @@ - +@@ -375,7 +375,7 @@ + $(top_builddir)/lib/hbclient/libhbclient.la $(GLIBLIB) drbd_peer_outdater_SOURCES = drbd-peer-outdater.c -drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la +drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) - subdir = contrib/drbd-outdate-peer - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + all: all-am + + .SUFFIXES: --- a/lib/plugins/quorum/quorumd.c +++ b/lib/plugins/quorum/quorumd.c @@ -354,8 +354,9 @@ diff --git a/debian/patches/series b/debian/patches/series index c752566..4ce8a87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,4 +20,5 @@ fix_MT7335.patch fix-ftbfs-lp1188428.patch fix_MT7335_lex.patch fix_MT7335_poderror_ldirectord.patch +sipwise-debian-changes.patch fix_MT9617_debian_jessie_support.patch