[QGIS Commit] r15350 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-05 18:14:27 -0800 (Sat, 05 Mar 2011)
New Revision: 15350

Added:
   trunk/qgis/debian/qgis-apidoc.dirs
Removed:
   trunk/qgis/debian/docs
Modified:
   trunk/qgis/debian/control.lenny
   trunk/qgis/debian/control.lucid
   trunk/qgis/debian/control.maverick
   trunk/qgis/debian/control.natty
   trunk/qgis/debian/control.sid
   trunk/qgis/debian/control.squeeze
   trunk/qgis/debian/qgis-common.install
   trunk/qgis/debian/rules
Log:
debian packaging update

Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/control.lenny	2011-03-06 02:14:27 UTC (rev 15350)
@@ -27,7 +27,8 @@
  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

Modified: trunk/qgis/debian/control.lucid
===================================================================
--- trunk/qgis/debian/control.lucid	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/control.lucid	2011-03-06 02:14:27 UTC (rev 15350)
@@ -28,7 +28,8 @@
  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

Modified: trunk/qgis/debian/control.maverick
===================================================================
--- trunk/qgis/debian/control.maverick	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/control.maverick	2011-03-06 02:14:27 UTC (rev 15350)
@@ -29,7 +29,8 @@
  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

Modified: trunk/qgis/debian/control.natty
===================================================================
--- trunk/qgis/debian/control.natty	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/control.natty	2011-03-06 02:14:27 UTC (rev 15350)
@@ -29,7 +29,8 @@
  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

Modified: trunk/qgis/debian/control.sid
===================================================================
--- trunk/qgis/debian/control.sid	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/control.sid	2011-03-06 02:14:27 UTC (rev 15350)
@@ -28,7 +28,9 @@
  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 @@
  .
  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.
+

Modified: trunk/qgis/debian/control.squeeze
===================================================================
--- trunk/qgis/debian/control.squeeze	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/control.squeeze	2011-03-06 02:14:27 UTC (rev 15350)
@@ -28,7 +28,8 @@
  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

Deleted: trunk/qgis/debian/docs
===================================================================
--- trunk/qgis/debian/docs	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/docs	2011-03-06 02:14:27 UTC (rev 15350)
@@ -1,4 +0,0 @@
-AUTHORS
-BUGS
-README
-TODO

Added: trunk/qgis/debian/qgis-apidoc.dirs
===================================================================
--- trunk/qgis/debian/qgis-apidoc.dirs	                        (rev 0)
+++ trunk/qgis/debian/qgis-apidoc.dirs	2011-03-06 02:14:27 UTC (rev 15350)
@@ -0,0 +1 @@
+usr/share/qgis/doc/api

Modified: trunk/qgis/debian/qgis-common.install
===================================================================
--- trunk/qgis/debian/qgis-common.install	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/qgis-common.install	2011-03-06 02:14:27 UTC (rev 15350)
@@ -7,6 +7,11 @@
 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/*

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2011-03-06 02:10:40 UTC (rev 15349)
+++ trunk/qgis/debian/rules	2011-03-06 02:14:27 UTC (rev 15350)
@@ -31,6 +31,10 @@
 	-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