Control: tags 780199 + pending Dear maintainer,
I've prepared an NMU for redhat-cluster (versioned as 3.1.8-1.3) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Edith Piaf: Non, Je Ne Regrette Rien
diff -Nru redhat-cluster-3.1.8/debian/changelog redhat-cluster-3.1.8/debian/changelog --- redhat-cluster-3.1.8/debian/changelog 2014-08-04 14:35:20.000000000 +0200 +++ redhat-cluster-3.1.8/debian/changelog 2015-07-01 19:45:31.000000000 +0200 @@ -1,3 +1,13 @@ +redhat-cluster (3.1.8-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS in unstable - error: conflicting types for 'int64_t'": + add patch from Michael Tautschnig to avoid name clash of guard name in + platform.h with ICU's header file. + (Closes: #780199) + + -- gregor herrmann <gre...@debian.org> Wed, 01 Jul 2015 19:44:47 +0200 + redhat-cluster (3.1.8-1.2) unstable; urgency=medium [ gregor herrmann ] diff -Nru redhat-cluster-3.1.8/debian/patches/0005-include-guard.patch redhat-cluster-3.1.8/debian/patches/0005-include-guard.patch --- redhat-cluster-3.1.8/debian/patches/0005-include-guard.patch 1970-01-01 01:00:00.000000000 +0100 +++ redhat-cluster-3.1.8/debian/patches/0005-include-guard.patch 2015-07-01 19:44:41.000000000 +0200 @@ -0,0 +1,28 @@ +Description: rename guard name + to avoid name clash with ICU's platform.h +Origin: vendor +Bug-Debian: https://bugs.debian.org/780199 +Forwarded: no +Author: Michael Tautschnig <m...@debian.org> +Reviewed-by: gregor herrmann <gre...@debian.org> +Last-Update: 2015-07-01 + +--- a/rgmanager/include/platform.h ++++ b/rgmanager/include/platform.h +@@ -1,8 +1,8 @@ + /** @file + * Defines for byte-swapping + */ +-#ifndef _PLATFORM_H +-#define _PLATFORM_H ++#ifndef RG_PLATFORM_H ++#define RG_PLATFORM_H + + #include <endian.h> + #include <sys/param.h> +@@ -56,4 +56,4 @@ + #define PACKED __attribute__((packed)) + #endif + +-#endif /* _PLATFORM_H */ ++#endif /* RG_PLATFORM_H */ diff -Nru redhat-cluster-3.1.8/debian/patches/series redhat-cluster-3.1.8/debian/patches/series --- redhat-cluster-3.1.8/debian/patches/series 2013-01-11 19:40:29.000000000 +0100 +++ redhat-cluster-3.1.8/debian/patches/series 2015-07-01 19:43:10.000000000 +0200 @@ -1,3 +1,4 @@ 0001-add-dlm-kernel-headers.patch 0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch 0004-Depend-on-remote_fs.patch +0005-include-guard.patch
signature.asc
Description: Digital Signature
