Skip to content

Commit f2d4d30

Browse files
jef-njef-n
committedMay 22, 2015
debian packaging update
·
ltr-3_40archive/master_2
1 parent 5c3a7af commit f2d4d30

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed
 

‎debian/changelog

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
qgis (2.9.0) UNRELEASED; urgency=medium
22

33
* New development version 2.9 after branch of 2.8
4+
* include dependency to liblwgeom
5+
* 'stretch' package a bit
46

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

79
qgis (2.8.0) unstable; urgency=medium
810

‎debian/control.in

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Priority: optional
66
Build-Depends:
77
bison,
88
cmake (>= 2.8),
9-
#sid jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
9+
#sid stretch jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
1010
#precise# debhelper (>= 7),
1111
flex,
1212
grass-dev (<< 7),
1313
libexpat1-dev,
1414
libfcgi-dev,
15-
#sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
15+
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
1616
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1717
#saucy# libgdal-dev (>= 1.9.0),
1818
#wheezy# libgdal1-dev,
@@ -23,7 +23,7 @@ Build-Depends:
2323
libqt4-dev (>= 4.7.0),
2424
libqt4-opengl-dev,
2525
libqtwebkit-dev,
26-
#sid jessie wheezy sid-oracle# libqwt-dev,
26+
#sid stretch jessie wheezy sid-oracle# libqwt-dev,
2727
#precise saucy trusty utopic vivid# libqwt5-qt4-dev,
2828
libspatialite-dev,
2929
libsqlite3-dev,
@@ -35,9 +35,9 @@ Build-Depends:
3535
#precise saucy# python-central (>= 0.5),
3636
#saucy wheezy# python-dev,
3737
#saucy# libpython2.7-dev,
38-
#sid jessie sid-oracle trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
39-
#sid jessie wheezy precise saucy sid-oracle trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
40-
#sid# pyqt4.qsci-dev,
38+
#sid stretch jessie sid-oracle trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
39+
#sid stretch jessie wheezy precise saucy sid-oracle trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
40+
#sid stretch jessie# pyqt4.qsci-dev,
4141
python-sip (>= 4.5.0),
4242
python-sip-dev (>= 4.5.0),
4343
libosgearth-dev,
@@ -52,10 +52,10 @@ Build-Depends:
5252
#sid-oracle# oracle-instantclient11.2-devel,
5353
spawn-fcgi, lighttpd, poppler-utils, locales
5454
Build-Conflicts: libqgis-dev, qgis-dev
55-
#sid jessie sid-oracle vivid#Standards-Version: 3.9.6
55+
#sid stretch jessie sid-oracle vivid#Standards-Version: 3.9.6
5656
#wheezy#Standards-Version: 3.9.3
5757
#precise saucy trusty utopic#Standards-Version: 3.8.4
58-
#sid jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
58+
#sid stretch jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
5959
#wheezy precise saucy trusty utopic vivid#XS-Python-Version: current
6060
Vcs-Browser: https://github.com/qgis/QGIS/
6161
Vcs-Git: https://github.com/qgis/QGIS.git
@@ -212,7 +212,7 @@ Section: libdevel
212212
Depends:
213213
grass-dev (<< 7),
214214
libexpat1-dev,
215-
#sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
215+
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
216216
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
217217
#saucy# libgdal-dev (>= 1.9.0),
218218
#wheezy# libgdal1-dev,
@@ -262,7 +262,7 @@ Description: GRASS plugin for QGIS
262262
Package: qgis-plugin-grass-common
263263
Architecture: all
264264
Depends:
265-
#sid jessie saucy sid-oracle trusty# python2.7,
265+
#sid stretch jessie saucy sid-oracle trusty# python2.7,
266266
#wheezy precise# python,
267267
${misc:Depends}
268268
Breaks: qgis-common (<< 1.5)
@@ -315,7 +315,9 @@ Depends:
315315
python-dateutil,
316316
python-tz,
317317
python-six,
318-
#sid jessie trusty utopic vivid sid-oracle# python-pyspatialite,
318+
#sid stretch jessie trusty utopic vivid sid-oracle# python-pyspatialite,
319+
#sid stretch# liblwgeom-2.1.7,
320+
#jessie# liblwgeom-2.1.4,
319321
libqgispython{QGIS_ABI},
320322
${shlibs:Depends},
321323
${python:Depends},

‎debian/rules

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ifeq (,$(DISTRIBUTION))
2323
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
2424
endif
2525

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

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

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

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

8686
ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
8787
CMAKE_OPTS += -DWITH_ORACLE=TRUE
8888
endif
8989

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

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

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

0 commit comments

Comments
 (0)
Please sign in to comment.