diff options
Diffstat (limited to 'packaging/ubuntu')
| -rwxr-xr-x | packaging/ubuntu/debian/rules | 13 | ||||
| -rw-r--r-- | packaging/ubuntu/make-package.sh | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules index e1ad26a3d..7a4696dfa 100755 --- a/packaging/ubuntu/debian/rules +++ b/packaging/ubuntu/debian/rules @@ -13,7 +13,6 @@ override_dh_auto_clean: (cd libdivecomputer ; make clean || true) make clean || true rm -rf libgit2/build - rm -rf marble-build rm -f ssrf-version.h rm -f subsurface rm -f Makefile @@ -23,16 +22,6 @@ override_dh_auto_configure: (mkdir libgit2/build ; cd libgit2/build ; \ cmake -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DBUILD_EXAMPLES=OFF .. ; \ sed -i 's/.so$/.a/' CMakeCache.txt ; make -j8 ) - (mkdir marble-build ; cd marble-build ; \ - cmake -DQTONLY=ON -DQT5BUILD=ON \ - -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \ - -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \ - -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \ - -DBUILD_WITH_DBUS=OFF ../marble-source ; \ - make -j8 ; \ - ln -s src/lib/marble lib ; \ - mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \ - ln -s . marble ) (mkdir subsurface-build ; cd subsurface-build ; \ cmake -DCMAKE_BUILD_TYPE=Release \ -DPREFER_GIT_FROMSOURCE=1 \ @@ -40,8 +29,6 @@ override_dh_auto_configure: -DLIBGIT2_LIBRARIES=$$(pwd)/../libgit2/build/libgit2.a \ -DLIBDIVECOMPUTER_INCLUDE_DIR=$$(pwd)/../libdivecomputer/include \ -DLIBDIVECOMPUTER_LIBRARIES=$$(pwd)/../libdivecomputer/src/.libs/libdivecomputer.a \ - -DMARBLE_INCLUDE_DIR=$$(pwd)/../marble-build/include \ - -DMARBLE_LIBRARIES=$$(pwd)/../marble-build/lib/libssrfmarblewidget.so \ $$(pwd)/.. ; ) override_dh_installchangelogs: diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 8bdd6078a..02ec041c0 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -38,7 +38,7 @@ if [[ ! -d subsurface_$VERSION ]]; then # (cd subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - ) cd subsurface_$VERSION; - rm -rf .git libdivecomputer/.git libgit2/.git marble-source/.git + rm -rf .git libdivecomputer/.git libgit2/.git echo $GITVERSION > .gitversion echo $LIBDCREVISION > libdivecomputer/revision # dh_make --email dirk@hohndel.org -c gpl2 --createorig --single --yes -p subsurface_$VERSION |