diff -Nru clucene-core-2.3.3.4+dfsg/debian/changelog clucene-core-2.3.3.4+dfsg/debian/changelog --- clucene-core-2.3.3.4+dfsg/debian/changelog 2021-02-01 10:22:06.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/changelog 2021-02-17 21:11:42.000000000 +0000 @@ -1,3 +1,16 @@ +clucene-core (2.3.3.4+dfsg-1ubuntu3) hirsute; urgency=medium + + * Make libclucene-contribs1v5f Conflict/Replace libclucene-contribs1v5 + + -- Balint Reczey Wed, 17 Feb 2021 22:11:42 +0100 + +clucene-core (2.3.3.4+dfsg-1ubuntu2) hirsute; urgency=medium + + * Drop defining float_t as double on s390x, rename packages changing the ABI + to use float_t as float instead (LP: #1915927) + + -- Balint Reczey Wed, 17 Feb 2021 19:25:01 +0100 + clucene-core (2.3.3.4+dfsg-1ubuntu1) hirsute; urgency=medium * Fix float_t abi to double ahead of glibc change. diff -Nru clucene-core-2.3.3.4+dfsg/debian/control clucene-core-2.3.3.4+dfsg/debian/control --- clucene-core-2.3.3.4+dfsg/debian/control 2021-02-01 10:22:06.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/control 2021-02-17 21:11:42.000000000 +0000 @@ -3,7 +3,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Fathi Boudra Uploaders: Daniel Glassey -Build-Depends: cmake (>= 2.8.5), debhelper (>= 9), libboost-dev, libz-dev +Build-Depends: cmake (>= 2.8.5), debhelper (>= 9), libboost-dev, libc6-dev (>> 2.33), libz-dev Standards-Version: 3.9.8 Section: libs Homepage: http://clucene.sourceforge.net @@ -12,9 +12,12 @@ Section: libdevel Architecture: any Depends: libc6-dev, - libclucene-contribs1v5 (= ${binary:Version}), - libclucene-core1v5 (= ${binary:Version}), + libclucene-contribs1v5 (= ${binary:Version}) [!s390x], + libclucene-contribs1v5f (= ${binary:Version}) [s390x], + libclucene-core1v5 (= ${binary:Version}) [!s390x], + libclucene-core1v5f (= ${binary:Version}) [s390x], ${misc:Depends} +Breaks: libc6-dev (<< 2.33) [s390x] Description: library for full-featured text search engine (development) CLucene is a C++ port of the popular Apache Lucene search engine (http://lucene.apache.org/java). It is released under LGPL or the Apache @@ -30,7 +33,7 @@ applications that use the CLucene search API. Package: libclucene-core1v5 -Architecture: any +Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 sh3 sh4 x32 Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same @@ -50,8 +53,29 @@ This package contains the files necessary for running applications that use the CLucene core and shared libraries. +Package: libclucene-core1v5f +Architecture: s390x +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Conflicts: libclucene-core1, libclucene-core1v5 +Replaces: libclucene-core1, libclucene-core1v5 +Description: core library for full-featured text search engine (runtime) + CLucene is a C++ port of the popular Apache Lucene search engine + (http://lucene.apache.org/java). It is released under LGPL or the Apache + License. + . + CLucene aims to be a high-speed alternative to Java Lucene, its API is very + similar to that of the Java version. CLucene has recently been brought up to + date with Lucene 1.4.3. It contains most of the same functionality as the + Java version, except for Socket, Threading and the special caching + modifications. + . + This package contains the files necessary for running applications that + use the CLucene core and shared libraries. + Package: libclucene-contribs1v5 -Architecture: any +Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 sparc sparc64 sh3 sh4 x32 Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same @@ -60,6 +84,28 @@ Description: language specific text analyzers (runtime) CLucene is a C++ port of the popular Apache Lucene search engine (http://lucene.apache.org/java). It is released under LGPL or the Apache + License. + . + CLucene aims to be a high-speed alternative to Java Lucene, its API is very + similar to that of the Java version. CLucene has recently been brought up to + date with Lucene 1.4.3. It contains most of the same functionality as the + Java version, except for Socket, Threading and the special caching + modifications. + . + This package contains the files necessary for running applications that + use the CLucene contribs library (language specific text analyzers for + CLucene). + +Package: libclucene-contribs1v5f +Architecture: s390x +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Conflicts: libclucene-contribs1, libclucene-contribs1v5 +Replaces: libclucene-contribs1, libclucene-contribs1v5 +Description: language specific text analyzers (runtime) + CLucene is a C++ port of the popular Apache Lucene search engine + (http://lucene.apache.org/java). It is released under LGPL or the Apache License. . CLucene aims to be a high-speed alternative to Java Lucene, its API is very diff -Nru clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.install clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.install --- clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.install 1970-01-01 00:00:00.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.install 2021-02-17 21:11:42.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libclucene-contribs-lib.so.1 +usr/lib/*/libclucene-contribs-lib.so.2.* diff -Nru clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.lintian-overrides clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.lintian-overrides --- clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/libclucene-contribs1v5f.lintian-overrides 2021-02-17 21:11:42.000000000 +0000 @@ -0,0 +1 @@ +package-name-doesnt-match-sonames libclucene-contribs-lib1 diff -Nru clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.docs clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.docs --- clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.docs 1970-01-01 00:00:00.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.docs 2021-02-17 21:11:42.000000000 +0000 @@ -0,0 +1,3 @@ +README +doc/*.htm +doc/*.jpg diff -Nru clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.install clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.install --- clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.install 1970-01-01 00:00:00.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/libclucene-core1v5f.install 2021-02-17 21:11:42.000000000 +0000 @@ -0,0 +1,4 @@ +usr/lib/*/libclucene-core.so.1 +usr/lib/*/libclucene-core.so.2.* +usr/lib/*/libclucene-shared.so.1 +usr/lib/*/libclucene-shared.so.2.* diff -Nru clucene-core-2.3.3.4+dfsg/debian/patches/0001-Clamp-float_t-to-double-on-s390.patch clucene-core-2.3.3.4+dfsg/debian/patches/0001-Clamp-float_t-to-double-on-s390.patch --- clucene-core-2.3.3.4+dfsg/debian/patches/0001-Clamp-float_t-to-double-on-s390.patch 2021-02-01 10:21:55.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/patches/0001-Clamp-float_t-to-double-on-s390.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -From de09b14eb2c189ee3f45033a0804ff5a5d910814 Mon Sep 17 00:00:00 2001 -From: Marius Hillenbrand -Date: Wed, 4 Nov 2020 18:05:47 +0100 -Subject: [PATCH] Clamp float_t to double on s390 - -On s390x, float_t has historically been defined as double. To avoid -overhead in some scenarios and improve compliance with the C standard, -we are discussing plans to clean up that definition to become float. - -To maintain ABI and API compatibility for clucene on s390 across that -change, clamp that type, as used by CLucene, to a double. - -Signed-off-by: Marius Hillenbrand ---- - src/shared/CLucene/SharedHeader.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/shared/CLucene/SharedHeader.h b/src/shared/CLucene/SharedHeader.h -index d43a1491..d512fd9f 100644 ---- a/src/shared/CLucene/SharedHeader.h -+++ b/src/shared/CLucene/SharedHeader.h -@@ -65,6 +65,13 @@ - #include //required for _T and TCHAR - #endif - -+//////////////////////////////////////////////////////// -+//architecture-specific quirks for types -+//////////////////////////////////////////////////////// -+#ifdef __s390__ -+typedef double float_t; -+#endif -+ - //////////////////////////////////////////////////////// - //namespace helper - //////////////////////////////////////////////////////// --- -2.26.2 - diff -Nru clucene-core-2.3.3.4+dfsg/debian/patches/series clucene-core-2.3.3.4+dfsg/debian/patches/series --- clucene-core-2.3.3.4+dfsg/debian/patches/series 2021-02-01 10:21:55.000000000 +0000 +++ clucene-core-2.3.3.4+dfsg/debian/patches/series 2021-02-17 21:11:42.000000000 +0000 @@ -5,4 +5,3 @@ bug715474-no-boost-headers.patch bug718187-ftbfs-hurd.patch gcc-version.diff -0001-Clamp-float_t-to-double-on-s390.patch