From a6157c88abf2724375ee7b0ba8273d15929434d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 23:24:04 +0200 Subject: d/rules: Add code remove unused .md5 files; Use /usr/share/dpkg/pkg-info.mk to get Upstream version; Remove now useless code --- debian/changelog | 4 +++- debian/rules | 19 +++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f27431..3618c40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,9 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Use secure copyright format URI. - Bump year for debian/* to 2018. * debian/rules: - - Remove unused .md5 files from documentation. + - Add code remove unused .md5 files from documentation. + - Use /usr/share/dpkg/pkg-info.mk to get Upstream version. + - Remove now useless code. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/rules b/debian/rules index 388b48f..9a96c74 100755 --- a/debian/rules +++ b/debian/rules @@ -6,20 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DH_OPTIONS += -O-Bbuild-tree -UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev) - -LDFLAGS += -fPIE -pie -Wl,-z,relro -Wl,-z,now -fPIC -CPPFLAGS += -D_FORTIFY_SOURCE=2 -fPIE -pie -Wl,-z,relro -Wl,-z,now -CFLAGS += -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIE -pie -Wl,-z,relro -Wl,-z,now -export CPPFLAGS -export CFLAGS -export LDFLAGS - -# -# Test for gcc-5 support -# -#export CC=gcc-5 -#export CXX=g++-5 +include /usr/share/dpkg/pkg-info.mk %: dh $@ @@ -46,7 +33,7 @@ override_dh_autoreconf-indep override_dh_auto_configure-indep: ; override_dh_auto_test-indep override_dh_auto_install-indep: ; override_dh_auto_build-indep: install -d build-tree/docs/html - cd build-tree && sed -e "s,@VERSION@,${UPSTREAM_VERSION},g" \ + cd build-tree && sed -e "s,@VERSION@,$(DEB_VERSION_UPSTREAM),g" \ -e "s,@top_srcdir@,../,g" \ <../Doxyfile.in >Doxyfile cd build-tree && doxygen @@ -61,4 +48,4 @@ override_dh_compress: override_dh_makeshlibs: dh_makeshlibs - dpkg-gensymbols -v$(UPSTREAM_VERSION) -plibmongo-client0 + dpkg-gensymbols -v$(DEB_VERSION_UPSTREAM) -plibmongo-client0 -- cgit v1.2.3