[QGIS Commit] r15357 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-06 00:58:09 -0800 (Sun, 06 Mar 2011)
New Revision: 15357

Added:
   trunk/qgis/debian/qgis-api-doc.install
Removed:
   trunk/qgis/debian/qgis-apidoc.dirs
Modified:
   trunk/qgis/debian/control
   trunk/qgis/debian/control.sid
   trunk/qgis/debian/qgis-common.install
Log:
debian packaging fix

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2011-03-06 08:46:40 UTC (rev 15356)
+++ trunk/qgis/debian/control	2011-03-06 08:58:09 UTC (rev 15357)
@@ -24,7 +24,9 @@
  python-dev,
  python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
- subversion
+ subversion,
+ txt2tags,
+ doxygen
 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 08:46:40 UTC (rev 15356)
+++ trunk/qgis/debian/control.sid	2011-03-06 08:58:09 UTC (rev 15357)
@@ -175,7 +175,7 @@
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-apidoc
+Package: qgis-api-doc
 Architecture: all
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

Copied: trunk/qgis/debian/qgis-api-doc.install (from rev 15355, trunk/qgis/debian/qgis-apidoc.dirs)
===================================================================
--- trunk/qgis/debian/qgis-api-doc.install	                        (rev 0)
+++ trunk/qgis/debian/qgis-api-doc.install	2011-03-06 08:58:09 UTC (rev 15357)
@@ -0,0 +1 @@
+usr/share/qgis/doc/api

Deleted: trunk/qgis/debian/qgis-apidoc.dirs
===================================================================
--- trunk/qgis/debian/qgis-apidoc.dirs	2011-03-06 08:46:40 UTC (rev 15356)
+++ trunk/qgis/debian/qgis-apidoc.dirs	2011-03-06 08:58:09 UTC (rev 15357)
@@ -1 +0,0 @@
-usr/share/qgis/doc/api

Modified: trunk/qgis/debian/qgis-common.install
===================================================================
--- trunk/qgis/debian/qgis-common.install	2011-03-06 08:46:40 UTC (rev 15356)
+++ trunk/qgis/debian/qgis-common.install	2011-03-06 08:58:09 UTC (rev 15357)
@@ -7,11 +7,8 @@
 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/INSTALL
+usr/share/qgis/doc/INSTALL.html
 usr/share/qgis/doc/images
 usr/share/qgis/i18n/*
 usr/share/qgis/images/*