[QGIS Commit] r9131 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-08-23 09:22:02 -0400 (Sat, 23 Aug 2008)
New Revision: 9131

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/qgis.install
   trunk/qgis/debian/rules
Log:
debian packaging update

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2008-08-23 13:21:39 UTC (rev 9130)
+++ trunk/qgis/debian/changelog	2008-08-23 13:22:02 UTC (rev 9131)
@@ -1,3 +1,10 @@
+qgis (1.0preview3) experimental; urgency=low
+
+  * build in pedantic mode
+  * add interpolation plugin
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Sat, 23 Aug 2008 15:19:32 +0200
+
 qgis (1.0preview2) experimental; urgency=low
 
   * added dxf2shp plugin

Modified: trunk/qgis/debian/qgis.install
===================================================================
--- trunk/qgis/debian/qgis.install	2008-08-23 13:21:39 UTC (rev 9130)
+++ trunk/qgis/debian/qgis.install	2008-08-23 13:22:02 UTC (rev 9131)
@@ -31,3 +31,4 @@
 usr/lib/qgis/libwmsprovider.so
 usr/lib/qgis/libmemoryprovider.so
 usr/lib/qgis/libdxf2shpconverterplugin.so
+usr/lib/qgis/libinterpolationplugin.so 

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2008-08-23 13:21:39 UTC (rev 9130)
+++ trunk/qgis/debian/rules	2008-08-23 13:22:02 UTC (rev 9131)
@@ -13,9 +13,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CMAKE_OPTS = -Wno-dev -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_SKIP_RPATH=TRUE -D BINDINGS_GLOBAL_INSTALL=TRUE -D PEDANTIC=TRUE
 
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -25,18 +24,17 @@
 	INSTALL_PROGRAM += -s
 endif
 
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTS=TRUE
+endif
+
 debian/build/CMakeCache.txt: CMakeLists.txt
 	dh_testdir
 	# Add here commands to configure the package.
 	uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
 	[ -d debian/build ] || mkdir debian/build
 	[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
-	cd debian/build; cmake \
-	  -Wno-dev \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D CMAKE_SKIP_RPATH=TRUE \
-		-D BINDINGS_GLOBAL_INSTALL=TRUE \
-	        ../..
+	cd debian/build; cmake $(CMAKE_OPTS) ../..
 
 build: patch build-stamp