The following commit has been merged in the master branch: commit e0d99458e70745516dc79497e66c4ebfc9c41355 Author: Antonio Valentino <antonio.valent...@tiscali.it> Date: Tue Aug 13 16:49:56 2013 +0000
Switch from cdbs to dh (debhelper command sequencer) diff --git a/debian/changelog b/debian/changelog index 0503fdb..1398b72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low - the -dev package now Depends from libepr-api2 (= ${binary:Version}) - fixed formatting of the package descripton - use canonical URL for VCS fields + - added build dependency from cmake + - dropped build dependency from cdbs + * debian/rules + - switch from cdbs to dh (debhelper command sequencer) * debian/copyright - use versioned copyright format uri - updated dates in copyright statements diff --git a/debian/control b/debian/control index ded3f2f..7f363e5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Antonio Valentino <antonio.valent...@tiscali.it> -Build-Depends: cdbs, debhelper (>= 9), doxygen +Build-Depends: debhelper (>= 9), cmake, doxygen Standards-Version: 3.9.4 Homepage: http://github.com/bcdev/epr-api Vcs-Git: git://anonscm.debian.org/pkg-grass/epr-api.git diff --git a/debian/libepr-api-dev.doc-base b/debian/libepr-api-dev.doc-base index 2fab604..9cc8d26 100644 --- a/debian/libepr-api-dev.doc-base +++ b/debian/libepr-api-dev.doc-base @@ -6,5 +6,5 @@ Abstract: This document describes the libepr-api Section: Programming Format: HTML -Index: /usr/share/doc/libepr-api-dev/epr_c_api/index.html -Files: /usr/share/doc/libepr-api-dev/epr_c_api/*.html +Index: /usr/share/doc/libepr-api-dev/html/index.html +Files: /usr/share/doc/libepr-api-dev/html/*.html diff --git a/debian/libepr-api-dev.docs b/debian/libepr-api-dev.docs deleted file mode 100644 index 78c75b6..0000000 --- a/debian/libepr-api-dev.docs +++ /dev/null @@ -1,2 +0,0 @@ -build/epr_c_api -docs/images diff --git a/debian/libepr-api-dev.install b/debian/libepr-api-dev.install index 495aeee..bd40497 100644 --- a/debian/libepr-api-dev.install +++ b/debian/libepr-api-dev.install @@ -1,2 +1,4 @@ usr/include/* usr/lib/libepr_api.a +usr/share/doc/epr-api/html usr/share/doc/libepr-api-dev +usr/share/doc/epr-api/images usr/share/doc/libepr-api-dev diff --git a/debian/libepr-api2.docs b/debian/libepr-api2.docs index f0014df..06c9553 100644 --- a/debian/libepr-api2.docs +++ b/debian/libepr-api2.docs @@ -1,3 +1,2 @@ -CHANGELOG.txt README.txt VERSION.txt diff --git a/debian/rules b/debian/rules index 64e4148..785b4c1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,45 +1,28 @@ #!/usr/bin/make -f +# -*- makefile -*- -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +CMAKE_EXTRA_FLAGS += -DBUILD_DOCS:BOOL=ON -DBUILD_TESTS:BOOL=ON -DEB_MAKE_BUILD_TARGET = all_rel -DEB_MAKE_CLEAN_TARGET = CONFIG=release clean -DEB_MAKE_EXTRA_ARGS = LDFLAGS="-soname=libepr_api.so.2" +%: + dh $@ --buildsystem=cmake --builddirectory=build -makebuilddir/libepr-api2:: - mkdir -p $(DEB_BUILDDIR)/build/release +override_dh_auto_configure: + mkdir -p build + dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) -build/libepr-api2:: - strip --strip-unneeded $(DEB_BUILDDIR)/build/release/libepr_api.so -build/libepr-api-dev:: - cd $(DEB_BUILDDIR)/build && ln -sf ../docs/*.html ../docs/*.txt . - cd $(DEB_BUILDDIR)/build && ln -sf ../docs/images - mkdir -p $(DEB_BUILDDIR)/build/epr_c_api - cd $(DEB_BUILDDIR)/build && doxygen Doxyfile.txt - $(MAKE) -C $(DEB_BUILDDIR) CONFIG=release $(DEB_BUILDDIR)/build/release/libepr_api.a +override_dh_installchangelogs: + dh_installchangelogs -k CHANGELOG.txt -install/libepr-api2:: - install -D --mode=0644 $(DEB_BUILDDIR)/build/release/libepr_api.so $(DEB_DESTDIR)/usr/lib/libepr_api.so.2 - - -install/libepr-api-dev:: - install -D --mode=0644 $(DEB_SRCDIR)/src/epr_api.h $(DEB_DESTDIR)/usr/include/epr_api.h - install -D --mode=0644 $(DEB_SRCDIR)/src/epr_ptrarray.h $(DEB_DESTDIR)/usr/include/epr_ptrarray.h - install -D --mode=0644 $(DEB_BUILDDIR)/build/release/libepr_api.a $(DEB_DESTDIR)/usr/lib/libepr_api.a - - -clean:: - rm -rf $(DEB_BUILDDIR)/build - - -.PHONY: get-orig-source - get-orig-source: uscan --force-download --destdir=debian mv debian/?.?.tar.gz ../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz + + +.PHONY: get-orig-source override_dh_auto_configure override_dh_installchangelogs -- ENVISAT Product Reader API for C _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel