Skip to content

Commit

Permalink
debian packaging update
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15350 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 6, 2011
1 parent ee30725 commit 0620d74
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 10 deletions.
3 changes: 2 additions & 1 deletion debian/control.lenny
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion debian/control.lucid
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion debian/control.maverick
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion debian/control.natty
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion debian/control.sid
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.

3 changes: 2 additions & 1 deletion debian/control.squeeze
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions debian/docs

This file was deleted.

1 change: 1 addition & 0 deletions debian/qgis-apidoc.dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/share/qgis/doc/api
5 changes: 5 additions & 0 deletions debian/qgis-common.install
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
4 changes: 4 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0620d74

Please sign in to comment.