[med-svn] [Git][med-team/libzstd][master] 6 commits: Mark -dev and library packages Multi-Arch same.
Dimitri Ledkov
gitlab at salsa.debian.org
Mon Mar 12 14:55:51 UTC 2018
Dimitri Ledkov pushed to branch master at Debian Med / libzstd
Commits:
26fa3620 by Dimitri John Ledkov at 2018-03-12T10:06:35+00:00
Mark -dev and library packages Multi-Arch same.
- - - - -
fda7bc06 by Dimitri John Ledkov at 2018-03-12T10:23:09+00:00
Add libzstd1-udeb package, for btrfs-progs-udeb and others in the future.
- - - - -
aa73abc7 by Dimitri John Ledkov at 2018-03-12T10:26:07+00:00
Update Vcs fields for salsa.
- - - - -
7f0eefac by Andreas Hasenack at 2018-03-12T14:06:56+00:00
d/rules: also run the clean Makefile target in the pzstd directory.
- - - - -
0788ec7c by Dimitri John Ledkov at 2018-03-12T14:35:32+00:00
Cleanup unused patches.
- - - - -
50c4849e by Dimitri John Ledkov at 2018-03-12T14:36:49+00:00
releasing package libzstd version 1.3.3+dfsg-2
- - - - -
8 changed files:
- debian/changelog
- debian/control
- − debian/patches/0001-Skip-long-running-tests.patch
- − debian/patches/0002-Build-lib-by-default.patch
- − debian/patches/0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch
- − debian/patches/0007-Fix-use-of-fprintf.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libzstd (1.3.3+dfsg-2) unstable; urgency=medium
+
+ [ Dimitri John Ledkov ]
+ * Mark -dev and library packages Multi-Arch same.
+ * Add libzstd1-udeb package, for btrfs-progs-udeb and others in the future.
+ * Update Vcs fields for salsa.
+ * Cleanup unused patches.
+
+ [ Andreas Hasenack ]
+ * d/rules: also run the clean Makefile target in the pzstd directory.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com> Mon, 12 Mar 2018 14:36:45 +0000
+
libzstd (1.3.3+dfsg-1) unstable; urgency=medium
* Update File-Excluded list in d/copyright
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,13 @@ Build-Depends: debhelper (>= 10),
d-shlibs,
zlib1g-dev
Standards-Version: 4.1.2
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libzstd.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/libzstd.git
+Vcs-Browser: https://salsa.debian.org/med-team/libzstd
+Vcs-Git: https://salsa.debian.org/med-team/libzstd.git
Homepage: https://github.com/facebook/zstd
Package: libzstd-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libzstd1 (= ${binary:Version}),
${misc:Depends}
@@ -26,6 +27,7 @@ Description: fast lossless compression algorithm -- development files
Package: libzstd1
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -35,6 +37,19 @@ Description: fast lossless compression algorithm
.
This package contains the shared library.
+Package: libzstd1-udeb
+XC-Package-Type: udeb
+Architecture: any
+Multi-Arch: same
+Section: debian-installer
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: fast lossless compression algorithm - runtime for Debian installer
+ Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
+ real-time compression scenarios at zlib-level compression ratio.
+ .
+ This package contains the shared library for use with the Debian installer.
+
Package: zstd
Architecture: any
Section: utils
=====================================
debian/patches/0001-Skip-long-running-tests.patch deleted
=====================================
--- a/debian/patches/0001-Skip-long-running-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Kevin Murray <spam at kdmurray.id.au>
-Date: Tue, 1 Dec 2015 14:40:58 +1100
-Subject: Skip long-running tests
-
----
- tests/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -183,11 +183,11 @@
- file $(ZSTD)
- ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST)
-
--test: test-zstd test-fullbench test-fuzzer test-zstream test-longmatch
-+test: test-zstd test-zstream
-
- test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zstream32
-
--test-all: test test32 valgrindTest
-+test-all: test
-
- test-zstd: ZSTD = $(PRGDIR)/zstd
- test-zstd: zstd zstd-playTests
=====================================
debian/patches/0002-Build-lib-by-default.patch deleted
=====================================
--- a/debian/patches/0002-Build-lib-by-default.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Kevin Murray <spam at kdmurray.id.au>
-Date: Tue, 1 Dec 2015 14:52:40 +1100
-Subject: Build lib by default
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -28,8 +28,8 @@
- .PHONY: all
- all:
- $(MAKE) -C $(ZSTDDIR) $@
-- $(MAKE) -C $(PRGDIR) $@ zstd32
-- $(MAKE) -C $(TESTDIR) $@ all32
-+ $(MAKE) -C $(PRGDIR) $@
-+ $(MAKE) -C $(TESTDIR) $@
-
- .PHONY: lib
- lib:
=====================================
debian/patches/0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch deleted
=====================================
--- a/debian/patches/0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Kevin Murray <spam at kdmurray.id.au>
-Date: Mon, 14 Nov 2016 10:44:27 +1100
-Subject: Ensure CPPFLAGS makes it to the compiler
-
----
- lib/Makefile | 11 +++++------
- programs/Makefile | 5 ++---
- tests/Makefile | 5 ++---
- zlibWrapper/Makefile | 4 ++--
- 4 files changed, 11 insertions(+), 14 deletions(-)
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -23,9 +23,8 @@
- LIBDIR ?= $(PREFIX)/lib
- INCLUDEDIR=$(PREFIX)/include
-
--CPPFLAGS+= -I. -I./common -DXXH_NAMESPACE=ZSTD_
--CFLAGS ?= -O3
--CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
-+CPPFLAGS += -I. -I./common -DXXH_NAMESPACE=ZSTD_
-+CFLAGS += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
- -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
- -Wpointer-arith
- CFLAGS += $(MOREFLAGS)
-@@ -67,17 +66,17 @@
- libzstd.a: ARFLAGS = rcs
- libzstd.a: $(ZSTD_FILES)
- @echo compiling static library
-- @$(CC) $(FLAGS) -c $^
-- @$(AR) $(ARFLAGS) $@ *.o
-+ $(CC) $(FLAGS) -c $^
-+ $(AR) $(ARFLAGS) $@ *.o
-
- $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
- $(LIBZSTD): $(ZSTD_FILES)
- @echo compiling dynamic library $(LIBVER)
- ifneq (,$(filter Windows%,$(OS)))
-- @$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
-+ $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
- dlltool -D dll\libzstd.dll -d dll\libzstd.def -l dll\libzstd.lib
- else
-- @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-+ $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
- @echo creating versioned links
- @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
- @ln -sf $@ libzstd.$(SHARED_EXT)
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -27,9 +27,8 @@
- ALIGN_LOOP =
- endif
-
--CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
--CFLAGS ?= -O3
--CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
-+CPPFLAGS += -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
-+CFLAGS += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
- -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
- -Wpointer-arith
- CFLAGS += $(MOREFLAGS)
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -28,9 +28,8 @@
- TESTARTEFACT := versionsTest namespaceTest
-
-
--CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PRGDIR)
--CFLAGS ?= -O3
--CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
-+CPPFLAGS += -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PRGDIR)
-+CFLAGS += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
- -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef
- CFLAGS += $(MOREFLAGS)
- FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
=====================================
debian/patches/0007-Fix-use-of-fprintf.patch deleted
=====================================
--- a/debian/patches/0007-Fix-use-of-fprintf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Fix use of fprintf
-Author: Sascha Steinbiss <satta at debian.org>
---- a/contrib/pzstd/Pzstd.h
-+++ b/contrib/pzstd/Pzstd.h
-@@ -41,7 +41,7 @@
- auto parameters = options.determineParameters();
- cStreamPool.reset(new ResourcePool<ZSTD_CStream>{
- [this, parameters]() -> ZSTD_CStream* {
-- this->log(VERBOSE, "Creating new ZSTD_CStream\n");
-+ this->log(VERBOSE, "%s\n", "Creating new ZSTD_CStream");
- auto zcs = ZSTD_createCStream();
- if (zcs) {
- auto err = ZSTD_initCStream_advanced(
-@@ -59,7 +59,7 @@
- } else {
- dStreamPool.reset(new ResourcePool<ZSTD_DStream>{
- [this]() -> ZSTD_DStream* {
-- this->log(VERBOSE, "Creating new ZSTD_DStream\n");
-+ this->log(VERBOSE, "%s\n", "Creating new ZSTD_DStream");
- auto zds = ZSTD_createDStream();
- if (zds) {
- auto err = ZSTD_initDStream(zds);
---- a/contrib/pzstd/Pzstd.cpp
-+++ b/contrib/pzstd/Pzstd.cpp
-@@ -410,7 +410,7 @@
- });
- // Pass the output queue to the writer thread.
- chunks.push(std::move(out));
-- state.log(VERBOSE, "Starting a new frame\n");
-+ state.log(VERBOSE, "%s\n", "Starting a new frame");
- // Fill the input queue for the compression job we just started
- status = readData(*in, ZSTD_CStreamInSize(), step, fd, &bytesRead);
- }
-@@ -547,8 +547,8 @@
- if (frameSize == 0) {
- // We hit a non SkippableFrame ==> not compressed by pzstd or corrupted
- // Pass the rest of the source to this decompression task
-- state.log(VERBOSE,
-- "Input not in pzstd format, falling back to serial decompression\n");
-+ state.log(VERBOSE, "%s\n",
-+ "Input not in pzstd format, falling back to serial decompression");
- while (status == FileStatus::Continue && !state.errorHolder.hasError()) {
- status = readData(*in, chunkSize, chunkSize, fd, &totalBytesRead);
- }
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,6 @@
-#0001-Skip-long-running-tests.patch
-#0002-Build-lib-by-default.patch
0003-Add-symlinks-for-extra-manpages.patch
0004-Add-help2man-d-pzstd-man-file.patch
-#0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch
0006-Use-bash-for-test-script-portablitity.patch
-#0007-Fix-use-of-fprintf.patch
0008-Address-embedded-zlib.patch
0009-Add-shebang-for-scripts.patch
0011-skip-long-running-tests_on_hurd.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -24,4 +24,12 @@ override_dh_install:
--movedev "debian/tmp/usr/include/*" usr/include \
--movedev "debian/tmp/usr/lib/pkgconfig/*" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
debian/tmp/usr/lib/lib*.so
+ cp -r debian/libzstd1/usr debian/libzstd1-udeb/
dh_install
+
+override_dh_makeshlibs:
+ dh_makeshlibs -plibzstd1 --add-udeb=libzstd1-udeb
+
+override_dh_auto_clean:
+ dh_auto_clean
+ $(MAKE) -C contrib/pzstd clean
View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/740ac12e44b08e40e8d178f31db84972736821b3...50c4849ef0ea5d79d7d5f84fd0a46b6404a413eb
---
View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/740ac12e44b08e40e8d178f31db84972736821b3...50c4849ef0ea5d79d7d5f84fd0a46b6404a413eb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180312/1ea5beb8/attachment-0001.html>
More information about the debian-med-commit
mailing list