Skip to content
Permalink
Browse files

debian packaging update

git-svn-id: http://svn.osgeo.org/qgis/trunk@15350 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Mar 6, 2011
1 parent 73d8c9f commit 856185a13b8ac61eaeb61a2fd7b92849373e9a8f
@@ -27,7 +27,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0),
sip4 (>= 4.5),
subversion
subversion,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
@@ -28,7 +28,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion
subversion,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
@@ -29,7 +29,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion
subversion,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
@@ -29,7 +29,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion
subversion,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
@@ -28,7 +28,9 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion
subversion,
doxygen,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
@@ -173,3 +175,11 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-apidoc
Architecture: all
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS API documentation.

@@ -28,7 +28,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion
subversion,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current

This file was deleted.

@@ -0,0 +1 @@
usr/share/qgis/doc/api
@@ -7,6 +7,11 @@ usr/share/qgis/doc/SPONSORS
usr/share/qgis/doc/CONTRIBUTORS
usr/share/qgis/doc/TRANSLATORS
usr/share/qgis/doc/DONORS
usr/share/qgis/doc/AUTHORS.html
usr/share/qgis/doc/SPONSORS.html
usr/share/qgis/doc/CONTRIBUTORS.html
usr/share/qgis/doc/TRANSLATORS.html
usr/share/qgis/doc/DONORS.html
usr/share/qgis/doc/images
usr/share/qgis/i18n/*
usr/share/qgis/images/*
@@ -31,6 +31,10 @@ CMAKE_OPTS := \
-D WITH_MAPSERVER=TRUE \
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin

ifneq (,$(findstring $(DISTRIBUTION),"sid"))
CMAKE_OPTS += -D WITH_APIDOC=TRUE
endif

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

0 comments on commit 856185a

Please sign in to comment.
You can’t perform that action at this time.