[med-svn] [libzstd] 04/05: Do not depend libzstd in zstd package since static linking seems to be the prefered way to create the executable

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libzstd.

commit 0f3422f805ea15df666e78aa158850743ec1fa7d
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 21 11:42:52 2017 +0100

    Do not depend libzstd in zstd package since static linking seems to be the prefered way to create the executable
---
 debian/changelog                          |  3 ++-
 debian/control                            |  3 +--
 debian/patches/0013-dynamic-linking.patch | 25 -------------------------
 debian/patches/series                     |  1 -
 debian/rules                              |  5 -----
 5 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6203498..516adb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 libzstd (1.3.2+dfsg2-2) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Do not link statically against libzstd
+  * Do not depend libzstd in zstd package since static linking seems
+    to be the prefered way to create the executable
     Closes: #884876
   * Standards-Version: 4.1.2
 
diff --git a/debian/control b/debian/control
index af2d711..ba29bda 100644
--- a/debian/control
+++ b/debian/control
@@ -37,8 +37,7 @@ Description: fast lossless compression algorithm
 Package: zstd
 Architecture: any
 Section: utils
-Depends: libzstd1 (= ${binary:Version}),
-         ${shlibs:Depends},
+Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: fast lossless compression algorithm -- CLI tool
  Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
diff --git a/debian/patches/0013-dynamic-linking.patch b/debian/patches/0013-dynamic-linking.patch
deleted file mode 100644
index 8486903..0000000
--- a/debian/patches/0013-dynamic-linking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Do not link statically against libzstd
-Bug-Debian: https://bugs.debian.org/884876
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 21 Dec 2017 10:42:27 +0100
-
---- a/Makefile
-+++ b/Makefile
-@@ -107,7 +107,7 @@ clean:
- ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD MSYS_NT))
- 
- HOST_OS = POSIX
--CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON
-+CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=OFF -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON
- 
- .PHONY: list
- list:
-@@ -296,7 +296,7 @@ endif
- 
- ifneq (,$(filter MSYS%,$(shell uname)))
- HOST_OS = MSYS
--CMAKE_PARAMS = -G"MSYS Makefiles" -DZSTD_MULTITHREAD_SUPPORT:BOOL=OFF -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON
-+CMAKE_PARAMS = -G"MSYS Makefiles" -DZSTD_MULTITHREAD_SUPPORT:BOOL=OFF -DZSTD_BUILD_STATIC:BOOL=OFF -DZSTD_BUILD_TESTS:BOOL=ON
- endif
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 51e4263..cdbdf33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@
 0009-Add-shebang-for-scripts.patch
 0011-skip-long-running-tests_on_hurd.patch
 0012-typos.patch
-0013-dynamic-linking.patch
diff --git a/debian/rules b/debian/rules
index a53706f..e5e0dba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,14 +8,9 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 # Upstream's makefiles will respect PREFIX, and this means we avoid a patch
 export PREFIX=/usr
 
-CMAKE_EXTRA_FLAGS += -DZSTD_BUILD_STATIC:BOOL=OFF
-
 %:
 	dh $@
 
-override_dh_auto_configure:
-	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
-
 override_dh_auto_build:
 	dh_auto_build
 	$(MAKE) -C contrib/pzstd/ pzstd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libzstd.git