Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk@15618 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 27, 2011
1 parent 42831e6 commit c2c233e
Show file tree
Hide file tree
Showing 10 changed files with 78 additions and 9 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -6,11 +6,12 @@ qgis (1.7.0) UNRELEASED; urgency=low
* drop quickprint and ogrconverter plugin
* add gdal provider
* turn qgis-providers-common's architecture to all
* include api documentation
* Missing ${python:Depends} added to python-qgis dependencies
(closes: #611492)
* move qgis_help to /usr/lib/qgis (closes: #615833)

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

qgis (1.6.0) UNRELEASED; urgency=low

Expand Down
10 changes: 9 additions & 1 deletion debian/control.intrepid
Expand Up @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
subversion
subversion, doxygen, graphviz, txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Expand Down Expand Up @@ -146,3 +146,11 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-api-doc
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.

9 changes: 8 additions & 1 deletion debian/control.jaunty
Expand Up @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
subversion
subversion, doxygen, graphviz, txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Expand Down Expand Up @@ -146,3 +146,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-api-doc
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.
10 changes: 9 additions & 1 deletion debian/control.karmic
Expand Up @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
subversion
subversion, doxygen, graphviz, txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Expand Down Expand Up @@ -146,3 +146,11 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-api-doc
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.

10 changes: 10 additions & 0 deletions debian/control.lenny
Expand Up @@ -28,6 +28,8 @@ Build-Depends:
python-sip4-dev (>= 4.5.0),
sip4 (>= 4.5),
subversion,
doxygen,
graphviz,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
Expand Down Expand Up @@ -182,3 +184,11 @@ Description: Quantum GIS sql anywhere plugin and provider
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
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.

9 changes: 9 additions & 0 deletions debian/control.lucid
Expand Up @@ -29,6 +29,8 @@ Build-Depends:
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion,
doxygen,
graphviz,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
Expand Down Expand Up @@ -183,3 +185,10 @@ Description: Quantum GIS sql anywhere plugin and provider
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
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.
9 changes: 9 additions & 0 deletions debian/control.maverick
Expand Up @@ -30,6 +30,8 @@ Build-Depends:
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion,
doxygen,
graphviz,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
Expand Down Expand Up @@ -184,3 +186,10 @@ Description: Quantum GIS sql anywhere plugin and provider
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
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.
10 changes: 10 additions & 0 deletions debian/control.natty
Expand Up @@ -30,6 +30,8 @@ Build-Depends:
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion,
doxygen,
graphviz,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
Expand Down Expand Up @@ -184,3 +186,11 @@ Description: Quantum GIS sql anywhere plugin and provider
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
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.

10 changes: 10 additions & 0 deletions debian/control.squeeze
Expand Up @@ -29,6 +29,8 @@ Build-Depends:
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
subversion,
doxygen,
graphviz,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
Expand Down Expand Up @@ -183,3 +185,11 @@ Description: Quantum GIS sql anywhere plugin and provider
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
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.

7 changes: 2 additions & 5 deletions debian/rules
Expand Up @@ -29,11 +29,8 @@ CMAKE_OPTS := \
-D PEDANTIC=TRUE \
-D WITH_SPATIALITE=TRUE \
-D WITH_MAPSERVER=TRUE \
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin

ifneq (,$(findstring $(DISTRIBUTION),"sid"))
CMAKE_OPTS += -D WITH_APIDOC=TRUE
endif
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-D WITH_APIDOC=TRUE

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

0 comments on commit c2c233e

Please sign in to comment.