debian packaging updates

qgis · Jul 20, 2013 · 443a7ae · 443a7ae
1 parent 0150799
commit 443a7ae
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 14 deletions.
diff --git 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 <jef@norbit.de>  Sun, 02 Jun 2013 11:52:24 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"))