Skip to content

Commit 0620d74

Browse files
author
jef
committed
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15350 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ee30725 commit 0620d74

10 files changed

+31
-10
lines changed

debian/control.lenny

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Build-Depends:
2727
python-qt4-dev (>=4.1.0),
2828
python-sip4-dev (>= 4.5.0),
2929
sip4 (>= 4.5),
30-
subversion
30+
subversion,
31+
txt2tags
3132
Build-Conflicts: libqgis-dev, qgis-dev
3233
Standards-Version: 3.8.0
3334
XS-Python-Version: current

debian/control.lucid

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ Build-Depends:
2828
python-qt4-dev (>=4.1.0),
2929
python-sip (>= 4.5.0),
3030
python-sip-dev (>= 4.5.0),
31-
subversion
31+
subversion,
32+
txt2tags
3233
Build-Conflicts: libqgis-dev, qgis-dev
3334
Standards-Version: 3.8.4
3435
XS-Python-Version: current

debian/control.maverick

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ Build-Depends:
2929
python-qt4-dev (>=4.1.0),
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
32-
subversion
32+
subversion,
33+
txt2tags
3334
Build-Conflicts: libqgis-dev, qgis-dev
3435
Standards-Version: 3.8.4
3536
XS-Python-Version: current

debian/control.natty

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ Build-Depends:
2929
python-qt4-dev (>=4.1.0),
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
32-
subversion
32+
subversion,
33+
txt2tags
3334
Build-Conflicts: libqgis-dev, qgis-dev
3435
Standards-Version: 3.8.4
3536
XS-Python-Version: current

debian/control.sid

+11-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ Build-Depends:
2828
python-qt4-dev (>=4.1.0),
2929
python-sip (>= 4.5.0),
3030
python-sip-dev (>= 4.5.0),
31-
subversion
31+
subversion,
32+
doxygen,
33+
txt2tags
3234
Build-Conflicts: libqgis-dev, qgis-dev
3335
Standards-Version: 3.8.4
3436
XS-Python-Version: current
@@ -173,3 +175,11 @@ Description: Quantum GIS mapserver
173175
.
174176
This package contains the Quantum GIS mapserver.
175177

178+
Package: qgis-apidoc
179+
Architecture: all
180+
Description: Quantum GIS API documentation
181+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
182+
and display databases of geographic information.
183+
.
184+
This package contains the Quantum GIS API documentation.
185+

debian/control.squeeze

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ Build-Depends:
2828
python-qt4-dev (>=4.1.0),
2929
python-sip (>= 4.5.0),
3030
python-sip-dev (>= 4.5.0),
31-
subversion
31+
subversion,
32+
txt2tags
3233
Build-Conflicts: libqgis-dev, qgis-dev
3334
Standards-Version: 3.8.4
3435
XS-Python-Version: current

debian/docs

-4
This file was deleted.

debian/qgis-apidoc.dirs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/qgis/doc/api

debian/qgis-common.install

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ usr/share/qgis/doc/SPONSORS
77
usr/share/qgis/doc/CONTRIBUTORS
88
usr/share/qgis/doc/TRANSLATORS
99
usr/share/qgis/doc/DONORS
10+
usr/share/qgis/doc/AUTHORS.html
11+
usr/share/qgis/doc/SPONSORS.html
12+
usr/share/qgis/doc/CONTRIBUTORS.html
13+
usr/share/qgis/doc/TRANSLATORS.html
14+
usr/share/qgis/doc/DONORS.html
1015
usr/share/qgis/doc/images
1116
usr/share/qgis/i18n/*
1217
usr/share/qgis/images/*

debian/rules

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ CMAKE_OPTS := \
3131
-D WITH_MAPSERVER=TRUE \
3232
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin
3333

34+
ifneq (,$(findstring $(DISTRIBUTION),"sid"))
35+
CMAKE_OPTS += -D WITH_APIDOC=TRUE
36+
endif
37+
3438
ifneq (,$(findstring $(DISTRIBUTION),"natty"))
3539
CMAKE_OPTS += -D QT_QTWEBKIT_INCLUDE_DIR=/usr/include/QtWebKit
3640
endif

0 commit comments

Comments
 (0)