This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis.
commit fafdd23b79d3d79941199c426171bc5cb868f4c5 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Feb 14 03:26:12 2014 +0100 Use dh commands instead of CMake directly. --- debian/changelog | 1 + debian/rules | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f97028..65c54b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low (closes: #738273) * Also build osgEarth globe plugin. * Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags. + * Use dh commands instead of CMake directly. -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/rules b/debian/rules index 2555336..1f1d031 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,6 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) CMAKE_OPTS := \ -DCMAKE_VERBOSE_MAKEFILE=1 \ -DGRASS_PREFIX=/usr/lib/grass64 \ - -DCMAKE_INSTALL_PREFIX=/usr \ -DBINDINGS_GLOBAL_INSTALL=TRUE \ -DPEDANTIC=TRUE \ -DWITH_MAPSERVER=TRUE \ @@ -89,17 +88,14 @@ override_dh_clean: -$(RM) -rf build/ override_dh_auto_configure: - mkdir -p build && cd build && cmake .. $(CMAKE_OPTS) - -override_dh_auto_build: - $(MAKE) -C build + dh_auto_configure -- $(CMAKE_OPTS) override_dh_auto_test: # Don't run tests, requires network #-LD_LIBRARY_PATH=$(PWD)/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C build $(DEB_TEST_TARGET) override_dh_auto_install: - $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp + dh_auto_install # remove unwanted files $(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel