[SCM] mapcache branch, master, updated. upstream/1.0.0-67-g63042ca

Bas Couwenberg sebastic at xs4all.nl
Thu Sep 12 22:06:41 UTC 2013 

The following commit has been merged in the master branch:
commit 20646dcb202fc75f0e9dc6acbca6b5edc7cdf40e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 11 20:08:23 2013 +0200

    Build system changed from autotools to cmake.

diff --git a/debian/changelog b/debian/changelog
index b484c6b..b5a1ce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
+
+  * New upstream development snapshot 1.1dev+ee206af.
+  * Build system changed from autotools to cmake.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
+
 mapcache (1.0.0-3) UNRELEASED; urgency=low
 
   * Upload for Debian closes: #712377
diff --git a/debian/control b/debian/control
index 61477ab..02a2f5c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>, Bas Couwenberg <sebastic at xs4all.nl>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1),
  libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (>= 1.1.4),
  libgd-dev (>= 2.1.0~rc1-2), libfreetype6-dev (>= 2.0.9),
  libgdal1-dev (>=1.9.0), libproj-dev, libgeos-dev (>= 3.3.1-1~),
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
  libpcre3-dev, libpixman-1-dev,
  libsqlite3-dev, libtiff4-dev,
  libmapserver-6.2.1, libmapserver-6.2.1-dev,
- autoconf, dh-autoreconf, chrpath,
+ chrpath, cmake (>= 2.8.0), pkg-config,
  docbook2x, docbook-xsl, docbook-xml, xsltproc
 Standards-Version: 3.9.4
 Homepage: http://www.mapserver.org/en/mapcache/
diff --git a/debian/libapache2-mod-mapcache.apache2 b/debian/libapache2-mod-mapcache.apache2
index f9a1d2f..5b6ee43 100644
--- a/debian/libapache2-mod-mapcache.apache2
+++ b/debian/libapache2-mod-mapcache.apache2
@@ -1,2 +1,2 @@
-mod apache/.libs/mod_mapcache.so
+mod build/apache/mod_mapcache.so
 mod debian/mapcache.load
diff --git a/debian/rules b/debian/rules
index 5b2fad3..fb2e3ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ export DH_OPTIONS
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
@@ -26,38 +28,68 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS+=$(CPPFLAGS)
 CFLAGS+=$(LDFLAGS)
 
+MAPCACHE_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/^\(.*\)~.*/\1/' | sed -e 's/dev.*/.0/')
+
+COMMON_CONFIG = -DCMAKE_INSTALL_PREFIX=/usr \
+		-DWITH_PIXMAN=1 \
+		-DWITH_SQLITE=1 \
+		-DWITH_BERKELEY_DB=0 \
+		-DWITH_MEMCACHE=0 \
+		-DWITH_TIFF=1 \
+		-DWITH_TIFF_WRITE_SUPPORT=0 \
+		-DWITH_GEOTIFF=0 \
+		-DWITH_PCRE=1 \
+		-DWITH_APACHE=1 \
+		-DWITH_VERSION_STRING=1 \
+		-DWITH_CGI=1 \
+		-DWITH_FCGI=1 \
+		-DWITH_GEOS=1 \
+		-DWITH_OGR=1
+
 %:
-	dh $@ --with autoreconf,apache2
+	dh $@ --with apache2
 
 override_dh_clean:
 	dh_clean
-	-$(RM) config.log config.status libtool nginx/config
-	-$(RM) Makefile.inc apache/Makefile cgi/Makefile lib/Makefile util/Makefile
+
+	# Listing files after dh_clean
+	find $(CURDIR) -type f | sort
+
+	-$(RM) -rf build/
+	-$(RM) nginx/config
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-mapserver=/usr/bin --with-fastcgi CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"
+	mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release $(COMMON_CONFIG)
+
+	# Listing files after dh_auto_configure
+	find $(CURDIR) -type f | sort
 
 override_dh_auto_build:
 	# Create man page from DocBook XML
 	-docbook2x-man $(CURDIR)/debian/mapcache_seed.1.xml
 	-mv mapcache_seed.1 $(CURDIR)/debian/
 
-	dh_auto_build
+	cd build && $(MAKE)
 
-	# Make apache module
-	$(MAKE) libdir=$(CURDIR)/lib module
+	# Listing files after dh_auto_build
+	find $(CURDIR) -type f | sort
 
 override_dh_auto_install:
-	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr exec_prefix=$(CURDIR)/debian/tmp/usr install-lib install-util install-cgi
+	cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+	# Listing files after dh_auto_install
+	find $(CURDIR) -type f | sort
+
+	-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)/
 
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/cgi-bin/
-	mv $(CURDIR)/debian/tmp/usr/bin/mapcache $(CURDIR)/debian/tmp/usr/lib/cgi-bin/
+	mv $(CURDIR)/debian/tmp/usr/bin/mapcache.fcgi $(CURDIR)/debian/tmp/usr/lib/cgi-bin/mapcache
 
 	# Strip RPATH
-	-chrpath --delete apache/.libs/mod_mapcache.so $(CURDIR)/debian/tmp/usr/lib/cgi-bin/mapcache
-
-	# empty dependency_libs in la file
-	sed -i "/dependency_libs/ s/'.*'/''/" $(CURDIR)/debian/tmp/usr/lib/*/libmapcache.la
+	-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 {} \;
 
 	# libmapcache-dev headers
 	-mkdir -p $(CURDIR)/debian/tmp/usr/include/mapcache/
@@ -65,9 +97,11 @@ override_dh_auto_install:
 
 	# Install apache module
 	install -d $(CURDIR)/debian/tmp/etc/apache2/mods-available
-	install -m 644 debian/mapcache.load $(CURDIR)/debian/tmp/etc/apache2/mods-available
-	install -d $(CURDIR)/debian/tmp/usr/lib/apache2/modules
-	install -m 644 apache/.libs/mod_mapcache.so $(CURDIR)/debian/tmp/usr/lib/apache2/modules
-	dh_install --sourcedir debian/tmp
-	dh_makeshlibs -- -c0
+	install -m 644 $(CURDIR)/debian/mapcache.load $(CURDIR)/debian/tmp/etc/apache2/mods-available
+
+override_dh_install:
+	dh_install --autodest --list-missing
+
+override_dh_makeshlibs:
+	dh_makeshlibs -- -c0 -v$(MAPCACHE_VERSION)
 

-- 
Packaging for MapCache

More information about the Pkg-grass-devel mailing list