Skip to content

Commit 74baa73

Browse files
author
jef
committed
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk@9131 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3f5e5c2 commit 74baa73

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
qgis (1.0preview3) experimental; urgency=low
2+
3+
* build in pedantic mode
4+
* add interpolation plugin
5+
6+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 23 Aug 2008 15:19:32 +0200
7+
18
qgis (1.0preview2) experimental; urgency=low
29

310
* added dxf2shp plugin

debian/qgis.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ usr/lib/qgis/libwfsprovider.so
3131
usr/lib/qgis/libwmsprovider.so
3232
usr/lib/qgis/libmemoryprovider.so
3333
usr/lib/qgis/libdxf2shpconverterplugin.so
34+
usr/lib/qgis/libinterpolationplugin.so

debian/rules

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ include /usr/share/dpatch/dpatch.make
1313
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
1414
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
1515

16-
17-
CFLAGS = -Wall -g
16+
CMAKE_OPTS = -Wno-dev -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_SKIP_RPATH=TRUE -D BINDINGS_GLOBAL_INSTALL=TRUE -D PEDANTIC=TRUE
1817

1918
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
2019
CFLAGS += -O0
@@ -25,18 +24,17 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
2524
INSTALL_PROGRAM += -s
2625
endif
2726

27+
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
28+
CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTS=TRUE
29+
endif
30+
2831
debian/build/CMakeCache.txt: CMakeLists.txt
2932
dh_testdir
3033
# Add here commands to configure the package.
3134
uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
3235
[ -d debian/build ] || mkdir debian/build
3336
[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
34-
cd debian/build; cmake \
35-
-Wno-dev \
36-
-D CMAKE_INSTALL_PREFIX=/usr \
37-
-D CMAKE_SKIP_RPATH=TRUE \
38-
-D BINDINGS_GLOBAL_INSTALL=TRUE \
39-
../..
37+
cd debian/build; cmake $(CMAKE_OPTS) ../..
4038

4139
build: patch build-stamp
4240

0 commit comments

Comments
 (0)