Skip to content

Commit 0ca9eb0

Browse files
committed
debian packaging: drop trusty support
1 parent 91e4b24 commit 0ca9eb0

File tree

8 files changed

+27
-37
lines changed

8 files changed

+27
-37
lines changed

INSTALL

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Tuesday October 25, 2016
3+
Monday November 07, 2016
4+
5+
6+
Last Updated: Monday November 07, 2016
7+
Last Change : Monday November 07, 2016
48

5-
Last Updated: Tuesday October 25, 2016
6-
Last Change : Monday October 24, 2016
79

810
1. Introduction
911
2. Overview
@@ -179,7 +181,6 @@ Now update your local sources database:
179181
===============================
180182

181183
|| Distribution | install command for packages |
182-
| trusty | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
183184
| stretch | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
184185
| xenial | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
185186
| yakkety | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
@@ -368,7 +369,6 @@ new subdirectory called `build` or `build-qt5` in it.
368369
3.11.1. Install build dependencies
369370
==================================
370371

371-
372372
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
373373
qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel
374374
qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5
@@ -377,23 +377,18 @@ new subdirectory called `build` or `build-qt5` in it.
377377
qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
378378
python3-psycopg2 python3-PyYAML qca-qt5-ossl
379379

380-
381380
To build QGIS server additional dependencies are required:
382381

383-
384382
dnf install fcgi-devel
385383

386-
387384
Make sure that your build directory is completely empty when you enter the
388385
following command. Do never try to "re-use" an existing Qt4 build directory.
389386
If you want to use `ccmake` or other interactive tools, run the following
390387
command in the empty build directory once before starting to use the interactive
391388
tools.
392389

393-
394390
cmake ..
395391

396-
397392
If everything went ok you can finally start to compile. (As usual append a -jX
398393
where X is the number of available cores option to make to speed up your build
399394
process)

NEWS

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QGIS News
22
Change history for the QGIS Project
3-
Thursday October 06, 2016
3+
Monday November 07, 2016
44

55

66
------------------------------------------------------------------------
@@ -39,7 +39,7 @@ Thursday October 06, 2016
3939
------------------------------------------------------------------------
4040

4141

42-
Last Updated: Thursday October 06, 2016
42+
Last Updated: Monday November 07, 2016
4343
Last Change : Wednesday July 27, 2016
4444

4545

debian/changelog

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ qgis (2.99.0) UNRELEASED; urgency=medium
22

33
* New development version 2.999 after branch of 2.16
44
* move to qt5/python3/ninja
5+
* drop trusty support (libqca-2-dev missing)
56

6-
-- Jürgen E. Fischer <jef@norbit.de> Thu, 06 Oct 2016 13:30:42 +0200
7+
-- Jürgen E. Fischer <jef@norbit.de> Mon, 07 Nov 2016 12:14:47 +0100
78

89
qgis (2.16.0) unstable; urgency=medium
910

debian/control.in

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Build-Depends:
1313
libexpat1-dev,
1414
libfcgi-dev,
1515
libgdal-dev (>= 1.11),
16-
#trusty# libgsl0-dev,
1716
#sid stretch xenial yakkety# libgsl-dev,
1817
libgeos-dev (>= 3.0.0),
1918
libpq-dev,
@@ -43,8 +42,7 @@ Build-Depends:
4342
locales, ca-certificates, ninja-build
4443
Build-Conflicts: libqgis-dev, qgis-dev
4544
#sid stretch xenial yakkety#Standards-Version: 3.9.7
46-
#trusty#Standards-Version: 3.8.4
47-
#trusty xenial yakkety#XS-Python-Version: current
45+
#xenial yakkety#XS-Python-Version: current
4846
Vcs-Browser: https://github.com/qgis/QGIS/
4947
Vcs-Git: https://github.com/qgis/QGIS.git
5048
Homepage: http://qgis.org/
@@ -202,7 +200,6 @@ Depends:
202200
libexpat1-dev,
203201
libgdal-dev (>= 1.11),
204202
libgeos-dev (>= 3.0.0),
205-
#trusty# libgsl0-dev,
206203
#sid stretch xenial yakkety# libgsl-dev,
207204
libpq-dev,
208205
libproj-dev,

debian/rules

+1-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ endif
3636

3737
QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
3838

39-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"trusty stretch xenial yakkety"))
39+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch xenial yakkety"))
4040
DISTRIBUTION := sid
4141
endif
4242

@@ -144,10 +144,6 @@ endif
144144

145145
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
146146
CMAKE_OPTS += -DCMAKE_BUILD_TYPE=Debug
147-
else
148-
ifneq (,$(findstring $(DISTRIBUTION),"trusty"))
149-
CMAKE_OPTS += -DKEEP_GLOBE_CXX_FLAGS=TRUE
150-
endif
151147
endif
152148

153149
ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

doc/INSTALL.html

+14-12
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Tuesday October 25, 2016</H3>
80+
<H3>Monday November 07, 2016</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Tuesday October 25, 2016
86-
Last Change : Monday October 24, 2016
85+
Last Updated: Monday November 07, 2016
86+
Last Change : Monday November 07, 2016
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -312,10 +312,6 @@ <H2>3.3. Install build dependencies</H2>
312312
<TH>install command for packages</TH>
313313
</TR>
314314
<TR>
315-
<TD>trusty</TD>
316-
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui</CODE></TD>
317-
</TR>
318-
<TR>
319315
<TD>stretch</TD>
320316
<TD><CODE>apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui</CODE></TD>
321317
</TR>
@@ -563,24 +559,29 @@ <H3>3.10.1. Install build dependencies</H3>
563559
command in the empty build directory once before starting to use the
564560
interactive tools.
565561
</P>
562+
566563
<div class="code"><PRE>
567564
cmake
568565
</PRE></div>
569-
<P></P>
566+
570567
<P>
571568
If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
572569
</P>
570+
573571
<div class="code"><PRE>
574572
make
575573
</PRE></div>
576-
<P></P>
574+
577575
<A NAME="toc14"></A>
578576
<H2>3.11. On Fedora Linux</H2>
577+
579578
<P>
580579
We assume that you have the source code of QGIS ready and created a
581580
new subdirectory called `build` or `build-qt5` in it.
582581
</P>
582+
583583
<H3>3.11.1. Install build dependencies</H3>
584+
584585
<div class="code"><PRE>
585586
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
586587
qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel
@@ -590,14 +591,15 @@ <H3>3.11.1. Install build dependencies</H3>
590591
qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
591592
python3-psycopg2 python3-PyYAML qca-qt5-ossl
592593
</PRE></div>
593-
<P></P>
594+
594595
<P>
595596
To build QGIS server additional dependencies are required:
596597
</P>
598+
597599
<div class="code"><PRE>
598600
dnf install fcgi-devel
599601
</PRE></div>
600-
<P></P>
602+
601603
<P>
602604
Make sure that your build directory is completely empty when you enter the
603605
following command. Do never try to "re-use" an existing Qt4 build directory.
@@ -607,7 +609,7 @@ <H3>3.11.1. Install build dependencies</H3>
607609
</P>
608610

609611
<div class="code"><PRE>
610-
cmake -DENABLE_QT5=ON -DWITH_QWTPOLAR=OFF ..
612+
cmake ..
611613
</PRE></div>
612614

613615
<P>

doc/linux.t2t

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ sudo apt-get update
4444
== Install build dependencies ==
4545

4646
|| Distribution | install command for packages |
47-
| trusty | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
4847
| stretch | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
4948
| xenial | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
5049
| yakkety | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |

doc/news.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS News</H1>
7979
<H2>Change history for the QGIS Project</H2>
80-
<H3>Thursday October 06, 2016</H3>
80+
<H3>Monday November 07, 2016</H3>
8181
</DIV>
8282

8383
<DIV CLASS="toc">
@@ -116,7 +116,7 @@ <H3>Thursday October 06, 2016</H3>
116116
</DIV>
117117
<DIV CLASS="body" ID="body">
118118
<P>
119-
Last Updated: Thursday October 06, 2016
119+
Last Updated: Monday November 07, 2016
120120
Last Change : Wednesday July 27, 2016
121121
</P>
122122

0 commit comments

Comments
 (0)