Skip to content

Commit 443a7ae

Browse files
jef-njef-n
committed
debian packaging updates
1 parent 0150799 commit 443a7ae

13 files changed

+26
-14
lines changed

‎debian/changelog

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
1717
* drop delimited text and diagram overlay plugin (now in core)
1818
* drop context_help, function_help and qgis_help.db files
1919
* use dh_sip
20+
* add build dependency to xfonts (100dpi, 75dpi, scalable) for tests
2021

21-
-- Jürgen E. Fischer <jef@norbit.de> Sun, 02 Jun 2013 11:52:24 +0200
22+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 20 Jul 2013 13:18:52 +0200
2223

2324
qgis (1.8.0) UNRELEASED; urgency=low
2425

‎debian/control.lucid

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ Build-Depends:
3333
doxygen,
3434
graphviz,
3535
txt2tags,
36-
xvfb, xauth, xfonts-base
36+
xvfb, xauth,
37+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
3738
Build-Conflicts: libqgis-dev, qgis-dev
3839
Standards-Version: 3.8.4
3940
XS-Python-Version: current

‎debian/control.maverick

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Build-Depends:
3535
doxygen,
3636
graphviz,
3737
txt2tags,
38-
xvfb, xauth, xfonts-base
38+
xvfb, xauth,
39+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
3940
Build-Conflicts: libqgis-dev, qgis-dev
4041
Standards-Version: 3.8.4
4142
XS-Python-Version: current

‎debian/control.natty

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Build-Depends:
3434
doxygen,
3535
graphviz,
3636
txt2tags,
37-
xvfb, xauth, xfonts-base
37+
xvfb, xauth,
38+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
3839
Build-Conflicts: libqgis-dev, qgis-dev
3940
Standards-Version: 3.8.4
4041
XS-Python-Version: current

‎debian/control.oneiric

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Build-Depends:
3434
doxygen,
3535
graphviz,
3636
txt2tags,
37-
xvfb, xauth, xfonts-base
37+
xvfb, xauth,
38+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
3839
Build-Conflicts: libqgis-dev, qgis-dev
3940
Standards-Version: 3.8.4
4041
XS-Python-Version: current

‎debian/control.precise

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Build-Depends:
3737
doxygen,
3838
graphviz,
3939
txt2tags,
40-
xvfb, xauth, xfonts-base
40+
xvfb, xauth,
41+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
4142
Build-Conflicts: libqgis-dev, qgis-dev
4243
Standards-Version: 3.8.4
4344
XS-Python-Version: current

‎debian/control.quantal

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Build-Depends:
3636
doxygen,
3737
graphviz,
3838
txt2tags,
39-
xvfb, xauth, xfonts-base
39+
xvfb, xauth,
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
4041
Build-Conflicts: libqgis-dev, qgis-dev
4142
Standards-Version: 3.9.3
4243
XS-Python-Version: current

‎debian/control.raring

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ Build-Depends:
3838
doxygen,
3939
graphviz,
4040
txt2tags,
41-
xvfb, xauth, xfonts-base
41+
xvfb, xauth,
42+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
4243
Build-Conflicts: libqgis-dev, qgis-dev
4344
Standards-Version: 3.8.4
4445
XS-Python-Version: current

‎debian/control.sid

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Build-Depends:
3636
doxygen,
3737
graphviz,
3838
txt2tags,
39-
xvfb, xauth, xfonts-base
39+
xvfb, xauth,
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
4041
Build-Conflicts: libqgis-dev, qgis-dev
4142
Standards-Version: 3.9.3
4243
XS-Python-Version: current

‎debian/control.sid-oracle

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Build-Depends:
3636
doxygen,
3737
graphviz,
3838
txt2tags,
39-
xvfb, xauth, xfonts-base,
39+
xvfb, xauth,
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
4041
oracle-instantclient11.2-devel
4142
Build-Conflicts: libqgis-dev, qgis-dev
4243
Standards-Version: 3.9.3

‎debian/control.squeeze

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Build-Depends:
3434
doxygen,
3535
graphviz,
3636
txt2tags,
37-
xvfb, xauth, xfonts-base
37+
xvfb, xauth,
38+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
3839
Build-Conflicts: libqgis-dev, qgis-dev
3940
Standards-Version: 3.8.4
4041
XS-Python-Version: current

‎debian/control.wheezy

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Build-Depends:
3636
doxygen,
3737
graphviz,
3838
txt2tags,
39-
xvfb, xauth, xfonts-base
39+
xvfb, xauth,
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
4041
Build-Conflicts: libqgis-dev, qgis-dev
4142
Standards-Version: 3.9.3
4243
XS-Python-Version: current

‎debian/rules

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
7070
MAKEFLAGS += -j$(NUMJOBS)
7171
endif
7272

73-
ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise raring"))
73+
ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy sid lucid maverick natty oneiric precise raring"))
7474
CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
7575
endif
7676

@@ -236,7 +236,7 @@ binary-arch: build install
236236
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
237237
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
238238

239-
ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick precise quantal raring sid sid-oracle"))
239+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"natty oneiric"))
240240
dh_sip
241241
endif
242242
ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid quantal raring"))

0 commit comments

Comments
 (0)