This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository mapcache.
commit 40aa0d585f428732e678b01b8fe706e79cf98726 Author: Bas Couwenberg <[email protected]> Date: Fri Feb 28 17:46:16 2014 +0100 Use dh commands instead of CMake directly. --- debian/changelog | 1 + debian/libapache2-mod-mapcache.apache2 | 2 +- debian/rules | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3249716..362efc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mapcache (1.2.1-2) UNRELEASED; urgency=low * Add gpb.conf to use pristine-tar by default. + * Use dh commands instead of CMake directly. -- Bas Couwenberg <[email protected]> Fri, 28 Feb 2014 13:13:02 +0100 diff --git a/debian/libapache2-mod-mapcache.apache2 b/debian/libapache2-mod-mapcache.apache2 index 5b6ee43..393499c 100644 --- a/debian/libapache2-mod-mapcache.apache2 +++ b/debian/libapache2-mod-mapcache.apache2 @@ -1,2 +1,2 @@ -mod build/apache/mod_mapcache.so +mod obj-*/apache/mod_mapcache.so mod debian/mapcache.load diff --git a/debian/rules b/debian/rules index 7a57115..7667ee0 100755 --- a/debian/rules +++ b/debian/rules @@ -21,9 +21,9 @@ CFLAGS+=$(LDFLAGS) MAPCACHE_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/^\(.*\)~.*/\1/' | sed -e 's/dev.*/.0/') -MAKE_VERBOSE=1 - -COMMON_CONFIG = -DCMAKE_INSTALL_PREFIX=/usr \ +CMAKE_OPTS:= \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_VERBOSE_MAKEFILE=1 \ -DWITH_PIXMAN=1 \ -DWITH_SQLITE=1 \ -DWITH_BERKELEY_DB=0 \ @@ -41,26 +41,27 @@ COMMON_CONFIG = -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_OGR=1 %: - dh $@ --with apache2,pkgkde_symbolshelper + dh $@ --with apache2,pkgkde_symbolshelper \ + --buildsystem cmake override_dh_clean: dh_clean - -$(RM) -rf build/ + -$(RM) -rf obj-*/ -$(RM) nginx/config override_dh_auto_configure: - mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release $(COMMON_CONFIG) + dh_auto_configure -- $(CMAKE_OPTS) override_dh_auto_build: # Create man page from DocBook XML -docbook2x-man $(CURDIR)/debian/mapcache_seed.1.xml -mv mapcache_seed.1 $(CURDIR)/debian/ - $(MAKE) -C build VERBOSE=$(MAKE_VERBOSE) + dh_auto_build 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/libmapcache*.so* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ @@ -71,12 +72,12 @@ override_dh_auto_install: # Strip RPATH -find $(CURDIR)/debian/tmp/usr/bin -type f -exec chrpath --delete {} \; -find $(CURDIR)/debian/tmp/usr/lib -name "*.so*" -type f -exec chrpath --delete {} \; - -find $(CURDIR)/build/apache -name "*.so*" -type f -exec chrpath --delete {} \; + -find $(CURDIR)/obj-*/apache -name "*.so*" -type f -exec chrpath --delete {} \; # libmapcache-dev headers -mkdir -p $(CURDIR)/debian/tmp/usr/include/mapcache/ install -m 644 $(CURDIR)/include/*.h $(CURDIR)/debian/tmp/usr/include/mapcache/ - install -m 644 $(CURDIR)/build/*/*.h $(CURDIR)/debian/tmp/usr/include/mapcache/ + install -m 644 $(CURDIR)/obj-*/*/*.h $(CURDIR)/debian/tmp/usr/include/mapcache/ # Install apache module install -d $(CURDIR)/debian/tmp/etc/apache2/mods-available -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
