mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
debian packaging updates
This commit is contained in:
parent
0150799e78
commit
443a7ae8df
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -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
|
||||
|
||||
|
3
debian/control.lucid
vendored
3
debian/control.lucid
vendored
@ -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
|
||||
|
3
debian/control.maverick
vendored
3
debian/control.maverick
vendored
@ -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
|
||||
|
3
debian/control.natty
vendored
3
debian/control.natty
vendored
@ -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
|
||||
|
3
debian/control.oneiric
vendored
3
debian/control.oneiric
vendored
@ -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
|
||||
|
3
debian/control.precise
vendored
3
debian/control.precise
vendored
@ -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
|
||||
|
3
debian/control.quantal
vendored
3
debian/control.quantal
vendored
@ -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
|
||||
|
3
debian/control.raring
vendored
3
debian/control.raring
vendored
@ -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
|
||||
|
3
debian/control.sid
vendored
3
debian/control.sid
vendored
@ -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
|
||||
|
3
debian/control.sid-oracle
vendored
3
debian/control.sid-oracle
vendored
@ -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
|
||||
|
3
debian/control.squeeze
vendored
3
debian/control.squeeze
vendored
@ -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
|
||||
|
3
debian/control.wheezy
vendored
3
debian/control.wheezy
vendored
@ -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
|
||||
|
4
debian/rules
vendored
4
debian/rules
vendored
@ -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"))
|
||||
|
Loading…
x
Reference in New Issue
Block a user