diff options
Diffstat (limited to 'packaging/ubuntu')
| -rw-r--r-- | packaging/ubuntu/debian/compat | 1 | ||||
| -rw-r--r-- | packaging/ubuntu/debian/docs | 7 | ||||
| -rwxr-xr-x | packaging/ubuntu/debian/rules | 8 | ||||
| -rw-r--r-- | packaging/ubuntu/debian/source/format | 1 | ||||
| -rw-r--r-- | packaging/ubuntu/make-package.sh | 43 |
5 files changed, 45 insertions, 15 deletions
diff --git a/packaging/ubuntu/debian/compat b/packaging/ubuntu/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/packaging/ubuntu/debian/compat @@ -0,0 +1 @@ +9 diff --git a/packaging/ubuntu/debian/docs b/packaging/ubuntu/debian/docs new file mode 100644 index 000000000..40dc76e3f --- /dev/null +++ b/packaging/ubuntu/debian/docs @@ -0,0 +1,7 @@ +gpl-2.0.txt +README +Readme.testing +Readme.ubuntu +ReleaseNotes.txt +SupportedDivecomputers.txt +TODO.CCR diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules index a4c51d912..61799c31b 100755 --- a/packaging/ubuntu/debian/rules +++ b/packaging/ubuntu/debian/rules @@ -18,8 +18,10 @@ override_dh_auto_clean: rm -f Makefile override_dh_auto_configure: - (cd libdivecomputer ; autoreconf --install ; ./configure ; make -j8 ) - (mkdir libgit2/build ; cd libgit2/build ; cmake -DBUILD_SHARED_LIBS=OFF .. ; sed -i 's/.so$/.a/' CMakeCache.txt ; make -j8 ) + (cd libdivecomputer ; autoreconf --install ; ./configure --disable-shared ; make -j8 ) + (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 \ @@ -27,7 +29,7 @@ override_dh_auto_configure: -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \ -DBUILD_WITH_DBUS=OFF ../marble-source ; \ make -j8 ; \ - mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; echo ln -s $$i . ; done ; \ + mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \ ln -s . marble ) qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build SPECIAL_MARBLE_PREFIX=1 subsurface.pro diff --git a/packaging/ubuntu/debian/source/format b/packaging/ubuntu/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/packaging/ubuntu/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 726c9cb74..30de8bb9c 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -9,31 +9,50 @@ fi GITVERSION=$(cd subsurface ; git describe | sed -e 's/-g.*$// ; s/^v//') VERSION=$(echo $GITVERSION | sed -e 's/-/./') 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 mv subsurface_$VERSION subsurface_$VERSION.bak fi mkdir subsurface_$VERSION +# +# +echo "copying sources" +# (cd subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - ) 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.* -cp ../subsurface/packaging/ubuntu/debian/control debian/control -cp ../subsurface/packaging/ubuntu/debian/copyright debian/copyright -cp ../subsurface/packaging/ubuntu/debian/rules debian/rules -cp ../subsurface/packaging/ubuntu/debian/source.lintian-overrides debian/source.lintian-overrides +# dh_make --email dirk@hohndel.org -c gpl2 --createorig --single --yes -p subsurface_$VERSION +# rm debian/*.ex debian/*.EX debian/README.* +# +# +echo "creating source tar file" +# +tar cf - . | xz > ../subsurface_$VERSION.orig.tar.xz +# +# +echo "preparint the debian directory" +# +export DEBEMAIL=dirk@hohndel.org +mkdir -p debian +cp -a packaging/ubuntu/debian . +cp ../debian.changelog debian/changelog # do something clever with changelog -mv debian/changelog debian/autocl -head -1 debian/autocl | sed -e 's/)/~trusty)/' -e 's/unstable/trusty/' > debian/changelog -cat ../subsurface/packaging/ubuntu/debian/changelog >> debian/changelog -tail -1 debian/autocl >> debian/changelog -rm -f debian/autocl +#mv debian/changelog debian/autocl +#head -1 debian/autocl | sed -e 's/)/~trusty)/' -e 's/unstable/trusty/' > debian/changelog +#cat ../subsurface/packaging/ubuntu/debian/changelog >> debian/changelog +#tail -1 debian/autocl >> debian/changelog +#rm -f debian/autocl + +dch -v $VERSION-1~trusty -D trusty -M +mv ~/src/debian.changelog ~/src/debian.changelog.previous +cp debian/changelog ~/src/debian.changelog debuild -S |