diff options
| -rw-r--r-- | packaging/ubuntu/control | 4 | ||||
| -rw-r--r-- | packaging/ubuntu/make-package.sh | 27 |
2 files changed, 11 insertions, 20 deletions
diff --git a/packaging/ubuntu/control b/packaging/ubuntu/control index 0a953e5d9..98c362eba 100644 --- a/packaging/ubuntu/control +++ b/packaging/ubuntu/control @@ -1,4 +1,4 @@ -Source: subsurface-4.2.90 +Source: subsurface Section: utils Priority: optional Maintainer: Dirk Hohndel <dirk@hohndel.org> @@ -31,7 +31,7 @@ Homepage: http://subsurface-divelog.hohndel.org #Vcs-Git: git://git.debian.org/collab-maint/subsurface-4.2.90.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/subsurface-4.2.90.git;a=summary -Package: subsurface-4.2.90 +Package: subsurface Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Dive log program diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 994b00b4b..df150998e 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -1,16 +1,16 @@ #!/bin/bash # start from the directory above the combined subsurface & subsurface/libdivecomputer directory -VERSION=$(cd subsurface ; git describe | sed -e 's/-g.*$// ; s/^v//') +VERSION=$(cd subsurface ; git describe | sed -e 's/-g.*$// ; s/^v// ; s/-/./') echo "building Subsurface" $VERSION -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 +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 -(cd subsurface ; tar cf - . .git ) | (cd subsurface-$VERSION ; tar xf - ) -cd subsurface-$VERSION -dh_make --email dirk@hohndel.org -c gpl2 --createorig --single --yes +mkdir subsurface_$VERSION +(cd subsurface ; tar cf - . .git ) | (cd subsurface_$VERSION ; tar xf - ) +cd subsurface_$VERSION +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/control debian/control cp ../subsurface/packaging/ubuntu/copyright debian/copyright @@ -25,12 +25,3 @@ rm -f debian/autocl debuild -S - - - -exit -cd subsurface-$VERSION/libdivecomputer -autoreconf --install -./configure -make - |