diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-04-18 20:28:38 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-04-19 08:17:15 -0700 |
| commit | 2f8c968ff9af2e62da0a3f53e95286bf3b0a7acb (patch) | |
| tree | c3c9dee6b8b767a415231f30f0e25fd6fc13ae67 | |
| parent | 83a963bc3788d7eec37b2761c447ee53608bdd5d (diff) | |
| download | subsurface-2f8c968ff9af2e62da0a3f53e95286bf3b0a7acb.tar.gz | |
build-system: remove OBS support from Ubuntu/Debian scripts
This feels much cleaner.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/ubuntu/make-package.sh | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index fdb5b08ed..f0e4700fe 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -23,11 +23,6 @@ if [[ ! -d libgit2 ]] ; then exit 1; fi -if [[ "$1" = "-obs" ]] ; then - echo "Also pushing update to OBS" - OBS="1" -fi - # ensure that the libdivecomputer module is there and current cd subsurface git submodule init @@ -79,17 +74,7 @@ if [[ ! -d subsurface_$VERSION ]]; then echo $GITDATE > .gitdate echo $LIBDCREVISION > libdivecomputer/revision - if [[ "$OBS" = "1" ]]; then - # 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" + echo "creating source tar file for Ubuntu PPA" tar cf - . | xz > ../subsurface_$VERSION.orig.tar.xz else @@ -150,27 +135,7 @@ if [[ "$1" = "post" ]] ; then if [[ "$GITREVISION" == "" ]] ; then # this is a release 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 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 |