From 8f224c17373c8714ffeb13127a4e266a47990a16 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 3 Dec 2014 09:38:52 -0800 Subject: Ubuntu packaging: move support files into debian directory Signed-off-by: Dirk Hohndel --- packaging/ubuntu/changelog.txt | 3 -- packaging/ubuntu/control | 44 ------------------------ packaging/ubuntu/copyright | 32 ----------------- packaging/ubuntu/debian/changelog | 3 ++ packaging/ubuntu/debian/control | 44 ++++++++++++++++++++++++ packaging/ubuntu/debian/copyright | 32 +++++++++++++++++ packaging/ubuntu/debian/rules | 37 ++++++++++++++++++++ packaging/ubuntu/debian/source.lintian-overrides | 8 +++++ packaging/ubuntu/make-package.sh | 10 +++--- packaging/ubuntu/rules | 37 -------------------- packaging/ubuntu/source.lintian-overrides | 8 ----- 11 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 packaging/ubuntu/changelog.txt delete mode 100644 packaging/ubuntu/control delete mode 100644 packaging/ubuntu/copyright create mode 100644 packaging/ubuntu/debian/changelog create mode 100644 packaging/ubuntu/debian/control create mode 100644 packaging/ubuntu/debian/copyright create mode 100755 packaging/ubuntu/debian/rules create mode 100644 packaging/ubuntu/debian/source.lintian-overrides delete mode 100755 packaging/ubuntu/rules delete mode 100644 packaging/ubuntu/source.lintian-overrides diff --git a/packaging/ubuntu/changelog.txt b/packaging/ubuntu/changelog.txt deleted file mode 100644 index e1fb94cb0..000000000 --- a/packaging/ubuntu/changelog.txt +++ /dev/null @@ -1,3 +0,0 @@ - - * Daily build - check git revision for full changelog - diff --git a/packaging/ubuntu/control b/packaging/ubuntu/control deleted file mode 100644 index 874f25c2d..000000000 --- a/packaging/ubuntu/control +++ /dev/null @@ -1,44 +0,0 @@ -Source: subsurface -Section: utils -Priority: optional -Maintainer: Dirk Hohndel -Build-Depends: asciidoc, - debhelper (>= 9), - libgconf2-dev, - libtool, - libxml2-dev, - libxslt-dev, - libsoup2.4-dev, - pkg-config, - txt2html, - libzip-dev, - libsqlite3-dev, - autoconf, - automake, - cmake, - dpkg-dev (>= 1.16.1.1), - libusb-dev, - dh-autoreconf, - libz-dev, - libssl-dev, - git, - qttools5-dev-tools, - qt5-qmake, - libqt5svg5-dev, - libqt5webkit5-dev, - qtscript5-dev, - qt5-default -Standards-Version: 3.9.5 -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 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Dive log program - Subsurface is an open source divelog program that runs on Windows, Mac and Linux. - Subsurface is able to track single- and multi-tank dives using air, Nitrox or - TriMix. It also allows logging of weights and exposure protection used, dive - masters and dive buddies and enables the user to rate dives and provide - additional dive notes. diff --git a/packaging/ubuntu/copyright b/packaging/ubuntu/copyright deleted file mode 100644 index 75e69b368..000000000 --- a/packaging/ubuntu/copyright +++ /dev/null @@ -1,32 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: subsurface-4.2.90 -Source: - -Files: * -Copyright: 2011-2014 Dirk Hohndel, Linus Torvalds, Tomaz Canabrava and others -License: GPL-2.0 - -Files: debian/* -Copyright: 2014 Dirk Hohndel -License: GPL-2.0 - -License: GPL-2.0 - This package is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License as published - by the Free Software Foundation - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/packaging/ubuntu/debian/changelog b/packaging/ubuntu/debian/changelog new file mode 100644 index 000000000..e1fb94cb0 --- /dev/null +++ b/packaging/ubuntu/debian/changelog @@ -0,0 +1,3 @@ + + * Daily build - check git revision for full changelog + diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control new file mode 100644 index 000000000..874f25c2d --- /dev/null +++ b/packaging/ubuntu/debian/control @@ -0,0 +1,44 @@ +Source: subsurface +Section: utils +Priority: optional +Maintainer: Dirk Hohndel +Build-Depends: asciidoc, + debhelper (>= 9), + libgconf2-dev, + libtool, + libxml2-dev, + libxslt-dev, + libsoup2.4-dev, + pkg-config, + txt2html, + libzip-dev, + libsqlite3-dev, + autoconf, + automake, + cmake, + dpkg-dev (>= 1.16.1.1), + libusb-dev, + dh-autoreconf, + libz-dev, + libssl-dev, + git, + qttools5-dev-tools, + qt5-qmake, + libqt5svg5-dev, + libqt5webkit5-dev, + qtscript5-dev, + qt5-default +Standards-Version: 3.9.5 +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 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Dive log program + Subsurface is an open source divelog program that runs on Windows, Mac and Linux. + Subsurface is able to track single- and multi-tank dives using air, Nitrox or + TriMix. It also allows logging of weights and exposure protection used, dive + masters and dive buddies and enables the user to rate dives and provide + additional dive notes. diff --git a/packaging/ubuntu/debian/copyright b/packaging/ubuntu/debian/copyright new file mode 100644 index 000000000..75e69b368 --- /dev/null +++ b/packaging/ubuntu/debian/copyright @@ -0,0 +1,32 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: subsurface-4.2.90 +Source: + +Files: * +Copyright: 2011-2014 Dirk Hohndel, Linus Torvalds, Tomaz Canabrava and others +License: GPL-2.0 + +Files: debian/* +Copyright: 2014 Dirk Hohndel +License: GPL-2.0 + +License: GPL-2.0 + This package is free software; you can redistribute it and/or modify + it under the terms of version 2 of the GNU General Public License as published + by the Free Software Foundation + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid to pick license terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules new file mode 100755 index 000000000..76ac5b98a --- /dev/null +++ b/packaging/ubuntu/debian/rules @@ -0,0 +1,37 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + + +%: + dh $@ + +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 + +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 ) + (mkdir marble-build ; cd marble-build ; \ + cmake -DQTONLY=ON -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -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 ; \ + ln -s . marble ) + qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build LIBMARBLESTATIC=1 subsurface.pro + +override_dh_installchangelogs: + dh_installchangelogs + dh_installchangelogs ReleaseNotes.txt + txt2html Documentation/user-manual.txt > Documentation/user-manual.html + mkdir -p debian/subsurface/usr/share/doc/subsurface + cp Documentation/user-manual.txt debian/subsurface/usr/share/doc/subsurface/ + cp Documentation/user-manual.html debian/subsurface/usr/share/doc/subsurface/html + diff --git a/packaging/ubuntu/debian/source.lintian-overrides b/packaging/ubuntu/debian/source.lintian-overrides new file mode 100644 index 000000000..a2065afeb --- /dev/null +++ b/packaging/ubuntu/debian/source.lintian-overrides @@ -0,0 +1,8 @@ +# We use the package +subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.min.js +subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.min.js +subsurface source: source-is-missing theme/jqplot.highlighter.min.js +subsurface source: source-is-missing theme/jquery.jqplot.min.js +subsurface source: source-is-missing theme/jquery.min.js + + diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 71daff1ae..02a7bf02c 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -22,14 +22,14 @@ echo $GITVERSION > .gitversion 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 -cp ../subsurface/packaging/ubuntu/rules debian/rules -cp ../subsurface/packaging/ubuntu/source.lintian-overrides debian/source.lintian-overrides +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 # do something clever with changelog mv debian/changelog debian/autocl head -1 debian/autocl | sed -e 's/unstable/trusty/' > debian/changelog -cat ../subsurface/packaging/ubuntu/changelog.txt >> debian/changelog +cat ../subsurface/packaging/ubuntu/debian/changelog >> debian/changelog tail -1 debian/autocl >> debian/changelog rm -f debian/autocl diff --git a/packaging/ubuntu/rules b/packaging/ubuntu/rules deleted file mode 100755 index 76ac5b98a..000000000 --- a/packaging/ubuntu/rules +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - - -%: - dh $@ - -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 - -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 ) - (mkdir marble-build ; cd marble-build ; \ - cmake -DQTONLY=ON -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -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 ; \ - ln -s . marble ) - qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build LIBMARBLESTATIC=1 subsurface.pro - -override_dh_installchangelogs: - dh_installchangelogs - dh_installchangelogs ReleaseNotes.txt - txt2html Documentation/user-manual.txt > Documentation/user-manual.html - mkdir -p debian/subsurface/usr/share/doc/subsurface - cp Documentation/user-manual.txt debian/subsurface/usr/share/doc/subsurface/ - cp Documentation/user-manual.html debian/subsurface/usr/share/doc/subsurface/html - diff --git a/packaging/ubuntu/source.lintian-overrides b/packaging/ubuntu/source.lintian-overrides deleted file mode 100644 index a2065afeb..000000000 --- a/packaging/ubuntu/source.lintian-overrides +++ /dev/null @@ -1,8 +0,0 @@ -# We use the package -subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.min.js -subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.min.js -subsurface source: source-is-missing theme/jqplot.highlighter.min.js -subsurface source: source-is-missing theme/jquery.jqplot.min.js -subsurface source: source-is-missing theme/jquery.min.js - - -- cgit v1.2.3-70-g09d2