The following commit has been merged in the master branch: commit a6a303c9103ba7ae15f1335c8f2de71ddd4288db Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Sep 13 17:02:22 2013 +0200
Use minimal dh rules with debhelper 9. diff --git a/debian/changelog b/debian/changelog index ce97169..b6d076a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ osgearth (2.4.0+dfsg-4) UNRELEASED; urgency=low * Use canonical URLs for Vcs-* fields. * Add DEP3 headers to soversion.patch. * Add patch to fix 'becuase' typo. + * Use minimal dh rules with debhelper 9. -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 13 Sep 2013 15:14:27 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 593c9a9..d0befe8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Pirmin Kalberer <pi_...@sourcepole.ch>, Bas Couwenberg <sebas...@xs4all.nl> -Build-Depends: debhelper (>= 7), quilt, cmake (>= 2.6.2), +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), cmake (>= 2.6.2), libopenscenegraph-dev (>= 2.8.0), openscenegraph (>= 2.8.0), libgdal-dev, libgeos-dev, libexpat1-dev (>= 2.0.1), libcurl4-gnutls-dev, libzip-dev, libsqlite3-dev, diff --git a/debian/osgearth.docs b/debian/osgearth.docs new file mode 100644 index 0000000..71dfd5b --- /dev/null +++ b/debian/osgearth.docs @@ -0,0 +1 @@ +README.txt diff --git a/debian/osgearth.links b/debian/osgearth.links new file mode 100644 index 0000000..ec9c848 --- /dev/null +++ b/debian/osgearth.links @@ -0,0 +1,2 @@ +usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/osgearth/fonts/arial.ttf +usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf usr/share/osgearth/fonts/times.ttf diff --git a/debian/rules b/debian/rules index ce996ba..4a4935e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,112 +6,58 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -include /usr/share/quilt/quilt.make +# Enable hardening build flags +export DEB_BUILD_MAINT_OPTIONS=hardening=+all -PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') -VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') +CFLAGS += $(CPPFLAGS) +CXXFLAGS += $(CPPFLAGS) -LDFLAGS += -Wl,--as-needed -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') +VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//') MAKE_VERBOSE=1 +%: + dh $@ -configure: configure-stamp -configure-stamp: $(QUILT_STAMPFN) +override_dh_clean: dh_testdir - mkdir tmp - cd tmp && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DLIB_POSTFIX="" - touch configure-stamp + -$(RM) -rf build/ -#Architecture -build: build-arch build-indep + -$(RM) debian/.#* .#* -build-arch: build-arch-stamp -build-arch-stamp: configure-stamp $(QUILT_STAMPFN) - $(MAKE) -C tmp VERBOSE=$(MAKE_VERBOSE) - touch $@ + dh_prep -build-indep: build-indep-stamp -build-indep-stamp: configure-stamp $(QUILT_STAMPFN) - touch $@ + -$(RM) -rf $(CURDIR)/debian/files + -$(RM) -f $(CURDIR)/debian/*.debhelper.log -clean: unpatch - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp configure-stamp - rm -rf tmp - dh_clean +override_dh_auto_configure: + mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLIB_POSTFIX="" -install: install-indep install-arch -install-indep: +override_dh_auto_build: dh_testdir - dh_testroot - dh_prep -i - dh_installdirs -i - dh_install -i + $(MAKE) -C build VERBOSE=$(MAKE_VERBOSE) - mkdir -p debian/osgearth-data/usr/share/osgearth/maps && \ - cp tests/*.earth debian/osgearth-data/usr/share/osgearth/maps/ && \ - cp debian/*.earth debian/osgearth-data/usr/share/osgearth/maps/ && \ - sed --in-place -e 's!\\!/!g' -e 's!\.\./data!/usr/share/osgearth/data!g' debian/osgearth-data/usr/share/osgearth/maps/*.earth - mkdir -p debian/osgearth-data/usr/share/osgearth/data && \ - cp data/world.tif debian/osgearth-data/usr/share/osgearth/data/ - -install-arch: +override_dh_auto_install: dh_testdir - dh_testroot - dh_prep -s - dh_installdirs -s - $(MAKE) -C tmp install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE) - - dh_install -s + $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE) - install -D README.txt debian/osgearth/usr/share/doc/osgearth/README.txt + mkdir -p $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps && \ + cp $(CURDIR)/tests/*.earth $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps/ && \ + cp $(CURDIR)/debian/*.earth $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps/ && \ + sed --in-place -e 's!\\!/!g' -e 's!\.\./data!/usr/share/osgearth/data!g' $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps/*.earth - mkdir -p debian/osgearth/usr/share/osgearth/fonts && \ - ln -s /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/arial.ttf && \ - ln -s /usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/times.ttf + mkdir -p $(CURDIR)/debian/osgearth-data/usr/share/osgearth/data && \ + cp $(CURDIR)/data/world.tif $(CURDIR)/debian/osgearth-data/usr/share/osgearth/data/ -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman - dh_lintian - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):tmp/lib dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common - -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure get-orig-source +override_dh_install: + dh_install --autodest --list-missing +override_dh_shlibdeps: + LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):build/lib dh_shlibdeps get-orig-source: uscan --noconf --force-download --rename --download-current-version --destdir=. @@ -119,10 +65,10 @@ get-orig-source: tar -xf $(PACKAGE)_*.orig.tar.gz rm $(PACKAGE)_*.orig.tar.gz mv osgearth-osgearth* $(PACKAGE)-$(VERSION) - #Remove data files with unknown license (TODO: keep resources/) - find $(PACKAGE)-$(VERSION)/data -not -name world.tif -type f | xargs rm + #Remove data files with unknown license + find $(PACKAGE)-$(VERSION)/data -not -name world.tif -type f | grep -v "/data/resources/" | xargs rm mv $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).orig GZIP=--best tar -cz --owner root --group root --mode a+rX \ - -f $(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz \ - $(PACKAGE)-$(VERSION).orig + -f ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz \ + $(PACKAGE)-$(VERSION).orig rm -r $(PACKAGE)-$(VERSION).orig -- osgEarth terrain rendering toolkit _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel