[QGIS Commit] r8795 - branches/Release-0_11_0/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-07-16 18:56:57 -0400 (Wed, 16 Jul 2008)
New Revision: 8795

Removed:
   branches/Release-0_11_0/debian/libqgispython0.11.install
Modified:
   branches/Release-0_11_0/debian/changelog
   branches/Release-0_11_0/debian/control
   branches/Release-0_11_0/debian/libqgis1-dev.install
   branches/Release-0_11_0/debian/python-qgis.install
Log:
fix debian packaging

Modified: branches/Release-0_11_0/debian/changelog
===================================================================
--- branches/Release-0_11_0/debian/changelog	2008-07-16 19:16:36 UTC (rev 8794)
+++ branches/Release-0_11_0/debian/changelog	2008-07-16 22:56:57 UTC (rev 8795)
@@ -1,3 +1,16 @@
+qgis (0.11.0-1) stable; urgency=low
+
+  * libqgispython0.11 integrated into python-qgis
+  * introduced a build conflict with libqgis1-dev
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Wed, 16 Jul 2008 22:42:11 +0200
+
+qgis (0.11.0) stable; urgency=low
+
+  * New upstream release: Quantum GIS 0.11.0 'Metis'
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Tue, 15 Jul 2008 20:41:12 +0200
+
 qgis (0.11.0test3) experimental; urgency=low
 
   * add memory provider

Modified: branches/Release-0_11_0/debian/control
===================================================================
--- branches/Release-0_11_0/debian/control	2008-07-16 19:16:36 UTC (rev 8794)
+++ branches/Release-0_11_0/debian/control	2008-07-16 22:56:57 UTC (rev 8795)
@@ -9,6 +9,7 @@
  libqt4-qt3support (>=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), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev
+Build-Conflicts: libqgis1-dev
 Standards-Version: 3.7.3
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -58,8 +59,7 @@
  libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.2.0), libqgispython0.11, libqgisgrass0.11, libqgis-gui0.11,
- libqgis-core0.11
+ qt4-designer (>=4.2.0), libqgisgrass0.11, libqgis-gui0.11, libqgis-core0.11
 Provides: libqgis-dev
 Conflicts: libqgis-dev, qgis-dev
 Replaces: qgis-dev
@@ -89,8 +89,9 @@
 Package: python-qgis
 Section: python
 Architecture: any
-Depends: libqgispython0.11, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
+Replaces: libqgispython0.11
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -98,12 +99,3 @@
  .
  This package contains the files for the Python support.
 
-Package: libqgispython0.11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-XB-Python-Version: ${python:Versions}
-Description: Quantum GIS - shared Python library
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
- .
- This package contains the shared library for the Python support.

Modified: branches/Release-0_11_0/debian/libqgis1-dev.install
===================================================================
--- branches/Release-0_11_0/debian/libqgis1-dev.install	2008-07-16 19:16:36 UTC (rev 8794)
+++ branches/Release-0_11_0/debian/libqgis1-dev.install	2008-07-16 22:56:57 UTC (rev 8795)
@@ -1,5 +1,4 @@
 usr/include/qgis/*
-usr/lib/libqgispython.so
 usr/lib/libqgisgrass.so
 usr/lib/libqgis_gui.so
 usr/lib/libqgis_core.so

Deleted: branches/Release-0_11_0/debian/libqgispython0.11.install
===================================================================
--- branches/Release-0_11_0/debian/libqgispython0.11.install	2008-07-16 19:16:36 UTC (rev 8794)
+++ branches/Release-0_11_0/debian/libqgispython0.11.install	2008-07-16 22:56:57 UTC (rev 8795)
@@ -1 +0,0 @@
-usr/lib/libqgispython.so.*

Modified: branches/Release-0_11_0/debian/python-qgis.install
===================================================================
--- branches/Release-0_11_0/debian/python-qgis.install	2008-07-16 19:16:36 UTC (rev 8794)
+++ branches/Release-0_11_0/debian/python-qgis.install	2008-07-16 22:56:57 UTC (rev 8795)
@@ -2,3 +2,4 @@
 usr/lib/python*/site-packages/qgis/__init__.py
 usr/lib/python*/site-packages/qgis/qgisconfig.py
 usr/lib/python*/site-packages/qgis/*.so
+usr/lib/libqgispython.so*