debian packaging update

jef · jef · commit d4e8681f6fef · 2011-03-27T16:02:14.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15618 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/debian/changelog b/debian/changelog
@@ -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
 
diff --git a/debian/control.intrepid b/debian/control.intrepid
@@ -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
@@ -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.
+
diff --git a/debian/control.jaunty b/debian/control.jaunty
@@ -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
@@ -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.
diff --git a/debian/control.karmic b/debian/control.karmic
@@ -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
@@ -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.
+
diff --git a/debian/control.lenny b/debian/control.lenny
@@ -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
@@ -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.
+
diff --git a/debian/control.lucid b/debian/control.lucid
@@ -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
@@ -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.
diff --git a/debian/control.maverick b/debian/control.maverick
@@ -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
@@ -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.
diff --git a/debian/control.natty b/debian/control.natty
@@ -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
@@ -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.
+
diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -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
@@ -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.
+
diff --git a/debian/rules b/debian/rules
@@ -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
