Skip to content
Permalink
Browse files
debian packaging update
  • Loading branch information
jef-n committed May 22, 2015
1 parent 5c3a7af commit f2d4d3083b765029e981b4638bc80bf828ece6a7
Showing with 21 additions and 17 deletions.
  1. +3 −1 debian/changelog
  2. +13 −11 debian/control.in
  3. +5 −5 debian/rules
@@ -1,8 +1,10 @@
qgis (2.9.0) UNRELEASED; urgency=medium

* New development version 2.9 after branch of 2.8
* include dependency to liblwgeom
* 'stretch' package a bit

-- Jürgen E. Fischer <jef@norbit.de> Fri, 20 Feb 2015 13:06:05 +0100
-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 May 2015 08:34:55 +0200

qgis (2.8.0) unstable; urgency=medium

@@ -6,13 +6,13 @@ Priority: optional
Build-Depends:
bison,
cmake (>= 2.8),
#sid jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
#sid stretch jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
#precise# debhelper (>= 7),
flex,
grass-dev (<< 7),
libexpat1-dev,
libfcgi-dev,
#sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#saucy# libgdal-dev (>= 1.9.0),
#wheezy# libgdal1-dev,
@@ -23,7 +23,7 @@ Build-Depends:
libqt4-dev (>= 4.7.0),
libqt4-opengl-dev,
libqtwebkit-dev,
#sid jessie wheezy sid-oracle# libqwt-dev,
#sid stretch jessie wheezy sid-oracle# libqwt-dev,
#precise saucy trusty utopic vivid# libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
@@ -35,9 +35,9 @@ Build-Depends:
#precise saucy# python-central (>= 0.5),
#saucy wheezy# python-dev,
#saucy# libpython2.7-dev,
#sid jessie sid-oracle trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid jessie wheezy precise saucy sid-oracle trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
#sid# pyqt4.qsci-dev,
#sid stretch jessie sid-oracle trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie wheezy precise saucy sid-oracle trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
#sid stretch jessie# pyqt4.qsci-dev,
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
@@ -52,10 +52,10 @@ Build-Depends:
#sid-oracle# oracle-instantclient11.2-devel,
spawn-fcgi, lighttpd, poppler-utils, locales
Build-Conflicts: libqgis-dev, qgis-dev
#sid jessie sid-oracle vivid#Standards-Version: 3.9.6
#sid stretch jessie sid-oracle vivid#Standards-Version: 3.9.6
#wheezy#Standards-Version: 3.9.3
#precise saucy trusty utopic#Standards-Version: 3.8.4
#sid jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
#sid stretch jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
#wheezy precise saucy trusty utopic vivid#XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
@@ -212,7 +212,7 @@ Section: libdevel
Depends:
grass-dev (<< 7),
libexpat1-dev,
#sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#saucy# libgdal-dev (>= 1.9.0),
#wheezy# libgdal1-dev,
@@ -262,7 +262,7 @@ Description: GRASS plugin for QGIS
Package: qgis-plugin-grass-common
Architecture: all
Depends:
#sid jessie saucy sid-oracle trusty# python2.7,
#sid stretch jessie saucy sid-oracle trusty# python2.7,
#wheezy precise# python,
${misc:Depends}
Breaks: qgis-common (<< 1.5)
@@ -315,7 +315,9 @@ Depends:
python-dateutil,
python-tz,
python-six,
#sid jessie trusty utopic vivid sid-oracle# python-pyspatialite,
#sid stretch jessie trusty utopic vivid sid-oracle# python-pyspatialite,
#sid stretch# liblwgeom-2.1.7,
#jessie# liblwgeom-2.1.4,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
@@ -23,7 +23,7 @@ ifeq (,$(DISTRIBUTION))
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
endif

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie precise trusty utopic vivid sid-oracle"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid sid-oracle"))
DISTRIBUTION := sid
endif

@@ -75,19 +75,19 @@ ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid sid-oracle"))
ifneq (,$(findstring $(DISTRIBUTION),"sid sid-oracle stretch"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif

ifneq (,$(findstring $(DISTRIBUTION),"jessie trusty utopic vivid sid sid-oracle"))
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid sid sid-oracle"))
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
endif

ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
CMAKE_OPTS += -DWITH_ORACLE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid"))
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie"))
CMAKE_OPTS += -DSPATIALINDEX_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libspatialindex.so
endif

@@ -104,7 +104,7 @@ else
CMAKE_OPTS += -DENABLE_TESTS=TRUE
endif

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

0 comments on commit f2d4d30

Please sign in to comment.