Skip to content

Commit aa9bea5

Browse files
jef-njef-n
committedDec 21, 2014
debian packaging update
·
ltr-3_40archive/master_2
1 parent 1d9eb8f commit aa9bea5

File tree

8 files changed

+18
-23
lines changed

8 files changed

+18
-23
lines changed
 

‎INSTALL

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ Now update your local sources database:
178178
| wheezy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
179179
| jessie | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
180180
| precise | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
181-
| saucy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libpython2.7-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
182181
| trusty | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
183182
| utopic | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
184183
| sid | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools pyqt4.qsci-dev python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ qgis (2.7.0) UNRELEASED; urgency=medium
55
* add build dependency to python-qscintilla2 for tests
66
* rename libqgis-customwidgets{QGIS_ABI} to libqgis-customwidgets
77
* merge some downstream debian changes
8+
* drop support for ubuntu saucy and add vivid
89

9-
-- Jürgen E. Fischer <jef@norbit.de> Tue, 09 Dec 2014 09:37:11 +0100
10+
-- Jürgen E. Fischer <jef@norbit.de> Sun, 21 Dec 2014 21:13:48 +0100
1011

1112
qgis (2.6.0) unstable; urgency=medium
1213

‎debian/compat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#sid jessie sid-oracle saucy trusty utopic#9
1+
#sid jessie sid-oracle trusty utopic vivid#9
22
#wheezy jessie#8
33
#precise#7

‎debian/control.in

Lines changed: 9 additions & 9 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# debhelper (>= 9),
9+
#sid jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
1010
#precise# debhelper (>= 7),
1111
flex,
1212
grass-dev,
1313
libexpat1-dev,
1414
libfcgi-dev,
15-
#sid jessie sid-oracle trusty utopic# libgdal-dev (>= 1.10.1-0~),
15+
#sid 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,
@@ -24,7 +24,7 @@ Build-Depends:
2424
libqt4-opengl-dev,
2525
libqtwebkit-dev,
2626
#sid jessie wheezy sid-oracle# libqwt-dev,
27-
#precise saucy trusty utopic# libqwt5-qt4-dev,
27+
#precise saucy trusty utopic vivid# libqwt5-qt4-dev,
2828
libspatialite-dev,
2929
libsqlite3-dev,
3030
libspatialindex-dev,
@@ -35,8 +35,8 @@ 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# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
39-
#sid jessie wheezy precise saucy sid-oracle trusty utopic# python-qt4 (>= 4.1.0), python-qt4-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,
4040
#sid# pyqt4.qsci-dev,
4141
python-sip (>= 4.5.0),
4242
python-sip-dev (>= 4.5.0),
@@ -52,11 +52,11 @@ 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#Standards-Version: 3.9.6
55+
#sid 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
5858
#sid jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
59-
#wheezy precise saucy trusty utopic#XS-Python-Version: current
59+
#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
6262
Homepage: http://qgis.org/
@@ -212,7 +212,7 @@ Section: libdevel
212212
Depends:
213213
grass-dev,
214214
libexpat1-dev,
215-
#sid jessie sid-oracle trusty utopic# libgdal-dev (>= 1.10.1-0~),
215+
#sid 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,
@@ -314,7 +314,7 @@ Depends:
314314
python-dateutil,
315315
python-tz,
316316
python-six,
317-
#sid jessie trusty utopic sid-oracle# python-pyspatialite,
317+
#sid jessie trusty utopic vivid sid-oracle# python-pyspatialite,
318318
libqgispython{QGIS_ABI},
319319
${shlibs:Depends},
320320
${python:Depends},

‎debian/python-qgis.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ usr/lib/python*/*-packages/qgis/gui/*
55
usr/lib/python*/*-packages/qgis/analysis/*
66
usr/lib/python*/*-packages/qgis/networkanalysis/*
77
usr/lib/python*/*-packages/qgis/server/*
8-
#wheezy precise saucy#usr/lib/python*/*-packages/pyspatialite/*.py
9-
#wheezy precise saucy#usr/lib/python*/*-packages/pyspatialite/*.so
8+
#wheezy precise#usr/lib/python*/*-packages/pyspatialite/*.py
9+
#wheezy precise#usr/lib/python*/*-packages/pyspatialite/*.so

‎debian/rules

Lines changed: 4 additions & 4 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 saucy trusty utopic sid-oracle"))
26+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie precise trusty utopic vivid sid-oracle"))
2727
DISTRIBUTION := sid
2828
endif
2929

@@ -70,15 +70,15 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
7070
MAKEFLAGS += -j$(NUMJOBS)
7171
endif
7272

73-
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise saucy"))
73+
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise"))
7474
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
7575
endif
7676

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

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

@@ -100,7 +100,7 @@ else
100100
CMAKE_OPTS += -DENABLE_TESTS=TRUE
101101
endif
102102

103-
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy trusty sid sid-oracle"))
103+
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie trusty sid sid-oracle"))
104104
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
105105
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
106106
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)

‎doc/INSTALL.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,6 @@ <H2>3.3. Install build dependencies</H2>
318318
<TD><CODE>apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb</CODE></TD>
319319
</TR>
320320
<TR>
321-
<TD>saucy</TD>
322-
<TD><CODE>apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libpython2.7-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb</CODE></TD>
323-
</TR>
324-
<TR>
325321
<TD>trusty</TD>
326322
<TD><CODE>apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb</CODE></TD>
327323
</TR>

‎doc/linux.t2t

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ sudo apt-get update
4747
| wheezy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
4848
| jessie | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
4949
| precise | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
50-
| saucy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libpython2.7-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
5150
| trusty | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
5251
| utopic | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
5352
| sid | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools pyqt4.qsci-dev python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |

0 commit comments

Comments
 (0)
Please sign in to comment.