From 183c966453754f52b31d2a939ba7589701c3c4d3 Mon Sep 17 00:00:00 2001 From: Heather Anderson Date: Sat, 28 Mar 2020 23:52:40 +0000 Subject: [PATCH] Tweaks done in response to Kalila's smoketest of ubuntu packaging --- pkg-scripts/make-deb-server | 2 +- pkg-scripts/server-rules | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg-scripts/make-deb-server b/pkg-scripts/make-deb-server index ee8475c0d4..72304ae414 100755 --- a/pkg-scripts/make-deb-server +++ b/pkg-scripts/make-deb-server @@ -8,7 +8,7 @@ GITDATE=`git -C $ATHENA/source log -n 1 --format=raw | grep author | cut -d">" - GITCOMMIT=`git -C $ATHENA/source rev-parse HEAD | cut -c 1-7` VERSION=0.86.0-k2-$GITDATE-$GITCOMMIT -sudo apt-get install chrpath binutils +sudo apt-get install chrpath binutils dh-make DEB_BUILD_ROOT=temp-make-deb/athena-server-$VERSION-0ubuntu1 rm -r temp-make-deb diff --git a/pkg-scripts/server-rules b/pkg-scripts/server-rules index 9cf9dc1396..4585591b15 100755 --- a/pkg-scripts/server-rules +++ b/pkg-scripts/server-rules @@ -45,6 +45,8 @@ override_dh_installinit: override_dh_shlibdeps: # don't run sh_shlibdeps, it REALLY won't work. We do it ourselves anyhow +override_dh_strip: + # don't run dh_strip, we do it ourselves anyhow and we want failures to be non-fatal # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 )