diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-12 10:58:20 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-12-12 11:39:46 -0800 |
| commit | f559f6c8705e563a3a91140a4c308f93b6843f77 (patch) | |
| tree | c7808194ab30cbc648876f64134ee427796fddf4 | |
| parent | 4487efcabe0fc13823135e4c9107ef9feb4877ae (diff) | |
| download | subsurface-f559f6c8705e563a3a91140a4c308f93b6843f77.tar.gz | |
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 <dirk@hohndel.org>
| -rw-r--r-- | packaging/ubuntu/make-package.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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.* |