Skip to content

Commit c2c233e

Browse files
author
jef
committedMar 27, 2011
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk@15618 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 42831e6 commit c2c233e

File tree

10 files changed

+78
-9
lines changed

10 files changed

+78
-9
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ qgis (1.7.0) UNRELEASED; urgency=low
66
* drop quickprint and ogrconverter plugin
77
* add gdal provider
88
* turn qgis-providers-common's architecture to all
9+
* include api documentation
910
* Missing ${python:Depends} added to python-qgis dependencies
1011
(closes: #611492)
1112
* move qgis_help to /usr/lib/qgis (closes: #615833)
1213

13-
-- Jürgen E. Fischer <jef@norbit.de> Tue, 08 Mar 2011 23:24:24 +0100
14+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 24 Mar 2011 00:24:01 +0100
1415

1516
qgis (1.6.0) UNRELEASED; urgency=low
1617

‎debian/control.intrepid

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1111
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12-
subversion
12+
subversion, doxygen, graphviz, txt2tags
1313
Build-Conflicts: libqgis-dev, qgis-dev
1414
Standards-Version: 3.8.0
1515
XS-Python-Version: current
@@ -146,3 +146,11 @@ Description: Quantum GIS mapserver
146146
.
147147
This package contains the Quantum GIS mapserver.
148148

149+
Package: qgis-api-doc
150+
Architecture: all
151+
Description: Quantum GIS API documentation
152+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
153+
and display databases of geographic information.
154+
.
155+
This package contains the Quantum GIS API documentation.
156+

‎debian/control.jaunty

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1111
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12-
subversion
12+
subversion, doxygen, graphviz, txt2tags
1313
Build-Conflicts: libqgis-dev, qgis-dev
1414
Standards-Version: 3.8.0
1515
XS-Python-Version: current
@@ -146,3 +146,10 @@ Description: Quantum GIS mapserver
146146
.
147147
This package contains the Quantum GIS mapserver.
148148

149+
Package: qgis-api-doc
150+
Architecture: all
151+
Description: Quantum GIS API documentation
152+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
153+
and display databases of geographic information.
154+
.
155+
This package contains the Quantum GIS API documentation.

‎debian/control.karmic

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1111
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12-
subversion
12+
subversion, doxygen, graphviz, txt2tags
1313
Build-Conflicts: libqgis-dev, qgis-dev
1414
Standards-Version: 3.8.0
1515
XS-Python-Version: current
@@ -146,3 +146,11 @@ Description: Quantum GIS mapserver
146146
.
147147
This package contains the Quantum GIS mapserver.
148148

149+
Package: qgis-api-doc
150+
Architecture: all
151+
Description: Quantum GIS API documentation
152+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
153+
and display databases of geographic information.
154+
.
155+
This package contains the Quantum GIS API documentation.
156+

‎debian/control.lenny

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Build-Depends:
2828
python-sip4-dev (>= 4.5.0),
2929
sip4 (>= 4.5),
3030
subversion,
31+
doxygen,
32+
graphviz,
3133
txt2tags
3234
Build-Conflicts: libqgis-dev, qgis-dev
3335
Standards-Version: 3.8.0
@@ -182,3 +184,11 @@ Description: Quantum GIS sql anywhere plugin and provider
182184
.
183185
This package contains the Quantum GIS sqlanywhere plugin and provider.
184186

187+
Package: qgis-api-doc
188+
Architecture: all
189+
Description: Quantum GIS API documentation
190+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
191+
and display databases of geographic information.
192+
.
193+
This package contains the Quantum GIS API documentation.
194+

‎debian/control.lucid

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Build-Depends:
2929
python-sip (>= 4.5.0),
3030
python-sip-dev (>= 4.5.0),
3131
subversion,
32+
doxygen,
33+
graphviz,
3234
txt2tags
3335
Build-Conflicts: libqgis-dev, qgis-dev
3436
Standards-Version: 3.8.4
@@ -183,3 +185,10 @@ Description: Quantum GIS sql anywhere plugin and provider
183185
.
184186
This package contains the Quantum GIS sqlanywhere plugin and provider.
185187

188+
Package: qgis-api-doc
189+
Architecture: all
190+
Description: Quantum GIS API documentation
191+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
192+
and display databases of geographic information.
193+
.
194+
This package contains the Quantum GIS API documentation.

‎debian/control.maverick

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Build-Depends:
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
3232
subversion,
33+
doxygen,
34+
graphviz,
3335
txt2tags
3436
Build-Conflicts: libqgis-dev, qgis-dev
3537
Standards-Version: 3.8.4
@@ -184,3 +186,10 @@ Description: Quantum GIS sql anywhere plugin and provider
184186
.
185187
This package contains the Quantum GIS sqlanywhere plugin and provider.
186188

189+
Package: qgis-api-doc
190+
Architecture: all
191+
Description: Quantum GIS API documentation
192+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
193+
and display databases of geographic information.
194+
.
195+
This package contains the Quantum GIS API documentation.

‎debian/control.natty

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Build-Depends:
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
3232
subversion,
33+
doxygen,
34+
graphviz,
3335
txt2tags
3436
Build-Conflicts: libqgis-dev, qgis-dev
3537
Standards-Version: 3.8.4
@@ -184,3 +186,11 @@ Description: Quantum GIS sql anywhere plugin and provider
184186
.
185187
This package contains the Quantum GIS sqlanywhere plugin and provider.
186188

189+
Package: qgis-api-doc
190+
Architecture: all
191+
Description: Quantum GIS API documentation
192+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
193+
and display databases of geographic information.
194+
.
195+
This package contains the Quantum GIS API documentation.
196+

‎debian/control.squeeze

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Build-Depends:
2929
python-sip (>= 4.5.0),
3030
python-sip-dev (>= 4.5.0),
3131
subversion,
32+
doxygen,
33+
graphviz,
3234
txt2tags
3335
Build-Conflicts: libqgis-dev, qgis-dev
3436
Standards-Version: 3.8.4
@@ -183,3 +185,11 @@ Description: Quantum GIS sql anywhere plugin and provider
183185
.
184186
This package contains the Quantum GIS sqlanywhere plugin and provider.
185187

188+
Package: qgis-api-doc
189+
Architecture: all
190+
Description: Quantum GIS API documentation
191+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
192+
and display databases of geographic information.
193+
.
194+
This package contains the Quantum GIS API documentation.
195+

‎debian/rules

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@ CMAKE_OPTS := \
2929
-D PEDANTIC=TRUE \
3030
-D WITH_SPATIALITE=TRUE \
3131
-D WITH_MAPSERVER=TRUE \
32-
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin
33-
34-
ifneq (,$(findstring $(DISTRIBUTION),"sid"))
35-
CMAKE_OPTS += -D WITH_APIDOC=TRUE
36-
endif
32+
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
33+
-D WITH_APIDOC=TRUE
3734

3835
ifneq (,$(findstring $(DISTRIBUTION),"natty"))
3936
CMAKE_OPTS += -D QT_QTWEBKIT_INCLUDE_DIR=/usr/include/QtWebKit

0 commit comments

Comments
 (0)
Please sign in to comment.