[QGIS Commit] r8541 - trunk/qgis/debian
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed May 28 19:00:37 EDT 2008
Author: jef
Date: 2008-05-28 19:00:37 -0400 (Wed, 28 May 2008)
New Revision: 8541
Added:
trunk/qgis/debian/libqgis-core0.11.install
trunk/qgis/debian/libqgis-gui0.11.install
trunk/qgis/debian/libqgisgrass0.11.install
trunk/qgis/debian/libqgispython0.11.install
trunk/qgis/debian/qgis-python-support.install
Removed:
trunk/qgis/debian/libqgis-core0.10.install
trunk/qgis/debian/libqgis-gui0.10.install
trunk/qgis/debian/libqgisgrass0.10.install
Modified:
trunk/qgis/debian/changelog
trunk/qgis/debian/control
trunk/qgis/debian/qgis.install
trunk/qgis/debian/rules
Log:
package python support seperately in debian
Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog 2008-05-28 22:59:11 UTC (rev 8540)
+++ trunk/qgis/debian/changelog 2008-05-28 23:00:37 UTC (rev 8541)
@@ -1,3 +1,12 @@
+qgis (0.11.0test1) experimental; urgency=low
+
+ * raised abi from 0.10 to 0.11
+ * separate packages for python support
+ * raised dependency from python-qt4* from 4.0.0 to 4.1.0
+ * call cmake with -Wno-dev
+
+ -- Jürgen E. Fischer <jef at norbit.de> Thu, 29 May 2008 00:23:14 +0200
+
qgis (0.10.0-2) gutsy; urgency=low
* fix libgdal1 grass depenency for ubuntu gutsy/hardy (1.4.0 | 1.5.0)
Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control 2008-05-28 22:59:11 UTC (rev 8540)
+++ trunk/qgis/debian/control 2008-05-28 23:00:37 UTC (rev 8541)
@@ -6,7 +6,7 @@
libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
sharutils, sip4 (>= 4.5), 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.0.0), python-qt4-dev (>=4.0.0),
+ 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
Standards-Version: 3.7.2
@@ -16,8 +16,7 @@
Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: qgis-plugin-grass
-XB-Python-Version: ${python:Versions}
+Suggests: qgis-plugin-grass, qgis-python-plugin
Description: Geographic Information System (GIS)
A Geographic Information System (GIS) manages,
analyzes, and displays databases of geographic
@@ -30,7 +29,7 @@
Elevation Model (DEM) formats including
GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM.
-Package: libqgis-core0.10
+Package: libqgis-core0.11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1)
@@ -43,7 +42,7 @@
This package contains the shared core library that
provides an interface for plugins.
-Package: libqgis-gui0.10
+Package: libqgis-gui0.11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1)
@@ -59,7 +58,7 @@
Package: libqgis1-dev
Architecture: any
Section: libdevel
-Depends: qgis (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, 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.0.0), python-qt4-dev (>=4.0.0), qt4-designer (>=4.2.0)
+Depends: qgis (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, 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)
Provides: libqgis-dev
Conflicts: libqgis-dev, qgis-dev
Replaces: qgis-dev
@@ -78,7 +77,7 @@
This plugin enables a GRASS data access toolbox in the QGIS
geographic data viewer.
-Package: libqgisgrass0.10
+Package: libqgisgrass0.11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: QGIS Geographic Information System - shared grass library
@@ -87,3 +86,25 @@
geographic information.
.
This package contains the shared library for the grass plugin.
+
+Package: qgis-python-support
+Architecture: any
+Depends: libqgispython0.11, ${shlibs:Depends}, ${misc:Depends}
+XB-Python-Version: ${python:Versions}
+Description: QGIS Geographic Information System - python support
+ QGIS is a Geographic Information System (GIS)
+ which manages, analyzes and display databases of
+ geographic information.
+ .
+ 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: QGIS Geographic Information System - shared python library
+ QGIS 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.
Deleted: trunk/qgis/debian/libqgis-core0.10.install
===================================================================
--- trunk/qgis/debian/libqgis-core0.10.install 2008-05-28 22:59:11 UTC (rev 8540)
+++ trunk/qgis/debian/libqgis-core0.10.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -1 +0,0 @@
-usr/lib/libqgis_core.so*
Copied: trunk/qgis/debian/libqgis-core0.11.install (from rev 8440, trunk/qgis/debian/libqgis-core0.10.install)
===================================================================
--- trunk/qgis/debian/libqgis-core0.11.install (rev 0)
+++ trunk/qgis/debian/libqgis-core0.11.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -0,0 +1 @@
+usr/lib/libqgis_core.so*
Deleted: trunk/qgis/debian/libqgis-gui0.10.install
===================================================================
--- trunk/qgis/debian/libqgis-gui0.10.install 2008-05-28 22:59:11 UTC (rev 8540)
+++ trunk/qgis/debian/libqgis-gui0.10.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -1 +0,0 @@
-usr/lib/libqgis_gui.so*
Copied: trunk/qgis/debian/libqgis-gui0.11.install (from rev 8440, trunk/qgis/debian/libqgis-gui0.10.install)
===================================================================
--- trunk/qgis/debian/libqgis-gui0.11.install (rev 0)
+++ trunk/qgis/debian/libqgis-gui0.11.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -0,0 +1 @@
+usr/lib/libqgis_gui.so*
Deleted: trunk/qgis/debian/libqgisgrass0.10.install
===================================================================
--- trunk/qgis/debian/libqgisgrass0.10.install 2008-05-28 22:59:11 UTC (rev 8540)
+++ trunk/qgis/debian/libqgisgrass0.10.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -1,2 +0,0 @@
-usr/lib/libqgisgrass.so
-usr/lib/libqgisgrass.so.*
Copied: trunk/qgis/debian/libqgisgrass0.11.install (from rev 8440, trunk/qgis/debian/libqgisgrass0.10.install)
===================================================================
--- trunk/qgis/debian/libqgisgrass0.11.install (rev 0)
+++ trunk/qgis/debian/libqgisgrass0.11.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -0,0 +1,2 @@
+usr/lib/libqgisgrass.so
+usr/lib/libqgisgrass.so.*
Added: trunk/qgis/debian/libqgispython0.11.install
===================================================================
--- trunk/qgis/debian/libqgispython0.11.install (rev 0)
+++ trunk/qgis/debian/libqgispython0.11.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -0,0 +1 @@
+usr/lib/libqgispython.so*
Added: trunk/qgis/debian/qgis-python-support.install
===================================================================
--- trunk/qgis/debian/qgis-python-support.install (rev 0)
+++ trunk/qgis/debian/qgis-python-support.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -0,0 +1,4 @@
+usr/share/qgis/python/*
+usr/lib/python*/site-packages/qgis/__init__.py
+usr/lib/python*/site-packages/qgis/qgisconfig.py
+usr/lib/python*/site-packages/qgis/*.so
Modified: trunk/qgis/debian/qgis.install
===================================================================
--- trunk/qgis/debian/qgis.install 2008-05-28 22:59:11 UTC (rev 8540)
+++ trunk/qgis/debian/qgis.install 2008-05-28 23:00:37 UTC (rev 8541)
@@ -31,7 +31,3 @@
usr/lib/qgis/libwfsplugin.so
usr/lib/qgis/libwfsprovider.so
usr/lib/qgis/libwmsprovider.so
-usr/share/qgis/python/*
-usr/lib/python*/site-packages/qgis/__init__.py
-usr/lib/python*/site-packages/qgis/qgisconfig.py
-usr/lib/python*/site-packages/qgis/*.so
Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules 2008-05-28 22:59:11 UTC (rev 8540)
+++ trunk/qgis/debian/rules 2008-05-28 23:00:37 UTC (rev 8541)
@@ -32,6 +32,7 @@
[ -d debian/build ] || mkdir debian/build
[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
cd debian/build; cmake \
+ -Wno-dev \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_SKIP_RPATH=TRUE \
-D BINDINGS_GLOBAL_INSTALL=TRUE \
More information about the QGIS-commit
mailing list