debian packaging update

git-svn-id: http://svn.osgeo.org/qgis/trunk@9131 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 23, 2008 · 74baa73 · 74baa73
1 parent 3f5e5c2
commit 74baa73
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (1.0preview3) experimental; urgency=low
+
+  * build in pedantic mode
+  * add interpolation plugin
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 23 Aug 2008 15:19:32 +0200
+
 qgis (1.0preview2) experimental; urgency=low
 
   * added dxf2shp plugin

diff --git a/debian/qgis.install b/debian/qgis.install
@@ -31,3 +31,4 @@ usr/lib/qgis/libwfsprovider.so
 usr/lib/qgis/libwmsprovider.so
 usr/lib/qgis/libmemoryprovider.so
 usr/lib/qgis/libdxf2shpconverterplugin.so
+usr/lib/qgis/libinterpolationplugin.so 
diff --git a/debian/rules b/debian/rules
@@ -13,8 +13,7 @@ include /usr/share/dpatch/dpatch.make
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
-CFLAGS = -Wall -g
+CMAKE_OPTS = -Wno-dev -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_SKIP_RPATH=TRUE -D BINDINGS_GLOBAL_INSTALL=TRUE -D PEDANTIC=TRUE
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -25,18 +24,17 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	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