Skip to content
Permalink
Browse files

debian packaging update

  • Loading branch information
jef-n committed Aug 24, 2015
1 parent d909597 commit 3efa50c9c212c5e8c6b055fff9dc516dc00abac5
Showing with 18 additions and 7 deletions.
  1. +2 −1 debian/changelog
  2. +4 −4 debian/control.in
  3. +12 −2 debian/rules
@@ -2,8 +2,9 @@ qgis (2.11.0) UNRELEASED; urgency=medium

* New development version 2.11 after branch of 2.10
* moved grass default.qgc from config to modules
* include grass7 plugin

-- Jürgen E. Fischer <jef@norbit.de> Fri, 24 Jul 2015 08:37:55 +0200
-- Jürgen E. Fischer <jef@norbit.de> Tue, 25 Aug 2015 00:14:25 +0200

qgis (2.10.0) unstable; urgency=medium

@@ -9,7 +9,7 @@ Build-Depends:
#sid stretch jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
#precise# debhelper (>= 7),
flex,
grass-dev (<< 7),
grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
@@ -23,8 +23,8 @@ Build-Depends:
libqt4-dev (>= 4.7.0),
libqt4-opengl-dev,
libqtwebkit-dev,
#sid stretch jessie wheezy sid-oracle# libqwt-dev,
#precise saucy trusty utopic vivid# libqwt5-qt4-dev,
#stretch jessie wheezy sid-oracle# libqwt-dev,
#precise saucy trusty utopic vivid sid# libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
@@ -273,7 +273,7 @@ Depends:
qgis-plugin-grass-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
#!precise# grass-core (<< 7)
#!precise# grass-core
#precise# grass (<< 7)
Description: GRASS plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -47,13 +47,11 @@ CMAKE_OPTS := \
-DBUILDNAME=$(DEB_BUILD_NAME) \
-DCMAKE_VERBOSE_MAKEFILE=1 \
-DCMAKE_INSTALL_PREFIX=/usr \
-DGRASS_PREFIX=/usr/lib/$(GRASS) \
-DBINDINGS_GLOBAL_INSTALL=TRUE \
-DPEDANTIC=TRUE \
-DWITH_QSPATIALITE=TRUE \
-DWITH_SERVER=TRUE \
-DWITH_SERVER_PLUGINS=TRUE \
-DWITH_GRASS7=FALSE \
-DSERVER_SKIP_ECW=TRUE \
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-DWITH_APIDOC=TRUE \
@@ -107,6 +105,18 @@ else
CMAKE_OPTS += -DENABLE_TESTS=TRUE
endif

ifeq ($(GRASSVER),7)
CMAKE_OPTS += \
-DWITH_GRASS=FALSE \
-DWITH_GRASS7=TRUE \
-DGRASS_PREFIX7=/usr/lib/$(GRASS)
else
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=FALSE \
-DGRASS_PREFIX=/usr/lib/$(GRASS)
endif

ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie stretch trusty sid sid-oracle"))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)

0 comments on commit 3efa50c

Please sign in to comment.
You can’t perform that action at this time.