From f559f6c8705e563a3a91140a4c308f93b6843f77 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 12 Dec 2014 10:58:20 -0800 Subject: Ubuntu packaging: Create the correct libdivecomputer version Since we strip the .git data from the source tree (to conserve space and not violate the packaging guidelines - or at least not violate THAT packaging guideline) we need to create the correct revision before the tar file of sources is packaged. Signed-off-by: Dirk Hohndel --- packaging/ubuntu/make-package.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packaging/ubuntu') diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 423e9eb62..726c9cb74 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -8,7 +8,8 @@ fi GITVERSION=$(cd subsurface ; git describe | sed -e 's/-g.*$// ; s/^v//') VERSION=$(echo $GITVERSION | sed -e 's/-/./') -echo "building Subsurface" $VERSION +LIBDCREVISION=$(cd subsurface/libdivecomputer ; git rev-parse --verify HEAD) +echo "building Subsurface" $VERSION "with libdivecomputer" $LIBDCREVISION if [[ -d subsurface_$VERSION ]]; then rm -rf subsurface_$VERSION.bak.prev mv subsurface_$VERSION.bak subsurface_$VERSION.bak.prev @@ -19,6 +20,7 @@ mkdir subsurface_$VERSION cd subsurface_$VERSION rm -rf .git libdivecomputer/.git libgit2/.git marble-source/.git echo $GITVERSION > .gitversion +echo $LIBDCREVISION > libdivecomputer/revision dh_make --email dirk@hohndel.org -c gpl2 --createorig --single --yes -p subsurface_$VERSION rm debian/*.ex debian/*.EX debian/README.* -- cgit v1.2.3-70-g09d2