New Upstream Snapshot - libsis-base-java
Ready changes
Summary
Merged new upstream version: 18.09.0 (was: 18.09~pre1+git20180928.45fbd31+dfsg).
Resulting package
Built on 2022-03-20T11:39 (took 5m8s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libsis-base-javaapt install -t fresh-snapshots libsis-base-jni-dbgsymapt install -t fresh-snapshots libsis-base-jni
Lintian Result
Diff
diff --git a/debian/changelog b/debian/changelog
index 53b1660..830e1d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsis-base-java (18.09.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 20 Mar 2022 11:36:43 -0000
+
libsis-base-java (18.09~pre1+git20180928.45fbd31+dfsg-3) unstable; urgency=medium
* Team upload
diff --git a/debian/patches/deactivate_tests_causing_fail_dut_to_commons-io.patch b/debian/patches/deactivate_tests_causing_fail_dut_to_commons-io.patch
index e739be2..2ab99e5 100644
--- a/debian/patches/deactivate_tests_causing_fail_dut_to_commons-io.patch
+++ b/debian/patches/deactivate_tests_causing_fail_dut_to_commons-io.patch
@@ -9,9 +9,11 @@ Author: Pierre Gruet <pgtdebian@free.fr>
Forwarded: not-needed
Last-Update: 2020-12-06
---- a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
-+++ b/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
-@@ -93,6 +93,7 @@
+Index: libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+===================================================================
+--- libsis-base-java.orig/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
++++ libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+@@ -93,6 +93,7 @@ public class UnixTests extends AbstractF
{ "skip_this_test" })
public void testGetLinkInfoSymLink() throws IOException
{
@@ -19,7 +21,7 @@ Last-Update: 2020-12-06
final File f = new File(workingDirectory, "someOtherFile");
final String content = "someMoreText\n";
FileUtils.writeStringToFile(f, content, Charset.defaultCharset());
-@@ -112,12 +113,14 @@
+@@ -112,12 +113,14 @@ public class UnixTests extends AbstractF
assertEquals(FileLinkType.REGULAR_FILE, info2.getLinkType());
assertFalse(info2.isSymbolicLink());
assertNull(info2.tryGetSymbolicLink());
@@ -35,7 +37,7 @@ Last-Update: 2020-12-06
if (BuildAndEnvironmentInfo.INSTANCE.getOS().contains("2.6.32"))
{
System.out.println(" ...skipping as CentOS6 does not yet support the realtime timer.");
-@@ -173,12 +176,14 @@
+@@ -173,12 +176,14 @@ public class UnixTests extends AbstractF
assertNotEquals(lastMicros, info3.getLastModifiedTime().getMicroSecPart());
assertNotEquals(lastMicros, info3.getLastAccessTime().getMicroSecPart());
@@ -51,7 +53,7 @@ Last-Update: 2020-12-06
Unix.setUseUnixRealtimeTimer(false);
final File f = new File(workingDirectory, "someOtherFile");
final String content = "someMoreText\n";
-@@ -230,6 +235,7 @@
+@@ -230,6 +235,7 @@ public class UnixTests extends AbstractF
assertNotEquals(lastMicros, info3.getLastModifiedTime().getMicroSecPart());
assertNotEquals(lastMicros, info3.getLastAccessTime().getMicroSecPart());
@@ -59,7 +61,7 @@ Last-Update: 2020-12-06
}
@Test(groups =
-@@ -280,9 +286,10 @@
+@@ -280,9 +286,10 @@ public class UnixTests extends AbstractF
}
@Test(groups =
@@ -71,7 +73,7 @@ Last-Update: 2020-12-06
final File f = new File(workingDirectory, "someOtherFile");
f.createNewFile();
final File s = new File(workingDirectory, "someLink");
-@@ -292,6 +299,7 @@
+@@ -292,6 +299,7 @@ public class UnixTests extends AbstractF
assertEquals(FileLinkType.REGULAR_FILE, info.getLinkType());
assertFalse(info.isSymbolicLink());
assertNull(info.tryGetSymbolicLink());
diff --git a/debian/patches/force_use_nio.patch b/debian/patches/force_use_nio.patch
index 49c5c50..e598a70 100644
--- a/debian/patches/force_use_nio.patch
+++ b/debian/patches/force_use_nio.patch
@@ -5,9 +5,11 @@ Forwarded: not-needed
Reviewed-by: Pierre Gruet <pgtdebian@free.fr>
Last-Update: 2020-12-15
---- a/source/java/ch/systemsx/cisd/base/convert/NativeData.java
-+++ b/source/java/ch/systemsx/cisd/base/convert/NativeData.java
-@@ -15,8 +15,6 @@
+Index: libsis-base-java/source/java/ch/systemsx/cisd/base/convert/NativeData.java
+===================================================================
+--- libsis-base-java.orig/source/java/ch/systemsx/cisd/base/convert/NativeData.java
++++ libsis-base-java/source/java/ch/systemsx/cisd/base/convert/NativeData.java
+@@ -15,8 +15,6 @@ package ch.systemsx.cisd.base.convert;
import java.nio.ByteBuffer;
@@ -16,7 +18,7 @@ Last-Update: 2020-12-15
/**
* This class encapsulates native methods to deal with arrays of numbers, converting from numbers to
* bytes and bytes to numbers.
-@@ -28,27 +26,10 @@
+@@ -28,27 +26,10 @@ import ch.systemsx.cisd.base.utilities.N
* primitive numbers (int, short, ...)
* <p>
* Variant interfaces convert only a sub-array.
@@ -45,9 +47,11 @@ Last-Update: 2020-12-15
/** Size of a <code>short</code> value in <code>byte</code>s. */
public final static int SHORT_SIZE = 2;
---- a/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
-+++ b/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
-@@ -162,7 +162,6 @@
+Index: libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
+===================================================================
+--- libsis-base-java.orig/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
++++ libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
+@@ -162,7 +162,6 @@ public class NativeDataTests
@Test(dataProvider = "getOfs")
public void testLongToByteToLong(int sourceOfs, int targetOfs)
{
@@ -55,7 +59,7 @@ Last-Update: 2020-12-15
final int sizeOfTarget = 8;
final long[] orignalArr = new long[]
{ -1, 17, 100000, -1000000 };
-@@ -180,7 +179,6 @@
+@@ -180,7 +179,6 @@ public class NativeDataTests
@Test(dataProvider = "getOfs")
public void testShortToByteToShort(int sourceOfs, int targetOfs)
{
@@ -63,7 +67,7 @@ Last-Update: 2020-12-15
final int sizeOfTarget = 2;
final short[] orignalArr = new short[]
{ -1, 17, 20000, (short) -50000 };
-@@ -198,7 +196,6 @@
+@@ -198,7 +196,6 @@ public class NativeDataTests
@Test(dataProvider = "getOfs")
public void testCharToByteToChar(int sourceOfs, int targetOfs)
{
@@ -71,7 +75,7 @@ Last-Update: 2020-12-15
final int sizeOfTarget = 2;
final char[] orignalArr = new char[]
{ 'c', ';', '\u0222', '\u1000' };
-@@ -216,7 +213,6 @@
+@@ -216,7 +213,6 @@ public class NativeDataTests
@Test(dataProvider = "getOfs")
public void testFloatToByteToFloat(int sourceOfs, int targetOfs)
{
@@ -79,7 +83,7 @@ Last-Update: 2020-12-15
final int sizeOfTarget = 4;
final float[] orignalArr = new float[]
{ -1, 17, 3.14159f, -1e6f };
-@@ -234,7 +230,6 @@
+@@ -234,7 +230,6 @@ public class NativeDataTests
@Test(dataProvider = "getOfs")
public void testDoubleToByteToDouble(int sourceOfs, int targetOfs)
{
@@ -87,7 +91,7 @@ Last-Update: 2020-12-15
final int sizeOfTarget = 8;
final double[] orignalArr = new double[]
{ -1, 17, 3.14159, -1e42 };
-@@ -252,7 +247,6 @@
+@@ -252,7 +247,6 @@ public class NativeDataTests
@Test
public void testShortEndianConversion()
{
@@ -95,7 +99,7 @@ Last-Update: 2020-12-15
final short[] values = new short[]
{ 1, 2, 4, 8, 16, 256, 512 };
final short[] convertedValuesExpected = new short[]
-@@ -266,7 +260,6 @@
+@@ -266,7 +260,6 @@ public class NativeDataTests
@Test
public void testIntEndianConversion()
{
@@ -103,7 +107,7 @@ Last-Update: 2020-12-15
final int[] values = new int[]
{ 1, 2, 4, 8, 16, 256, 1 << 16 };
final int[] convertedValuesExpected = new int[]
-@@ -280,7 +273,6 @@
+@@ -280,7 +273,6 @@ public class NativeDataTests
@Test
public void testLongEndianConversion()
{
@@ -111,7 +115,7 @@ Last-Update: 2020-12-15
final long[] values = new long[]
{ 1, 2, 4, 8, 16, 256, 1L << 16, 1L << 24 };
final long[] convertedValuesExpected = new long[]
-@@ -294,7 +286,6 @@
+@@ -294,7 +286,6 @@ public class NativeDataTests
@Test
public void testFloatLittleEndianRoundtrip()
{
@@ -119,7 +123,7 @@ Last-Update: 2020-12-15
final float[] values = new float[]
{ 1.1f, 2.2f, 3.3f, 1e-25f, 1e25f };
final float[] convertedValuesFound =
-@@ -306,7 +297,6 @@
+@@ -306,7 +297,6 @@ public class NativeDataTests
@Test
public void testFloatBigEndianRoundtrip()
{
@@ -127,7 +131,7 @@ Last-Update: 2020-12-15
final float[] values = new float[]
{ 1.1f, 2.2f, 3.3f, 1e-25f, 1e25f };
final float[] convertedValuesFound =
-@@ -318,7 +308,6 @@
+@@ -318,7 +308,6 @@ public class NativeDataTests
@Test
public void testDoubleLittleEndianRoundtrip()
{
@@ -135,7 +139,7 @@ Last-Update: 2020-12-15
final double[] values = new double[]
{ 1.1f, 2.2f, 3.3f, 1e-25f, 1e25f };
final double[] convertedValuesFound =
-@@ -330,7 +319,6 @@
+@@ -330,7 +319,6 @@ public class NativeDataTests
@Test
public void testDoubleBigEndianRoundtrip()
{
@@ -143,7 +147,7 @@ Last-Update: 2020-12-15
final double[] values = new double[]
{ 1.1, 2.2, 3.3, 1e-25, 1e25 };
final double[] convertedValuesFound =
-@@ -342,28 +330,24 @@
+@@ -342,28 +330,24 @@ public class NativeDataTests
@Test(expectedExceptions = NullPointerException.class)
public void testNPE()
{
@@ -172,7 +176,7 @@ Last-Update: 2020-12-15
final double[] values = new double[]
{ 1.1, 2.2, 3.3, 1e-200, 1e200 };
final double[] valuesLE =
-@@ -387,7 +371,6 @@
+@@ -387,7 +371,6 @@ public class NativeDataTests
@Test
public void testFloatToByteNonNativeByteOrderPartialOutputArray()
{
diff --git a/debian/patches/load_native_debian.patch b/debian/patches/load_native_debian.patch
index 1d073d2..98ed59a 100644
--- a/debian/patches/load_native_debian.patch
+++ b/debian/patches/load_native_debian.patch
@@ -6,8 +6,10 @@ Description: upstream applies various methods to look for the
Author: Tim Booth
Forwarded: not-needed
Last-Updated: 2015-08-21
---- a/source/java/ch/systemsx/cisd/base/convert/NativeData.java
-+++ b/source/java/ch/systemsx/cisd/base/convert/NativeData.java
+Index: libsis-base-java/source/java/ch/systemsx/cisd/base/convert/NativeData.java
+===================================================================
+--- libsis-base-java.orig/source/java/ch/systemsx/cisd/base/convert/NativeData.java
++++ libsis-base-java/source/java/ch/systemsx/cisd/base/convert/NativeData.java
@@ -45,7 +45,8 @@ public class NativeData
useNativeLib = false;
} else
@@ -18,8 +20,10 @@ Last-Updated: 2015-08-21
}
}
---- a/source/java/ch/systemsx/cisd/base/unix/Unix.java
-+++ b/source/java/ch/systemsx/cisd/base/unix/Unix.java
+Index: libsis-base-java/source/java/ch/systemsx/cisd/base/unix/Unix.java
+===================================================================
+--- libsis-base-java.orig/source/java/ch/systemsx/cisd/base/unix/Unix.java
++++ libsis-base-java/source/java/ch/systemsx/cisd/base/unix/Unix.java
@@ -65,7 +65,8 @@ public final class Unix
static
diff --git a/debian/patches/remove_ch_rinn_imports.patch b/debian/patches/remove_ch_rinn_imports.patch
index 38e91e2..ba5dcb4 100644
--- a/debian/patches/remove_ch_rinn_imports.patch
+++ b/debian/patches/remove_ch_rinn_imports.patch
@@ -3,8 +3,10 @@ Description: decorator is not available in Debian and is not useful for package
Author: Tim Booth
Forwarded: not-needed
Last-Updated: 2015-08-21
---- a/source/java/ch/systemsx/cisd/base/unix/Unix.java
-+++ b/source/java/ch/systemsx/cisd/base/unix/Unix.java
+Index: libsis-base-java/source/java/ch/systemsx/cisd/base/unix/Unix.java
+===================================================================
+--- libsis-base-java.orig/source/java/ch/systemsx/cisd/base/unix/Unix.java
++++ libsis-base-java/source/java/ch/systemsx/cisd/base/unix/Unix.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.base.unix;
import java.io.File;
import java.io.IOException;
@@ -27,8 +29,10 @@ Last-Updated: 2015-08-21
static boolean isProcessRunningPS(int pid)
{
try
---- a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
-+++ b/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+Index: libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+===================================================================
+--- libsis-base-java.orig/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
++++ libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
@@ -27,7 +27,6 @@ import java.nio.charset.Charset;
import org.apache.commons.io.FileUtils;
import org.testng.annotations.Test;
diff --git a/debian/patches/skip_testGetLinkInfoDirectory.patch b/debian/patches/skip_testGetLinkInfoDirectory.patch
index 89548ba..3d35e8b 100644
--- a/debian/patches/skip_testGetLinkInfoDirectory.patch
+++ b/debian/patches/skip_testGetLinkInfoDirectory.patch
@@ -17,8 +17,10 @@ Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 15 Jan 2018 07:58:49 +0100
Forwarded: Bernd Rinn <brinn@ethz.ch>
---- a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
-+++ b/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+Index: libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+===================================================================
+--- libsis-base-java.orig/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
++++ libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
@@ -90,7 +90,7 @@ public class UnixTests extends AbstractF
}
diff --git a/debian/patches/skip_testGetLinkInfoSymLinkDanglingLink.patch b/debian/patches/skip_testGetLinkInfoSymLinkDanglingLink.patch
index 8f73717..bccba7e 100644
--- a/debian/patches/skip_testGetLinkInfoSymLinkDanglingLink.patch
+++ b/debian/patches/skip_testGetLinkInfoSymLinkDanglingLink.patch
@@ -8,8 +8,10 @@ Description: Disable the affected test by following
FIXME: Needs checking whether the test might be OK for future
commons-io versions
---- a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
-+++ b/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+Index: libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+===================================================================
+--- libsis-base-java.orig/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
++++ libsis-base-java/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
@@ -233,9 +233,10 @@ public class UnixTests extends AbstractF
}
diff --git a/libs/native/nativedata/amd64-Linux/libnativedata.so b/libs/native/nativedata/amd64-Linux/libnativedata.so
new file mode 100755
index 0000000..9ff31e4
Binary files /dev/null and b/libs/native/nativedata/amd64-Linux/libnativedata.so differ
diff --git a/libs/native/nativedata/amd64-Windows/nativedata.dll b/libs/native/nativedata/amd64-Windows/nativedata.dll
new file mode 100644
index 0000000..52fa874
Binary files /dev/null and b/libs/native/nativedata/amd64-Windows/nativedata.dll differ
diff --git a/libs/native/nativedata/arm-Linux/libnativedata.so b/libs/native/nativedata/arm-Linux/libnativedata.so
new file mode 100755
index 0000000..149a0d0
Binary files /dev/null and b/libs/native/nativedata/arm-Linux/libnativedata.so differ
diff --git a/libs/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib b/libs/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib
new file mode 100755
index 0000000..ee7b149
Binary files /dev/null and b/libs/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib differ
diff --git a/libs/native/unix/amd64-Linux/libunix.so b/libs/native/unix/amd64-Linux/libunix.so
new file mode 100755
index 0000000..b940e90
Binary files /dev/null and b/libs/native/unix/amd64-Linux/libunix.so differ
diff --git a/libs/native/unix/arm-Linux/libunix.so b/libs/native/unix/arm-Linux/libunix.so
new file mode 100755
index 0000000..5ae9fbd
Binary files /dev/null and b/libs/native/unix/arm-Linux/libunix.so differ
diff --git a/libs/native/unix/x86_64-Mac OS X/libunix.jnilib b/libs/native/unix/x86_64-Mac OS X/libunix.jnilib
new file mode 100755
index 0000000..57803a4
Binary files /dev/null and b/libs/native/unix/x86_64-Mac OS X/libunix.jnilib differ
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/83/50a4e8dc117b15e4b04ef856b7e39fa65f6169.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/cc/7b09ee9087dfea38dfda4f8152a036629f1c3d.debug -rw-r--r-- root/root /usr/share/java/sis-base-18.09.0.jar lrwxrwxrwx root/root /usr/share/java/sis-base.jar -> sis-base-18.09.0.jar
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/5a/734117460c6f873362ee753df8b06e91930d8e.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/f9/fc64d3bc97c6429a3209986a9824f143990b45.debug -rw-r--r-- root/root /usr/share/java/sis-base-18.09~pre1+git20180928.45fbd31.jar lrwxrwxrwx root/root /usr/share/java/sis-base.jar -> sis-base-18.09~pre1+git20180928.45fbd31.jar
No differences were encountered between the control files of package libsis-base-java
No differences were encountered between the control files of package libsis-base-jni
Control files of package libsis-base-jni-dbgsym: lines which differ (wdiff format)
Build-Ids: 5a734117460c6f873362ee753df8b06e91930d8e f9fc64d3bc97c6429a3209986a9824f143990b45 8350a4e8dc117b15e4b04ef856b7e39fa65f6169 cc7b09ee9087dfea38dfda4f8152a036629f1c3d