mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: remove OBS support from Ubuntu/Debian scripts

Browse source 
This feels much cleaner.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-04-18 20:28:38 -07:00
parent 83a963bc37
commit 2f8c968ff9
1 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
packaging/ubuntu/make-package.sh
View file

@ -23,11 +23,6 @@ if [[ ! -d libgit2 ]] ; then
exit 1; exit 1;
fi fi
if [[ "$1" = "-obs" ]] ; then
echo "Also pushing update to OBS"
OBS="1"
fi
# ensure that the libdivecomputer module is there and current # ensure that the libdivecomputer module is there and current
cd subsurface cd subsurface
git submodule init git submodule init
@ -79,17 +74,7 @@ if [[ ! -d subsurface_$VERSION ]]; then
echo $GITDATE > .gitdate echo $GITDATE > .gitdate
echo $LIBDCREVISION > libdivecomputer/revision echo $LIBDCREVISION > libdivecomputer/revision
if [[ "$OBS" = "1" ]]; then echo "creating source tar file for Ubuntu PPA"
# oops, this isn't really for Debian/Ubuntu... it just creates corresponding source tar files for
# the Open Build Service to create SUSE and Fedora packages while we are at it
if [[ "$GITREVISION" != "" ]] ; then
(cd .. ; tar ch subsurfacedaily-$VERSION | xz > home:Subsurface-Divelog/Subsurface-daily/subsurface-$VERSION.orig.tar.xz) &
else
(cd .. ; tar ch subsurface-$VERSION | xz > home:Subsurface-Divelog/Subsurface/subsurface-$VERSION.orig.tar.xz) &
fi
fi
echo "creating source tar file for OBS and Ununtu PPA"
tar cf - . | xz > ../subsurface_$VERSION.orig.tar.xz tar cf - . | xz > ../subsurface_$VERSION.orig.tar.xz
else else
@ -150,27 +135,7 @@ if [[ "$1" = "post" ]] ; then
if [[ "$GITREVISION" == "" ]] ; then if [[ "$GITREVISION" == "" ]] ; then
# this is a release # this is a release
dput ppa:subsurface/subsurface subsurface_$VERSION-$rev~*.changes dput ppa:subsurface/subsurface subsurface_$VERSION-$rev~*.changes
if [[ "$OBS" = "1" ]]; then
# more stuff for OBS / SUSE / Fedora
cd home:Subsurface-Divelog/Subsurface
osc rm $(ls subsurface*.tar.xz | grep -v $VERSION)
osc add subsurface-$VERSION.orig.tar.xz
sed -i "s/%define latestVersion.*/%define latestVersion $VERSION/" subsurface.spec
sed -i "s/%define gitVersion .*/%define gitVersion 0/" subsurface.spec
osc commit -m "next release build"
fi
else else
dput ppa:subsurface/subsurface-daily subsurface_$VERSION-$rev~*.changes dput ppa:subsurface/subsurface-daily subsurface_$VERSION-$rev~*.changes
if [[ "$OBS" = "1" ]]; then
# more stuff for OBS / SUSE / Fedora
cd home:Subsurface-Divelog/Subsurface-daily
osc rm $(ls subsurface*.tar.xz | grep -v $VERSION)
osc add subsurface-$VERSION.orig.tar.xz
sed -i "s/%define latestVersion.*/%define latestVersion $VERSION/" subsurfacedaily.spec
sed -i "s/%define gitVersion .*/%define gitVersion $GITREVISION/" subsurfacedaily.spec
osc commit -m "next daily build"
fi
fi fi
fi fi