From: Peter Michael Green Date: Thu, 3 May 2018 20:55:27 +0000 (+0000) Subject: Manual merge of version 1.3.3+dfsg-1+rpi1 and 1.3.3+dfsg-2 to produce 1.3.3+dfsg... X-Git-Tag: archive/raspbian/1.3.3+dfsg-2+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b6fb80e42fefa1468d8d52ec458ab4fee6f2c12c;p=libzstd.git Manual merge of version 1.3.3+dfsg-1+rpi1 and 1.3.3+dfsg-2 to produce 1.3.3+dfsg-2+rpi1 --- b6fb80e42fefa1468d8d52ec458ab4fee6f2c12c diff --cc contrib/VS2005/fullbench/fullbench.vcproj index ca235d0,ca235d0..c67490c --- a/contrib/VS2005/fullbench/fullbench.vcproj +++ b/contrib/VS2005/fullbench/fullbench.vcproj @@@ -1,440 -1,440 +1,440 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc contrib/VS2005/fuzzer/fuzzer.vcproj index 58af602,58af602..c64c503 --- a/contrib/VS2005/fuzzer/fuzzer.vcproj +++ b/contrib/VS2005/fuzzer/fuzzer.vcproj @@@ -1,488 -1,488 +1,488 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc contrib/VS2005/zstd.sln index dfc73b4,dfc73b4..0c31ae1 --- a/contrib/VS2005/zstd.sln +++ b/contrib/VS2005/zstd.sln @@@ -1,55 -1,55 +1,55 @@@ --Microsoft Visual Studio Solution File, Format Version 9.00 --# Visual C++ Express 2005 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd\zstd.vcproj", "{1A2AB08E-5CE7-4C5B-BE55-458157C14051}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fuzzer", "fuzzer\fuzzer.vcproj", "{A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\fullbench.vcproj", "{CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcproj", "{99DE2A79-7298-4004-A0ED-030D7A3796CA}" --EndProject --Global -- GlobalSection(SolutionConfigurationPlatforms) = preSolution -- Debug|Win32 = Debug|Win32 -- Debug|x64 = Debug|x64 -- Release|Win32 = Release|Win32 -- Release|x64 = Release|x64 -- EndGlobalSection -- GlobalSection(ProjectConfigurationPlatforms) = postSolution -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.ActiveCfg = Debug|Win32 -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.Build.0 = Debug|Win32 -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.ActiveCfg = Debug|x64 -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.Build.0 = Debug|x64 -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.ActiveCfg = Release|Win32 -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.Build.0 = Release|Win32 -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.ActiveCfg = Release|x64 -- {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.Build.0 = Release|x64 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.ActiveCfg = Debug|Win32 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.Build.0 = Debug|Win32 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.ActiveCfg = Debug|x64 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.Build.0 = Debug|x64 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.ActiveCfg = Release|Win32 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.Build.0 = Release|Win32 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.ActiveCfg = Release|x64 -- {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.Build.0 = Release|x64 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.ActiveCfg = Debug|Win32 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.Build.0 = Debug|Win32 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.ActiveCfg = Debug|x64 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.Build.0 = Debug|x64 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.ActiveCfg = Release|Win32 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.Build.0 = Release|Win32 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.ActiveCfg = Release|x64 -- {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.Build.0 = Release|x64 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.ActiveCfg = Debug|Win32 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.Build.0 = Debug|Win32 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.ActiveCfg = Debug|x64 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.Build.0 = Debug|x64 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.ActiveCfg = Release|Win32 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.Build.0 = Release|Win32 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.ActiveCfg = Release|x64 -- {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.Build.0 = Release|x64 -- EndGlobalSection -- GlobalSection(SolutionProperties) = preSolution -- HideSolutionNode = FALSE -- EndGlobalSection --EndGlobal ++Microsoft Visual Studio Solution File, Format Version 9.00 ++# Visual C++ Express 2005 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd\zstd.vcproj", "{1A2AB08E-5CE7-4C5B-BE55-458157C14051}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fuzzer", "fuzzer\fuzzer.vcproj", "{A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\fullbench.vcproj", "{CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcproj", "{99DE2A79-7298-4004-A0ED-030D7A3796CA}" ++EndProject ++Global ++ GlobalSection(SolutionConfigurationPlatforms) = preSolution ++ Debug|Win32 = Debug|Win32 ++ Debug|x64 = Debug|x64 ++ Release|Win32 = Release|Win32 ++ Release|x64 = Release|x64 ++ EndGlobalSection ++ GlobalSection(ProjectConfigurationPlatforms) = postSolution ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.Build.0 = Debug|Win32 ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.ActiveCfg = Debug|x64 ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.Build.0 = Debug|x64 ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.ActiveCfg = Release|Win32 ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.Build.0 = Release|Win32 ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.ActiveCfg = Release|x64 ++ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.Build.0 = Release|x64 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.Build.0 = Debug|Win32 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.ActiveCfg = Debug|x64 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.Build.0 = Debug|x64 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.ActiveCfg = Release|Win32 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.Build.0 = Release|Win32 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.ActiveCfg = Release|x64 ++ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.Build.0 = Release|x64 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.Build.0 = Debug|Win32 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.ActiveCfg = Debug|x64 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.Build.0 = Debug|x64 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.ActiveCfg = Release|Win32 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.Build.0 = Release|Win32 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.ActiveCfg = Release|x64 ++ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.Build.0 = Release|x64 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.Build.0 = Debug|Win32 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.ActiveCfg = Debug|x64 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.Build.0 = Debug|x64 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.ActiveCfg = Release|Win32 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.Build.0 = Release|Win32 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.ActiveCfg = Release|x64 ++ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.Build.0 = Release|x64 ++ EndGlobalSection ++ GlobalSection(SolutionProperties) = preSolution ++ HideSolutionNode = FALSE ++ EndGlobalSection ++EndGlobal diff --cc contrib/VS2005/zstd/zstd.vcproj index 6766daa,6766daa..46cabbf --- a/contrib/VS2005/zstd/zstd.vcproj +++ b/contrib/VS2005/zstd/zstd.vcproj @@@ -1,548 -1,548 +1,548 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc contrib/VS2005/zstdlib/zstdlib.vcproj index 97a2bc3,97a2bc3..f77df78 --- a/contrib/VS2005/zstdlib/zstdlib.vcproj +++ b/contrib/VS2005/zstdlib/zstdlib.vcproj @@@ -1,562 -1,562 +1,562 @@@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc debian/changelog index 67f6d75,7bf1f72..15272d1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,33 +1,40 @@@ - libzstd (1.3.3+dfsg-1+rpi1) buster-staging; urgency=medium ++libzstd (1.3.3+dfsg-2+rpi1) buster-staging; urgency=medium + ++ [changes brought forward from 1.3.3+dfsg-1+rpi1 by Peter Michael Green at Sun, 14 Jan 2018 16:35:02 +0000] + * Disable testsuite. + - -- Peter Michael Green Sun, 14 Jan 2018 16:35:02 +0000 ++ -- Peter Michael Green Thu, 03 May 2018 20:47:50 +0000 ++ + libzstd (1.3.3+dfsg-2) unstable; urgency=medium + + * Team upload. + + [ Dimitri John Ledkov ] + * Mark -dev and library packages Multi-Arch same. + * Update Vcs fields for salsa. + * Cleanup unused patches. + + [ Andreas Hasenack ] + * d/rules: also run the clean Makefile target in the pzstd directory. + + [ Alexandre Mestiashvili ] + * d/control: Update my email address. + * d/rules: + + Disable tests if DEB_BUILD_OPTIONS set to nocheck. + + Use dh_auto_build instead of $(MAKE) to avoid cross build failures. + Thanks to Helmut Grohne for the patch. Closes: #895925 + + Use dh_auto_clean instead of $(MAKE). + + [ Adam Borowski ] + * Enable build on riscv64. Closes: #895259 + + [ Mattia Rizzolo ] + * Bump debhelper compat level to 11. + * Bump Standards-Version to 4.1.4, no changes needed. + * Remove patch skipping a test on hurd-i386: allegedly the underlying issue + has been fixed instead. + + -- Mattia Rizzolo Sat, 21 Apr 2018 11:26:59 +0200 libzstd (1.3.3+dfsg-1) unstable; urgency=medium diff --cc debian/rules index 16c76e0,4227d4a..d3fae6b --- a/debian/rules +++ b/debian/rules @@@ -26,5 -31,6 +31,9 @@@ override_dh_install debian/tmp/usr/lib/lib*.so dh_install +override_dh_auto_test: + echo testsuite disabled ++ + override_dh_auto_clean: + dh_auto_clean + dh_auto_clean --sourcedirectory=contrib/pzstd diff --cc lib/dll/example/build_package.bat index 12b602f,12b602f..cae0a15 --- a/lib/dll/example/build_package.bat +++ b/lib/dll/example/build_package.bat @@@ -1,19 -1,19 +1,19 @@@ --@ECHO OFF --MKDIR bin\dll bin\static bin\example bin\include --COPY tests\fullbench.c bin\example\ --COPY programs\datagen.c bin\example\ --COPY programs\datagen.h bin\example\ --COPY programs\util.h bin\example\ --COPY programs\platform.h bin\example\ --COPY lib\common\mem.h bin\example\ --COPY lib\common\zstd_errors.h bin\example\ --COPY lib\common\zstd_internal.h bin\example\ --COPY lib\common\error_private.h bin\example\ --COPY lib\common\xxhash.h bin\example\ --COPY lib\zstd.h bin\include\ --COPY lib\libzstd.a bin\static\libzstd_static.lib --COPY lib\dll\libzstd.* bin\dll\ --COPY lib\dll\example\Makefile bin\example\ --COPY lib\dll\example\fullbench-dll.* bin\example\ --COPY lib\dll\example\README.md bin\ --COPY programs\zstd.exe bin\zstd.exe ++@ECHO OFF ++MKDIR bin\dll bin\static bin\example bin\include ++COPY tests\fullbench.c bin\example\ ++COPY programs\datagen.c bin\example\ ++COPY programs\datagen.h bin\example\ ++COPY programs\util.h bin\example\ ++COPY programs\platform.h bin\example\ ++COPY lib\common\mem.h bin\example\ ++COPY lib\common\zstd_errors.h bin\example\ ++COPY lib\common\zstd_internal.h bin\example\ ++COPY lib\common\error_private.h bin\example\ ++COPY lib\common\xxhash.h bin\example\ ++COPY lib\zstd.h bin\include\ ++COPY lib\libzstd.a bin\static\libzstd_static.lib ++COPY lib\dll\libzstd.* bin\dll\ ++COPY lib\dll\example\Makefile bin\example\ ++COPY lib\dll\example\fullbench-dll.* bin\example\ ++COPY lib\dll\example\README.md bin\ ++COPY programs\zstd.exe bin\zstd.exe diff --cc lib/dll/example/fullbench-dll.sln index ef8d4c0,ef8d4c0..72e302e --- a/lib/dll/example/fullbench-dll.sln +++ b/lib/dll/example/fullbench-dll.sln @@@ -1,25 -1,25 +1,25 @@@ --Microsoft Visual Studio Solution File, Format Version 12.00 --# Visual Studio Express 2012 for Windows Desktop --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench-dll", "fullbench-dll.vcxproj", "{13992FD2-077E-4954-B065-A428198201A9}" --EndProject --Global -- GlobalSection(SolutionConfigurationPlatforms) = preSolution -- Debug|Win32 = Debug|Win32 -- Debug|x64 = Debug|x64 -- Release|Win32 = Release|Win32 -- Release|x64 = Release|x64 -- EndGlobalSection -- GlobalSection(ProjectConfigurationPlatforms) = postSolution -- {13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.ActiveCfg = Debug|Win32 -- {13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.Build.0 = Debug|Win32 -- {13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.ActiveCfg = Debug|x64 -- {13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.Build.0 = Debug|x64 -- {13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.ActiveCfg = Release|Win32 -- {13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.Build.0 = Release|Win32 -- {13992FD2-077E-4954-B065-A428198201A9}.Release|x64.ActiveCfg = Release|x64 -- {13992FD2-077E-4954-B065-A428198201A9}.Release|x64.Build.0 = Release|x64 -- EndGlobalSection -- GlobalSection(SolutionProperties) = preSolution -- HideSolutionNode = FALSE -- EndGlobalSection --EndGlobal ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio Express 2012 for Windows Desktop ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench-dll", "fullbench-dll.vcxproj", "{13992FD2-077E-4954-B065-A428198201A9}" ++EndProject ++Global ++ GlobalSection(SolutionConfigurationPlatforms) = preSolution ++ Debug|Win32 = Debug|Win32 ++ Debug|x64 = Debug|x64 ++ Release|Win32 = Release|Win32 ++ Release|x64 = Release|x64 ++ EndGlobalSection ++ GlobalSection(ProjectConfigurationPlatforms) = postSolution ++ {13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.Build.0 = Debug|Win32 ++ {13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.ActiveCfg = Debug|x64 ++ {13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.Build.0 = Debug|x64 ++ {13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.ActiveCfg = Release|Win32 ++ {13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.Build.0 = Release|Win32 ++ {13992FD2-077E-4954-B065-A428198201A9}.Release|x64.ActiveCfg = Release|x64 ++ {13992FD2-077E-4954-B065-A428198201A9}.Release|x64.Build.0 = Release|x64 ++ EndGlobalSection ++ GlobalSection(SolutionProperties) = preSolution ++ HideSolutionNode = FALSE ++ EndGlobalSection ++EndGlobal diff --cc lib/dll/example/fullbench-dll.vcxproj index fbea783,fbea783..44bbaf7 --- a/lib/dll/example/fullbench-dll.vcxproj +++ b/lib/dll/example/fullbench-dll.vcxproj @@@ -1,181 -1,181 +1,181 @@@ --ï»¿ -- -- -- -- Debug -- Win32 -- -- -- Debug -- x64 -- -- -- Release -- Win32 -- -- -- Release -- x64 -- -- -- -- {00000000-1CC8-4FD7-9281-6B8DBB9D3DF8} -- Win32Proj -- fullbench-dll -- $(SolutionDir)bin\$(Platform)_$(Configuration)\ -- $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ -- -- -- -- Application -- true -- MultiByte -- -- -- Application -- true -- MultiByte -- -- -- Application -- false -- true -- MultiByte -- -- -- Application -- false -- true -- MultiByte -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- true -- $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); -- false -- -- -- true -- $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); -- false -- -- -- false -- $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); -- false -- -- -- false -- $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); -- false -- -- -- -- -- -- Level4 -- Disabled -- WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) -- true -- false -- ..\include -- -- -- Console -- true -- $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) -- libzstd.lib;%(AdditionalDependencies) -- false -- -- -- -- -- -- -- Level4 -- Disabled -- WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) -- true -- false -- ..\include -- -- -- Console -- true -- $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) -- libzstd.lib;%(AdditionalDependencies) -- -- -- -- -- Level4 -- -- -- MaxSpeed -- true -- true -- WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) -- false -- ..\include -- false -- MultiThreaded -- -- -- Console -- true -- true -- true -- $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) -- libzstd.lib;%(AdditionalDependencies) -- false -- -- -- -- -- Level4 -- -- -- MaxSpeed -- true -- true -- WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) -- false -- false -- ..\include -- MultiThreaded -- -- -- Console -- true -- true -- true -- $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) -- libzstd.lib;%(AdditionalDependencies) -- -- -- -- -- -- -- -- -- -- -- -- ++ï»¿ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {00000000-1CC8-4FD7-9281-6B8DBB9D3DF8} ++ Win32Proj ++ fullbench-dll ++ $(SolutionDir)bin\$(Platform)_$(Configuration)\ ++ $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ ++ ++ ++ ++ Application ++ true ++ MultiByte ++ ++ ++ Application ++ true ++ MultiByte ++ ++ ++ Application ++ false ++ true ++ MultiByte ++ ++ ++ Application ++ false ++ true ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); ++ false ++ ++ ++ true ++ $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); ++ false ++ ++ ++ false ++ $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); ++ false ++ ++ ++ false ++ $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); ++ false ++ ++ ++ ++ ++ ++ Level4 ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) ++ true ++ false ++ ..\include ++ ++ ++ Console ++ true ++ $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) ++ libzstd.lib;%(AdditionalDependencies) ++ false ++ ++ ++ ++ ++ ++ ++ Level4 ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) ++ true ++ false ++ ..\include ++ ++ ++ Console ++ true ++ $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) ++ libzstd.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ Level4 ++ ++ ++ MaxSpeed ++ true ++ true ++ WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) ++ false ++ ..\include ++ false ++ MultiThreaded ++ ++ ++ Console ++ true ++ true ++ true ++ $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) ++ libzstd.lib;%(AdditionalDependencies) ++ false ++ ++ ++ ++ ++ Level4 ++ ++ ++ MaxSpeed ++ true ++ true ++ WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions) ++ false ++ false ++ ..\include ++ MultiThreaded ++ ++ ++ Console ++ true ++ true ++ true ++ $(SolutionDir)..\dll;%(AdditionalLibraryDirectories) ++ libzstd.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++