From 443a7ae8df676be29a827a25eaf92b2d7829bce6 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sat, 20 Jul 2013 13:19:55 +0200 Subject: [PATCH] debian packaging updates --- debian/changelog | 3 ++- debian/control.lucid | 3 ++- debian/control.maverick | 3 ++- debian/control.natty | 3 ++- debian/control.oneiric | 3 ++- debian/control.precise | 3 ++- debian/control.quantal | 3 ++- debian/control.raring | 3 ++- debian/control.sid | 3 ++- debian/control.sid-oracle | 3 ++- debian/control.squeeze | 3 ++- debian/control.wheezy | 3 ++- debian/rules | 4 ++-- 13 files changed, 26 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 00f68f38c9e..d53b53163fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,9 @@ qgis (1.9.0) UNRELEASED; urgency=low * drop delimited text and diagram overlay plugin (now in core) * drop context_help, function_help and qgis_help.db files * use dh_sip + * add build dependency to xfonts (100dpi, 75dpi, scalable) for tests - -- Jürgen E. Fischer Sun, 02 Jun 2013 11:52:24 +0200 + -- Jürgen E. Fischer Sat, 20 Jul 2013 13:18:52 +0200 qgis (1.8.0) UNRELEASED; urgency=low diff --git a/debian/control.lucid b/debian/control.lucid index 501269ecf50..24b4961efbb 100644 --- a/debian/control.lucid +++ b/debian/control.lucid @@ -33,7 +33,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.8.4 XS-Python-Version: current diff --git a/debian/control.maverick b/debian/control.maverick index d734c716034..2e949b1bc86 100644 --- a/debian/control.maverick +++ b/debian/control.maverick @@ -35,7 +35,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.8.4 XS-Python-Version: current diff --git a/debian/control.natty b/debian/control.natty index f4469598872..699b70d4f23 100644 --- a/debian/control.natty +++ b/debian/control.natty @@ -34,7 +34,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.8.4 XS-Python-Version: current diff --git a/debian/control.oneiric b/debian/control.oneiric index facd4657313..1891fa18a94 100644 --- a/debian/control.oneiric +++ b/debian/control.oneiric @@ -34,7 +34,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.8.4 XS-Python-Version: current diff --git a/debian/control.precise b/debian/control.precise index 6b4a0d7b034..0315f80959d 100644 --- a/debian/control.precise +++ b/debian/control.precise @@ -37,7 +37,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.8.4 XS-Python-Version: current diff --git a/debian/control.quantal b/debian/control.quantal index 8b97c133b31..966ea63ea74 100644 --- a/debian/control.quantal +++ b/debian/control.quantal @@ -36,7 +36,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 XS-Python-Version: current diff --git a/debian/control.raring b/debian/control.raring index f61f04706ed..b065b12aeb6 100644 --- a/debian/control.raring +++ b/debian/control.raring @@ -38,7 +38,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.8.4 XS-Python-Version: current diff --git a/debian/control.sid b/debian/control.sid index 8b97c133b31..966ea63ea74 100644 --- a/debian/control.sid +++ b/debian/control.sid @@ -36,7 +36,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 XS-Python-Version: current diff --git a/debian/control.sid-oracle b/debian/control.sid-oracle index 6d28152fbb4..397af78080f 100644 --- a/debian/control.sid-oracle +++ b/debian/control.sid-oracle @@ -36,7 +36,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base, + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable, oracle-instantclient11.2-devel Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 diff --git a/debian/control.squeeze b/debian/control.squeeze index 2ce83320727..61371888d44 100644 --- a/debian/control.squeeze +++ b/debian/control.squeeze @@ -34,7 +34,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.8.4 XS-Python-Version: current diff --git a/debian/control.wheezy b/debian/control.wheezy index aed173683f2..598277716c3 100644 --- a/debian/control.wheezy +++ b/debian/control.wheezy @@ -36,7 +36,8 @@ Build-Depends: doxygen, graphviz, txt2tags, - xvfb, xauth, xfonts-base + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 XS-Python-Version: current diff --git a/debian/rules b/debian/rules index 554d827e0ac..b435f8c8ef2 100755 --- a/debian/rules +++ b/debian/rules @@ -70,7 +70,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise raring")) +ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy sid lucid maverick natty oneiric precise raring")) CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE endif @@ -236,7 +236,7 @@ binary-arch: build install install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser -ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick precise quantal raring sid sid-oracle")) +ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"natty oneiric")) dh_sip endif ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid quantal raring"))