[QGIS Commit] r15618 - trunk/qgis/debian

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sun Mar 27 12:02:14 EDT 2011 

Author: jef
Date: 2011-03-27 09:02:14 -0700 (Sun, 27 Mar 2011)
New Revision: 15618

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control.intrepid
   trunk/qgis/debian/control.jaunty
   trunk/qgis/debian/control.karmic
   trunk/qgis/debian/control.lenny
   trunk/qgis/debian/control.lucid
   trunk/qgis/debian/control.maverick
   trunk/qgis/debian/control.natty
   trunk/qgis/debian/control.squeeze
   trunk/qgis/debian/rules
Log:
debian packaging update

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/changelog	2011-03-27 16:02:14 UTC (rev 15618)
@@ -6,11 +6,12 @@
   * 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 at norbit.de>  Tue, 08 Mar 2011 23:24:24 +0100
+ -- Jürgen E. Fischer <jef at norbit.de>  Thu, 24 Mar 2011 00:24:01 +0100
 
 qgis (1.6.0) UNRELEASED; urgency=low
 

Modified: trunk/qgis/debian/control.intrepid
===================================================================
--- trunk/qgis/debian/control.intrepid	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.intrepid	2011-03-27 16:02:14 UTC (rev 15618)
@@ -9,7 +9,7 @@
  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 @@
  .
  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.
+

Modified: trunk/qgis/debian/control.jaunty
===================================================================
--- trunk/qgis/debian/control.jaunty	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.jaunty	2011-03-27 16:02:14 UTC (rev 15618)
@@ -9,7 +9,7 @@
  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 @@
  .
  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.

Modified: trunk/qgis/debian/control.karmic
===================================================================
--- trunk/qgis/debian/control.karmic	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.karmic	2011-03-27 16:02:14 UTC (rev 15618)
@@ -9,7 +9,7 @@
  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 @@
  .
  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.
+

Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.lenny	2011-03-27 16:02:14 UTC (rev 15618)
@@ -28,6 +28,8 @@
  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 @@
  .
  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.
+

Modified: trunk/qgis/debian/control.lucid
===================================================================
--- trunk/qgis/debian/control.lucid	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.lucid	2011-03-27 16:02:14 UTC (rev 15618)
@@ -29,6 +29,8 @@
  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 @@
  .
  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.

Modified: trunk/qgis/debian/control.maverick
===================================================================
--- trunk/qgis/debian/control.maverick	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.maverick	2011-03-27 16:02:14 UTC (rev 15618)
@@ -30,6 +30,8 @@
  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 @@
  .
  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.

Modified: trunk/qgis/debian/control.natty
===================================================================
--- trunk/qgis/debian/control.natty	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.natty	2011-03-27 16:02:14 UTC (rev 15618)
@@ -30,6 +30,8 @@
  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 @@
  .
  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.
+

Modified: trunk/qgis/debian/control.squeeze
===================================================================
--- trunk/qgis/debian/control.squeeze	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/control.squeeze	2011-03-27 16:02:14 UTC (rev 15618)
@@ -29,6 +29,8 @@
  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 @@
  .
  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.
+

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2011-03-27 15:55:13 UTC (rev 15617)
+++ trunk/qgis/debian/rules	2011-03-27 16:02:14 UTC (rev 15618)
@@ -29,12 +29,9 @@
 	-D PEDANTIC=TRUE \
 	-D WITH_SPATIALITE=TRUE \
 	-D WITH_MAPSERVER=TRUE \
-	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin
+	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
+	-D WITH_APIDOC=TRUE
 
-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

More information about the QGIS-commit mailing list