fix build error with debian

Change-Id: I7fad797db00ef76e9c5ca197d06530427a2d4656
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/debian/control b/debian/control
index b2d2ebd..36855b4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,24 @@
 Source: libzstd
-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 Uploaders: Kevin Murray <kdmfoss@gmail.com>,
-           Olivier Sallou <osallou@debian.org>,
-           Alexandre Mestiashvili <mestia@debian.org>
+           Olivier Sallou <osallou@debian.org>
 Section: libs
 Priority: optional
-Build-Depends: gcc,
-               debhelper,
-Rules-Requires-Root: binary-targets
-Standards-Version: 4.5.0
-Vcs-Browser: https://salsa.debian.org/med-team/libzstd
-Vcs-Git: https://salsa.debian.org/med-team/libzstd.git
+Build-Depends: debhelper (>= 9),
+               gcc
+Standards-Version: 4.1.0
+Vcs-Browser: https://anonscm.debian.org/git/debian-med/libzstd.git
+Vcs-Git: https://anonscm.debian.org/git/debian-med/libzstd.git
 Homepage: https://github.com/facebook/zstd
 
 Package: libzstd-dev
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Depends: libzstd1 (= ${binary:Version}),
          ${misc:Depends}
+Conflicts: libzstd1-dev
+Provides: libzstd-dev
 Description: fast lossless compression algorithm -- development files
  Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
  real-time compression scenarios at zlib-level compression ratio.
@@ -27,10 +27,9 @@ Description: fast lossless compression algorithm -- development files
 
 Package: libzstd1
 Architecture: any
-Multi-Arch: same
 Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: fast lossless compression algorithm
  Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
  real-time compression scenarios at zlib-level compression ratio.
@@ -40,8 +39,9 @@ Description: fast lossless compression algorithm
 Package: zstd
 Architecture: any
 Section: utils
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libzstd1 (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: fast lossless compression algorithm -- CLI tool
  Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
  real-time compression scenarios at zlib-level compression ratio.

diff --git a/debian/libzstd-dev.install b/debian/libzstd-dev.install
new file mode 100644 (file)
index 0000000..b691d6a
--- /dev/null
+++ b/debian/libzstd-dev.install
@@ -0,0 +1,4 @@
+usr/include/*.h
+usr/lib/pkgconfig/libzstd.pc
+usr/lib/libzstd.so
+usr/lib/libzstd.a

diff --git a/debian/libzstd1.install b/debian/libzstd1.install
new file mode 100644 (file)
index 0000000..ff957de
--- /dev/null
+++ b/debian/libzstd1.install
@@ -0,0 +1 @@
+usr/lib/libzstd.so.*

diff --git a/debian/rules b/debian/rules
index 338ba45..1762015 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 # Upstream's makefiles will respect PREFIX, and this means we avoid a patch
@@ -12,17 +11,15 @@ export PREFIX=/usr
 %:
        dh $@
 
-DH_AUTO_CONFIGURE_OPTS :=DH_AUTO_CONFIGURE_OPTS += -DZSTD_BUILD_TESTS:BOOL=OFF
-
-override_dh_auto_clean:
-       dh_auto_clean
-       dh_auto_clean --sourcedirectory=contrib/pzstd
-
 override_dh_auto_build:
-       dh_auto_build -- ZSTD_LEGACY_MULTITHREADED_API=1
-       dh_auto_build --sourcedirectory=contrib/pzstd/ -- pzstd
+       dh_auto_build
+       $(MAKE) -C contrib/pzstd/ pzstd
 
 override_dh_install:
        # Call d-shlibmove to comply with library packaging guide
        dh_install
 
+override_dh_auto_clean:
+       dh_auto_clean
+       $(MAKE) -C contrib/pzstd clean
+