Skip to content

Commit 60ada11

Browse files
jef-njef-n
committed
Merge pull request #2946 from sebastic/debian
Debian packaging improvements
2 parents 99980be + 100c96c commit 60ada11

File tree

7 files changed

+52
-51
lines changed

7 files changed

+52
-51
lines changed

‎debian/control.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ Build-Depends:
6464
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
6565
libqt4-sql-sqlite, python-psycopg2
6666
Build-Conflicts: libqgis-dev, qgis-dev
67-
#sid stretch jessie vivid wily xenial#Standards-Version: 3.9.6
67+
#sid stretch xenial#Standards-Version: 3.9.7
68+
#jessie vivid wily#Standards-Version: 3.9.6
6869
#wheezy#Standards-Version: 3.9.3
6970
#precise trusty#Standards-Version: 3.8.4
7071
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
@@ -406,6 +407,7 @@ Depends:
406407
gdal-bin,
407408
python-gdal,
408409
python-matplotlib,
410+
python-shapely,
409411
libqgis-customwidgets,
410412
${misc:Depends}
411413
XB-Python-Version: ${python:Versions}

‎debian/copyright

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ Copyright: Carl Anderson
8989
2014, Radoslaw Guzinski <rmgu@dhi-gras.com>
9090
2004-2006, 2009-2015, Radim Blazek <blazek@itc.it>
9191
2004-2015, Marco Hugentobler <marco@sourcepole.ch>
92-
2008-2012, 2014-2015, Jürgen E. Fischer <jef@norbit.de>
9392
2009-2015, Alexander Bruy <alexander.bruy@gmail.com>
9493
2012-2015, The QGIS Project
9594
2012-2015, Larry Shaffer <lshaffer@boundlessgeo.com>
@@ -111,6 +110,7 @@ Copyright: Carl Anderson
111110
2008, 2015, Stéphane Brunner <stephane.brunner@camptocamp.org>
112111
2005, 2012, 2014-2016, Hugo Mercier <hugo.mercier@oslandia.com>
113112
2005-2016, Martin Dobias <wonder.sk@gmail.com>
113+
2008-2012, 2014-2016, Jürgen E. Fischer <jef@norbit.de>
114114
2012-2016, Denis Rouzaud <denis.rouzaud@gmail.com>
115115
2012-2016, Matthias Kuhn <matthias@opengis.ch>
116116
2012-2016, Victor Olaya <volayaf@gmail.com>
@@ -249,6 +249,7 @@ License: GPL-2+
249249

250250
Files: src/app/gps/qwtpolar-0.1/*
251251
src/app/gps/qwtpolar-1.0/*
252+
src/app/gps/qwtpolar-1.1.1/*
252253
Copyright: 2008, Uwe Rathmann
253254
Comment: This library is free software; you can redistribute it and/or
254255
modify it under the terms of the Qwt License, Version 1.0
@@ -468,30 +469,23 @@ Files: cmake/FindIconv.cmake
468469
Copyright: 2009, Juergen E. Fischer <jef at norbit dot de>
469470
License: BSD-3-Clause
470471

471-
Files: cmake/FindLibPython.py
472-
cmake/FindPyQt4.cmake
473-
cmake/FindPyQt4.py
474-
cmake/FindPyQt5.cmake
475-
cmake/FindPyQt5.py
476-
cmake/FindSIP.py
477-
Copyright: 2007, Simon Edwards <simon@simonzone.com>
478-
License: BSD-3-Clause
479-
480472
Files: cmake/FindOSGEARTH.cmake
481473
Copyright: 2011-2013, Pirmin Kalberer
482474
2011, Jürgen E. Fischer <jef at norbit.de>
483475
2013, William Kyngesburye
484476
License: BSD-3-Clause
485477

486-
Files: cmake/FindPyQt4.cmake
487-
Copyright: 2007-2008, Simon Edwards <simon@simonzone.com>
488-
License: BSD-3-Clause
489-
490-
Files: cmake/FindPythonLibrary.cmake
478+
Files: cmake/FindLibPython.py
479+
cmake/FindPyQt4.cmake
480+
cmake/FindPyQt4.py
481+
cmake/FindPyQt5.cmake
482+
cmake/FindPyQt5.py
483+
cmake/FindPythonLibrary.cmake
491484
cmake/FindSIP.cmake
485+
cmake/FindSIP.py
492486
cmake/PythonMacros.cmake
493487
cmake/SIPMacros.cmake
494-
Copyright: 2007, Simon Edwards <simon@simonzone.com>
488+
Copyright: 2007-2008, Simon Edwards <simon@simonzone.com>
495489
License: BSD-3-Clause
496490

497491
Files: cmake/FindQCA.cmake

‎debian/rules

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# This has to be exported to make some magic below work.
88
export DH_OPTIONS
99

10+
# Enable hardening build flags
11+
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
12+
1013
# These are used for cross-compiling and for saving the configure script
1114
# from having to guess our platform (since we know it already)
1215
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -252,6 +255,35 @@ endif
252255
override_dh_auto_install:
253256
dh_auto_install
254257

258+
# remove unwanted files
259+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
260+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
261+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
262+
263+
# replace leaflet and jquery urls
264+
perl -i -p \
265+
-e 's#http://.*/leaflet.css#leaflet/leaflet.css#;s#http://.*/leaflet.js#leaflet/leaflet.js#;s#http://.*/jquery-.*.min.js#jquery-min.js#' \
266+
$(CURDIR)/debian/tmp/usr/share/qgis/doc/developersmap.html
267+
268+
# Use /usr/bin/python2.7 explicitly for Python Policy compliance
269+
perl -i -pe 's=#!/usr/bin/env python=#!/usr/bin/python2.7=;' $$(find debian/tmp -name "*.py")
270+
271+
# Don't include a copy of the world.tif also included in osgearth-data
272+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
273+
274+
# remove extra license files
275+
-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
276+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE
277+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE
278+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt
279+
280+
# Man pages are installed by dh_installman
281+
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
282+
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
283+
284+
# Don't ship srs.db, automatically updated in postinst with crssync
285+
mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
286+
255287
# Install menu pixmap
256288
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
257289
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
@@ -307,34 +339,6 @@ override_dh_auto_install:
307339
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qbrowser
308340

309341
override_dh_install:
310-
# Don't ship srs.db, automatically updated in postinst with crssync
311-
mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
312-
313-
perl -i -pe 's=#!/usr/bin/env python=#!/usr/bin/python2.7=;' $$(find debian/tmp -name "*.py")
314-
315-
# remove unwanted files
316-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
317-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
318-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
319-
320-
# replace leaflet and jquery urls
321-
perl -i -p \
322-
-e 's#http://.*/leaflet.css#leaflet/leaflet.css#;s#http://.*/leaflet.js#leaflet/leaflet.js#;s#http://.*/jquery-.*.min.js#jquery-min.js#' \
323-
$(CURDIR)/debian/tmp/usr/share/qgis/doc/developersmap.html
324-
325-
# Don't include a copy of the world.tif also included in osgearth-data
326-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
327-
328-
# remove extra license files
329-
-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
330-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE
331-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE
332-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt
333-
334-
# Man pages are installed by dh_installman
335-
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
336-
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
337-
338342
dh_install --autodest --list-missing
339343

340344
override_dh_installchangelogs:

‎debian/upstream/metadata

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
Bug-Database: http://hub.qgis.org/projects/quantum-gis/issues
3-
Bug-Submit: http://hub.qgis.org/projects/quantum-gis/issues/new
2+
Bug-Database: https://hub.qgis.org/projects/quantum-gis/issues
3+
Bug-Submit: https://hub.qgis.org/projects/quantum-gis/issues/new
44
Contact: qgis-developer@lists.osgeo.org
5-
Donation: http://qgis.org/en/site/getinvolved/donations.html
5+
Donation: https://qgis.org/en/site/getinvolved/donations.html
66
Name: QGIS
77
Registration: https://www2.osgeo.org/cgi-bin/ldap_create_user.py
88
Repository: https://github.com/qgis/QGIS.git
99
Repository-Browse: https://github.com/qgis/QGIS
10-
Screenshots: http://qgis.org/en/site/about/screenshots.html
10+
Screenshots: https://qgis.org/en/site/about/screenshots.html

‎resources/context_help/QgsDelimitedTextSourceSelect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ Each attribute also has a data type, one of string (text), integer, longlong,
221221
or real number.
222222
The data type is inferred from the content of the fields - if every non blank value
223223
is a valid integer then the type is integer, otherwise if it is a valid long long
224-
nubmer then the type is longlong, otherwise if it is a valid real
224+
number then the type is longlong, otherwise if it is a valid real
225225
number then the type is real, otherwise the type is string. Note that this is
226226
based on the content of the fields - quoting fields does not change the way they
227227
are interpreted.

‎scripts/spelling.dat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ nescessary:necessary
300300
nessessary:necessary
301301
noticable:noticeable
302302
notications:notifications
303+
nubmer:number
303304
o'caml:OCaml
304305
occured:occurred
305306
occurence:occurrence

‎src/providers/wcs/qgswcsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ QgsWcsProvider::QgsWcsProvider( QString const &uri )
185185
return;
186186
}
187187

188-
// Get small piece of coverage to find GDAL data type and nubmer of bands
188+
// Get small piece of coverage to find GDAL data type and number of bands
189189
int bandNo = 0; // All bands
190190
int width;
191191
int height;

0 commit comments

Comments
 (0)