Skip to content

Commit 750e60f

Browse files
jef-njef-n
committedAug 1, 2016
debian packaging update
·
ltr-2_18archive/master_2
1 parent a356125 commit 750e60f

22 files changed

+60
-53
lines changed
 

‎debian/changelog

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

33
* New development version 2.17 after branch of 2.16
4+
* drop support for debian wheezy and ubuntu wily
5+
* add python-requests dependency for metasearch plugin
6+
* lintian fixes
47

5-
-- Jürgen E. Fischer <jef@norbit.de> Fri, 08 Jul 2016 14:12:35 +0200
8+
-- Jürgen E. Fischer <jef@norbit.de> Mon, 01 Aug 2016 10:06:23 +0200
69

710
qgis (2.16.0) unstable; urgency=medium
811

‎debian/compat.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#stretch sid jessie trusty wily xenial#9
2-
#wheezy jessie#8
1+
#stretch sid jessie trusty xenial#9
2+
#jessie#8
33
#precise#7

‎debian/control.in

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,30 @@ Priority: optional
66
Build-Depends:
77
bison,
88
cmake (>= 2.8),
9-
#wily# cmake (<< 3.3.2),
10-
#sid stretch jessie wheezy trusty wily xenial# debhelper (>= 9),
11-
#sid stretch jessie trusty wily xenial# dh-python,
9+
#sid stretch jessie trusty xenial# debhelper (>= 9),
10+
#sid stretch jessie trusty xenial# dh-python,
1211
#precise# debhelper (>= 7),
1312
flex,
1413
grass-dev,
1514
libexpat1-dev,
1615
libfcgi-dev,
17-
#sid stretch jessie trusty wily xenial# libgdal-dev (>= 1.10.1-0~),
16+
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
1817
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
19-
#wheezy# libgdal1-dev,
2018
gdal-bin,
2119
python-gdal,
2220
libgeos-dev (>= 3.0.0),
23-
#jessie wheezy precise trusty wily# libgsl0-dev,
21+
#jessie precise trusty# libgsl0-dev,
2422
#sid stretch xenial# libgsl-dev,
2523
libpq-dev,
2624
libproj-dev,
2725
libqt4-dev (>= 4.7.0),
2826
libqt4-opengl-dev,
2927
libqca2-dev,
3028
libqca2-plugin-ossl,
31-
#wheezy jessie precise trusty utopic vivid wily xenial# libqtwebkit-dev,
32-
#stretch jessie wheezy# libqwt-dev,
33-
#precise trusty wily xenial sid# libqwt5-qt4-dev,
34-
#sid stretch jessie wheezy trusty wily xenial# libqjson-dev,
29+
#jessie precise trusty utopic xenial# libqtwebkit-dev,
30+
#stretch jessie# libqwt-dev,
31+
#precise trusty xenial sid# libqwt5-qt4-dev,
32+
#sid stretch jessie trusty xenial# libqjson-dev,
3533
libspatialite-dev,
3634
libsqlite3-dev,
3735
libspatialindex-dev,
@@ -42,14 +40,13 @@ Build-Depends:
4240
python-qt4-dev,
4341
python-qt4-sql,
4442
python-yaml, python-mock,
45-
#stretch sid wily xenial# python-future,
46-
#precise wheezy# python,
43+
#stretch sid xenial# python-future,
44+
#precise# python,
4745
#precise# python-central (>= 0.5),
48-
#wheezy# python-dev,
49-
#sid stretch jessie trusty wily xenial# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
50-
#sid stretch jessie wily xenial# pyqt4.qsci-dev,
51-
#sid stretch jessie trusty wily xenial# python-pyspatialite,
52-
#sid wheezy jessie stretch trusty wily xenial# python-nose2,
46+
#sid stretch jessie trusty xenial# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
47+
#sid stretch jessie xenial# pyqt4.qsci-dev,
48+
#sid stretch jessie trusty xenial# python-pyspatialite,
49+
#sid jessie stretch trusty xenial# python-nose2,
5350
python-sip (>= 4.5.0),
5451
python-sip-dev (>= 4.5.0),
5552
libosgearth-dev,
@@ -67,11 +64,10 @@ Build-Depends:
6764
libqt4-sql-sqlite, python-psycopg2
6865
Build-Conflicts: libqgis-dev, qgis-dev
6966
#sid stretch xenial#Standards-Version: 3.9.7
70-
#jessie wily#Standards-Version: 3.9.6
71-
#wheezy#Standards-Version: 3.9.3
67+
#jessie#Standards-Version: 3.9.6
7268
#precise trusty#Standards-Version: 3.8.4
7369
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
74-
#wheezy precise trusty wily xenial#XS-Python-Version: current
70+
#precise trusty xenial#XS-Python-Version: current
7571
Vcs-Browser: https://github.com/qgis/QGIS/
7672
Vcs-Git: https://github.com/qgis/QGIS.git
7773
Homepage: http://qgis.org/
@@ -244,11 +240,10 @@ Section: libdevel
244240
Depends:
245241
grass-dev,
246242
libexpat1-dev,
247-
#sid stretch jessie trusty wily xenial# libgdal-dev (>= 1.10.1-0~),
243+
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
248244
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
249-
#wheezy# libgdal1-dev,
250245
libgeos-dev (>= 3.0.0),
251-
#jessie wheezy precise trusty wily# libgsl0-dev,
246+
#jessie precise trusty# libgsl0-dev,
252247
#sid stretch xenial# libgsl-dev,
253248
libpq-dev,
254249
libproj-dev,
@@ -383,19 +378,20 @@ Depends:
383378
python-markupsafe,
384379
python-pygments,
385380
python-dateutil,
381+
python-requests,
386382
python-tz,
387383
python-six,
388384
python-yaml,
389-
#stretch sid wily xenial# python-future,
390-
#sid stretch jessie trusty wily xenial# python-pyspatialite,
385+
#stretch sid xenial# python-future,
386+
#sid stretch jessie trusty xenial# python-pyspatialite,
391387
libqgispython{QGIS_ABI},
392388
${shlibs:Depends},
393389
${python:Depends},
394390
${misc:Depends},
395391
${sip:Depends}
396392
Provides: ${python:Provides}
397393
Recommends: liblwgeom-dev
398-
#wheezy precise#XB-Python-Version: ${python:Versions}
394+
#precise#XB-Python-Version: ${python:Versions}
399395
Description: Python bindings to QGIS
400396
QGIS is a Geographic Information System (GIS) which manages, analyzes and
401397
display databases of geographic information.

‎debian/libqgis-analysis{QGIS_ABI}.lintian-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
libqgis-analysis{QGIS_ABI}: no-symbols-control-file
22
libqgis-analysis{QGIS_ABI}: shlib-calls-exit
3+
libqgis-analysis{QGIS_ABI}: spelling-error-in-binary usr/lib/libqgis_analysis.so.{QGIS_ABI} normalY normally

‎debian/libqgis-core{QGIS_ABI}.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
libqgis-core{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_core.so.{QGIS_ABI}
22
libqgis-core{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_core.so.{QGIS_ABI}
3+
libqgis-core{QGIS_ABI}: spelling-error-in-binary usr/lib/libqgis_core.so.{QGIS_ABI} naM name
4+
libqgis-core{QGIS_ABI}: spelling-error-in-binary usr/lib/libqgis_core.so.{QGIS_ABI} orderD ordered

‎debian/libqgis-customwidgets.lintian-overrides

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/libqgis-customwidgets.lintian-overrides.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
libqgis-customwidgets: no-symbols-control-file
2+
libqgis-customwidgets: spelling-error-in-binary {QT_PLUGIN_DIR}/designer/libqgis_customwidgets.so.{QGIS_ABI} YUr Your

‎debian/python-qgis.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ usr/lib/python*/*-packages/qgis/networkanalysis/*
77
usr/lib/python*/*-packages/qgis/PyQt/*
88
usr/lib/python*/*-packages/qgis/server/*
99
usr/lib/python*/*-packages/qgis/testing/*
10-
#wheezy precise#usr/lib/python*/*-packages/pyspatialite/*.py
11-
#wheezy precise#usr/lib/python*/*-packages/pyspatialite/*.so
10+
#precise#usr/lib/python*/*-packages/pyspatialite/*.py
11+
#precise#usr/lib/python*/*-packages/pyspatialite/*.so

‎debian/python-qgis.lintian-overrides.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
python-qgis: hardening-no-fortify-functions
2+
python-qgis: spelling-error-in-binary usr/lib/python*/*-packages/qgis/*.so onself oneself

‎debian/qgis-common.install

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@ usr/share/qgis/doc/images
1212
usr/share/qgis/doc/index.html
1313
usr/share/qgis/doc/news
1414
usr/share/qgis/doc/news.html
15+
usr/share/qgis/doc/release-sponsors.html
1516
usr/share/qgis/doc/style.css
1617
usr/share/qgis/i18n/*
1718
usr/share/qgis/images/*
1819
usr/share/qgis/resources/spatialite.db
1920
usr/share/qgis/resources/themes/*
21+
usr/share/pixmaps/
22+
usr/share/mime/packages/
23+
usr/share/mimelnk/
24+
usr/share/icons/hicolor/

‎debian/qgis-plugin-globe-common.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
usr/share/qgis/globe
2+
usr/include/osgEarthDrivers/feature_qgis

‎debian/qgis-plugin-globe.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
usr/lib/qgis/plugins/libglobeplugin.so
2+
usr/lib/libosgdb_osgearth_feature_qgis.so

‎debian/qgis-plugin-grass.lintian-overrides

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎debian/qgis-provider.lintian-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
qgis: spelling-error-in-binary usr/lib/qgis/qgis_help YUr Your

‎debian/qgis-providers.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
1717
usr/lib/qgis/plugins/libwcsprovider.so
1818
usr/lib/qgis/plugins/libwfsprovider.so
1919
usr/lib/qgis/plugins/libwmsprovider.so
20-
#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgismapserverprovider.so
21-
#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
20+
#sid stretch jessie trusty xenial#usr/lib/qgis/plugins/libarcgismapserverprovider.so
21+
#sid stretch jessie trusty xenial#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
2222
{QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so

‎debian/qgis-providers.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
qgis-providers: spelling-error-in-binary usr/lib/qgis/plugins/libdelimitedtextprovider.so AddD Add
2+
qgis-providers: spelling-error-in-binary usr/lib/qgis/plugins/libpostgresprovider.so theRes there's

‎debian/qgis.install

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@ usr/lib/qgis/plugins/libtopolplugin.so
1515
usr/lib/qgis/plugins/libgeometrycheckerplugin.so
1616
usr/lib/qgis/plugins/libgeometrysnapperplugin.so
1717
usr/lib/qgis/qgis_help
18-
usr/share/pixmaps/
19-
usr/share/applications/
20-
usr/share/mime/packages/
21-
usr/share/mimelnk/
22-
usr/share/icons/hicolor/
18+
usr/share/applications

‎debian/qgis.lintian-overrides

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
2-
# Fortify Source functions: no, only unprotected functions found!
3-
# unprotected: fgets
4-
qgis: hardening-no-fortify-functions usr/lib/qgis/qgis_help
1+
qgis: spelling-error-in-binary usr/bin/qgis.bin YUr Your
2+
qgis: spelling-error-in-binary usr/lib/qgis/qgis_help YUr Your

‎debian/rules

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
3434
WITH_ORACLE=1
3535
endif
3636

37-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty wily xenial"))
37+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"jessie stretch precise trusty xenial"))
3838
DISTRIBUTION := sid
3939
endif
4040

@@ -68,6 +68,7 @@ CMAKE_OPTS := \
6868
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
6969
-DWITH_APIDOC=TRUE \
7070
-DGENERATE_QHP=TRUE \
71+
-DSUPPRESS_SIP_WARNINGS=TRUE \
7172
-DWITH_CUSTOM_WIDGETS=TRUE \
7273
-DWITH_INTERNAL_HTTPLIB2=FALSE \
7374
-DWITH_INTERNAL_JINJA2=FALSE \
@@ -106,7 +107,7 @@ else
106107
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
107108
endif
108109

109-
ifeq (,$(findstring $(DISTRIBUTION),"stretch sid wily xenial"))
110+
ifeq (,$(findstring $(DISTRIBUTION),"stretch sid xenial"))
110111
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=TRUE
111112
else
112113
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE
@@ -116,7 +117,7 @@ ifneq (,$(WITH_GLOBE))
116117
CMAKE_OPTS += -DWITH_GLOBE=TRUE
117118
endif
118119

119-
ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
120+
ifneq (,$(findstring $(DISTRIBUTION),"precise"))
120121
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
121122
endif
122123

@@ -132,7 +133,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
132133
CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
133134
endif
134135

135-
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty wily xenial sid"))
136+
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty xenial sid"))
136137
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
137138
endif
138139

@@ -170,7 +171,7 @@ else
170171
CMAKE_OPTS += -DENABLE_TESTS=TRUE
171172
endif
172173

173-
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie stretch trusty sid"))
174+
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty sid"))
174175
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
175176
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
176177
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)

‎src/helpviewer/qgshelpviewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void QgsReaderThread::run()
3636
QString help;
3737

3838
char buffer[1024];
39-
while ( fgets( buffer, sizeof buffer, stdin ) )
39+
while ( fgets( buffer, sizeof buffer - 1, stdin ) )
4040
{
4141
if ( strcmp( buffer, "EOH\n" ) == 0 )
4242
{

‎src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ bool DL_Dxf::getStrippedLine(std::string& s, unsigned int size, FILE *fp) {
236236
// Only the useful part of the line
237237
char* line;
238238

239-
line = fgets(wholeLine, size, fp);
239+
line = fgets(wholeLine, size-1, fp);
240240

241241
if (line!=nullptr && line[0] != '\0') { // Evaluates to fgets() retval
242242
// line == wholeLine at this point.

‎src/providers/grass/qgis.g.info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ int main( int argc, char **argv )
217217
G_suppress_masking(); // must be after G_set_window()
218218
fd = G_open_cell_old( rast_opt->answer, "" );
219219
// wait for coords from stdin
220-
while ( fgets( buff, 100, stdin ) != 0 )
220+
while ( fgets( buff, sizeof buff - 1, stdin ) != 0 )
221221
{
222222
if ( sscanf( buff, "%lf%lf", &x, &y ) != 2 )
223223
{

0 commit comments

Comments
 (0)
Please sign in to comment.