[med-svn] [Git][med-team/libzstd][master] 7 commits: Also merge in the 1.3.3+dfsg-2 changelog, as it was never accepted in debian
Mattia Rizzolo
gitlab at salsa.debian.org
Sat Apr 21 10:06:13 BST 2018
Mattia Rizzolo pushed to branch master at Debian Med / libzstd
Commits:
6f930c41 by Mattia Rizzolo at 2018-04-21T10:29:05+02:00
Also merge in the 1.3.3+dfsg-2 changelog, as it was never accepted in debian
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
3335681d by Mattia Rizzolo at 2018-04-21T10:35:17+02:00
Revert "Add libzstd1-udeb package, for btrfs-progs-udeb and others in the future."
This reverts commit fda7bc060f69bd37b7f5363a33f627861d6525db.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
7b7be376 by Mattia Rizzolo at 2018-04-21T10:36:44+02:00
also update changelog for the last commit
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
874870d0 by Mattia Rizzolo at 2018-04-21T10:37:18+02:00
Bump debhelper compat level to 11.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
fd7591cc by Mattia Rizzolo at 2018-04-21T10:38:28+02:00
Bump Standards-Version to 4.1.4, no changes needed.
- - - - -
973f0002 by Mattia Rizzolo at 2018-04-21T10:48:01+02:00
Update copyright
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
9a46c6cf by Mattia Rizzolo at 2018-04-21T10:59:39+02:00
Remove patch skipping a test on hurd-i386: allegedly the underlying issue has been fixed instead.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
7 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- − debian/patches/0011-skip-long-running-tests_on_hurd.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libzstd (1.3.4+dfsg-3) UNRELEASED; urgency=medium
+libzstd (1.3.4+dfsg-1) UNRELEASED; urgency=medium
[ Alexandre Mestiashvili]
* New upstream version 1.3.4+dfsg
@@ -8,26 +8,27 @@ libzstd (1.3.4+dfsg-3) UNRELEASED; urgency=medium
* Refresh patches, remove indexes
* Disable tests if DEB_BUILD_OPTIONS set to nocheck
* Update d/rules, use dh_auto_build instead of make to avoid cross build
- failures. Thanks to Helmut Grohne for the patch. Closes: #895925
+ failures. Thanks to Helmut Grohne for the patch. Closes: #895925
* Update d/libzstd1.symbols fixing minimal-version
[ Adam Borowski ]
- * Enable build on riscv64
- Closes: #895259
-
- -- Alexandre Mestiashvili <mestia at debian.org> Wed, 18 Apr 2018 16:29:28 +0200
-
-libzstd (1.3.3+dfsg-2) unstable; urgency=medium
+ * Enable build on riscv64. Closes: #895259
[ 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.
+ [ Mattia Rizzolo ]
+ * Bump debhelper compat level to 11.
+ * Bump Standards-Version to 4.1.4, no changes needed.
+ * Update copyright after the new upstream release.
+ * Remove patch skipping a test on hurd-i386: allegedly the underlying issue
+ has been fixed instead.
+
-- Dimitri John Ledkov <xnox at ubuntu.com> Mon, 12 Mar 2018 14:36:45 +0000
libzstd (1.3.3+dfsg-1) unstable; urgency=medium
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Uploaders: Kevin Murray <kdmfoss at gmail.com>,
Alexandre Mestiashvili <mestia at debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11),
d-shlibs,
zlib1g-dev
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
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
@@ -37,18 +37,6 @@ Description: fast lossless compression algorithm
.
This package contains the shared library.
-Package: libzstd1-udeb
-Architecture: any
-Section: debian-installer
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Package-Type: udeb
-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/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,9 +10,9 @@ Files-Excluded: appveyor.yml
.buckconfig
Files: *
-Copyright: 2013-2016, Yann Collet
+Copyright: 2013-2018, Yann Collet
2016, Przemyslaw Skibinski
- 2016, Facebook, Inc.
+ 2016-2018, Facebook, Inc.
License: BSD-3-clause-with-patent-grant
Files: zlibWrapper/examples/*.c
=====================================
debian/patches/0011-skip-long-running-tests_on_hurd.patch deleted
=====================================
--- a/debian/patches/0011-skip-long-running-tests_on_hurd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Skip too heavy md5sum test on GNU HURD.
- Do not pass -T parameter to test tools as they never finish on HURD
-From: Alex Mestiashvili <mailatgoogl at gmail.com>
-Forwarded-Upstream: yes (https://github.com/facebook/zstd/issues/935)
-Last-Update: 2017-11-30
-
---- libzstd.orig/tests/playTests.sh
-+++ libzstd/tests/playTests.sh
-@@ -743,7 +743,10 @@
- roundTripTest -g5000000000 -P99 1
- roundTripTest -g1700000000 -P0 "1 --zstd=strategy=6" # ensure btlazy2 can survive an overflow rescale
-
-+DEBIAN_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_OS)
-+if [ "$DEBIAN_ARCH" != "hurd" ]; then
- fileRoundTripTest -g4193M -P99 1
-+fi
-
-
- $ECHO "\n===> zstd long, long distance matching round-trip tests "
-@@ -762,7 +765,9 @@
- roundTripTest -g80000000 -P99 "19 -T2" " "
- roundTripTest -g5000000000 -P99 "1 -T2" " "
- roundTripTest -g500000000 -P97 "1 -T999" " "
-+ if [ "$DEBIAN_ARCH" != "hurd" ]; then
- fileRoundTripTest -g4103M -P98 " -T0" " "
-+ fi
- roundTripTest -g400000000 -P97 "1 --long=24 -T2" " "
- else
- $ECHO "\n**** no multithreading, skipping zstdmt tests **** "
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
0006-Use-bash-for-test-script-portablitity.patch
0008-Address-embedded-zlib.patch
0009-Add-shebang-for-scripts.patch
-0011-skip-long-running-tests_on_hurd.patch
0012-typos.patch
pthread.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -29,12 +29,8 @@ 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
dh_auto_clean --sourcedirectory=contrib/pzstd
View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/8159ace9d2ad5a4ce91394f9900df0a86d1b211e...9a46c6cfb4bd327d595a47cf0bc6dbcd96b52f6b
---
View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/8159ace9d2ad5a4ce91394f9900df0a86d1b211e...9a46c6cfb4bd327d595a47cf0bc6dbcd96b52f6b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180421/6b2ebc12/attachment-0001.html>
More information about the debian-med-commit
mailing list