diff options
author | Wook Song <wook16.song@samsung.com> | 2020-09-15 16:54:01 +0900 |
---|---|---|
committer | Wook Song <wook16.song@samsung.com> | 2020-09-15 18:45:50 +0900 |
commit | 1bfa4ddaa8e39fc6b50f8b8e359aa0c32ef8ced1 (patch) | |
tree | 91c7f925def30847625f1a157c96894e69f40a5c | |
parent | e92b0065ad83a629aba0df232002e8771f20c7d1 (diff) | |
download | flatbuffers-accepted/tizen_6.0_unified.tar.gz flatbuffers-accepted/tizen_6.0_unified.tar.bz2 flatbuffers-accepted/tizen_6.0_unified.zip |
[Dist/Debian] Include .pc file in the dev-kit packagetizen_6.0.m2_releasesubmit/tizen_6.0_hotfix/20201103.115101submit/tizen_6.0_hotfix/20201102.192901submit/tizen_6.0/20201029.205501submit/tizen/20200921.045441accepted/tizen/unified/20200921.095140accepted/tizen/6.0/unified/hotfix/20201102.235858accepted/tizen/6.0/unified/20201030.104514tizen_6.0_hotfixtizen_6.0accepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unified
This patch revises the packaging files for Debian/Ubuntu to include .pc
file in the development kit package.
Change-Id: Ib94702ace3a970cfe5ab435c34795ac03296e02e
Signed-off-by: Wook Song <wook16.song@samsung.com>
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/libflatbuffers-dev.install | 1 | ||||
-rwxr-xr-x | debian/rules | 9 |
4 files changed, 15 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index ea6233d4..f7befddd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +flatbuffers (1.12.0-3) unstable; urgency=medium + + * Include flatbuffers.pc to the dev-kit package + + -- Wook Song <wook16.song@samsung.com> Tue, 15 Sep 2020 16:44:44 +0900 + flatbuffers (1.12.0-2) unstable; urgency=medium * Do not use gcc-10 for backward compatibility diff --git a/debian/control b/debian/control index 63fea84b..8ad479b4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: flatbuffers Section: libdevel Priority: optional Build-Depends: debhelper (>=9), cmake, - gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4) + gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>>5.4) Maintainer: Wook Song <wook16.song@samsung.com> Standards-Version: 3.6.1 Homepage: https://github.com/google/flatbuffers diff --git a/debian/libflatbuffers-dev.install b/debian/libflatbuffers-dev.install index ecb5e929..86952021 100644 --- a/debian/libflatbuffers-dev.install +++ b/debian/libflatbuffers-dev.install @@ -1,4 +1,5 @@ /usr/lib/*/libflatbuffers.so /usr/lib/*/libflatbuffers.a +/usr/lib/*/pkgconfig/* /usr/include/flatbuffers/* /usr/lib/*/cmake/* diff --git a/debian/rules b/debian/rules index 0d8e27f7..fa699795 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ export DEB_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) else export DEB_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) endif +export VERSION:=1.12.0 export DEB_CMAKE_EXTRA_FLAGS += -DFLATBUFFERS_INSTALL=ON \ -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ @@ -22,5 +23,9 @@ export DEB_CMAKE_EXTRA_FLAGS += -DFLATBUFFERS_INSTALL=ON \ override_dh_auto_configure: dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) - - +override_dh_auto_install: + dh_auto_install -- + install -D -m 644 packaging/flatbuffers.pc.in debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/flatbuffers.pc + sed -i 's#@version@#$(VERSION)#g' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/flatbuffers.pc + sed -i 's#@libdir@#/usr/lib/$(DEB_HOST_MULTIARCH)#g' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/flatbuffers.pc + sed -i 's#@includedir@#/usr/include#g' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/flatbuffers.pc |