[mapserver] 02/07: Use dh commands instead of CMake directly.
Bas Couwenberg
sebastic at xs4all.nl
Fri Feb 28 11:31:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository mapserver.
commit 0fa5da99dd9cd99c602c67f4cebce64d2c54f4cc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Feb 22 16:51:47 2014 +0100
Use dh commands instead of CMake directly.
---
debian/changelog | 1 +
debian/rules | 25 ++++++++++++-------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59a5c01..98e2a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mapserver (6.4.1-2) UNRELEASED; urgency=low
* Add gpb.conf to use pristine-tar by default.
+ * Use dh commands instead of CMake directly.
-- Bas Couwenberg <sebastic at xs4all.nl> Sat, 22 Feb 2014 16:26:42 +0100
diff --git a/debian/rules b/debian/rules
index 72bf43a..bf9ac8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,12 @@ MANPAGES:=$(wildcard debian/man/*.*.xml)
MS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-MAKE_VERBOSE=1
-
-COMMON_CONFIG= -DCMAKE_INSTALL_PREFIX=/usr \
+CMAKE_OPTS:= \
+ -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+ -DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS)" \
+ -DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_VERBOSE_MAKEFILE=1 \
-DWITH_PROJ=1 \
-DWITH_KML=1 \
-DWITH_SOS=1 \
@@ -67,22 +70,18 @@ COMMON_CONFIG= -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_EXEMPI=0 \
-DWITH_XMLMAPFILE=0
-HARDENING_CONFIG= \
- -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
- -DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS)" \
- -DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)"
-
%:
- dh $@ --with python2,pkgkde_symbolshelper
+ dh $@ --with python2,pkgkde_symbolshelper \
+ --buildsystem cmake
override_dh_auto_clean:
dh_clean
-$(RM) -f $(CURDIR)/debian/man/*.1
- -$(RM) -rf build/
+ -$(RM) -rf obj-*/
override_dh_auto_configure:
- mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release $(HARDENING_CONFIG) $(COMMON_CONFIG)
+ dh_auto_configure -- $(CMAKE_OPTS)
override_dh_auto_build:
# Create man pages from DocBook XML
@@ -91,13 +90,13 @@ override_dh_auto_build:
mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
done
- $(MAKE) -C build VERBOSE=$(MAKE_VERBOSE)
+ dh_auto_build
override_dh_auto_test:
# msautotest submodule is not used
override_dh_auto_install:
- $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE)
+ dh_auto_install
-mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-mv -v $(CURDIR)/debian/tmp/usr/lib/libmapserver*.so* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git
More information about the Pkg-grass-devel
mailing list