Merge branch 'master' of github.com:qgis/Quantum-GIS

Author: timlinux

debian/changelog

@@ -2,8 +2,10 @@ qgis (1.8.0) UNRELEASED; urgency=low
 
   * new development version 1.8 after branch
   * add qgis browser (qbrowser)
+  * add zonal statistics plugins and globe plugin
+  * migrate unstable package to dh_python2
 
- -- Jürgen E. Fischer <jef@norbit.de>  Mon, 23 May 2011 18:08:18 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 11 Aug 2011 14:22:11 +0200
 
 qgis (1.7.0) UNRELEASED; urgency=low
 

debian/control.sid

@@ -23,12 +23,13 @@ Build-Depends:
  pkg-config,
  pyqt4-dev-tools,
  python,
- python-central (>=0.5),
- python-dev,
+ python-dev (>= 2.6.6-3~),
  python-qt4 (>=4.1.0),
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
+ libosgearth-dev,
+ libopenscenegraph-dev,
  git,
  doxygen,
  graphviz,
@@ -41,7 +42,7 @@ Homepage: http://qgis.org/
 Package: qgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
-Recommends: qgis-plugin-grass, python-qgis
+Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
@@ -59,7 +60,7 @@ Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
  .
- This package contains architecture-independent supporting data files for use 
+ This package contains architecture-independent supporting data files for use
  with Quantum GIS.
 
 Package: libqgis{QGIS_ABI}
@@ -111,8 +112,8 @@ Description: GRASS plugin for Quantum GIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: ${python:Depends}
 Replaces: qgis-common (<< 1.5)
+Depends: python
 Breaks: qgis-common (<< 1.5)
 Description: GRASS plugin for Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -124,9 +125,8 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
 Package: python-qgis
 Section: python
 Architecture: any
-Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -137,8 +137,7 @@ Package: python-qgis-common
 Section: python
 Architecture: all
 Provides: ${python:Provides}
-Depends: gdal-bin, python-gdal, ${python:Depends}
-XB-Python-Version: ${python:Versions}
+Depends: gdal-bin, python-gdal
 Description: Python bindings to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -195,3 +194,21 @@ Description: Quantum GIS API documentation
  .
  This package contains the Quantum GIS API documentation.
 
+Package: qgis-plugin-globe
+Architecture: any
+Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: OSG globe plugin for Quantum GIS
+ Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
+ and display databases of geographic information.
+ .
+ This plugin enables 3D viewing using OSG globe in the Quantum GIS.
+
+Package: qgis-plugin-globe-common
+Architecture: all
+Description: OSG GLOBE plugin for Quantum GIS - architecture-independent data
+ Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
+ and display databases of geographic information.
+ .
+ This package contains architecture-independent supporting data files for use
+ with the Quantum GIS GLOBE plugin.
+

debian/libqgis{QGIS_ABI}.lintian-overrides

@@ -1,3 +1,2 @@
-libqgis{QGIS_ABI}: shlib-calls-exit
 libqgis{QGIS_ABI}: package-name-doesnt-match-sonames
 libqgis{QGIS_ABI}: no-symbols-control-file

debian/qgis-plugin-globe-common.install

@@ -0,0 +1 @@
+usr/share/qgis/globe

debian/qgis-plugin-globe.install

@@ -0,0 +1 @@
+usr/lib/qgis/plugins/libglobeplugin.so

debian/qgis.install

@@ -17,6 +17,7 @@ usr/lib/qgis/plugins/libspatialqueryplugin.so
 usr/lib/qgis/plugins/libdisplacementplugin.so
 usr/lib/qgis/plugins/libofflineeditingplugin.so
 usr/lib/qgis/plugins/libroadgraphplugin.so
+usr/lib/qgis/plugins/libzonalstatisticsplugin.so
 usr/lib/qgis/qgis_help
 usr/share/pixmaps/qgis-icon.xpm
 usr/share/pixmaps/qgis-mime-icon.png

debian/rules

@@ -42,6 +42,10 @@ endif
 #	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
 #endif
 
+ifneq (,$(findstring $(DISTRIBUTION),"sid"))
+	CMAKE_OPTS += -D WITH_GLOBE=TRUE
+endif
+
 ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
 LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
 endif
@@ -160,7 +164,11 @@ binary-arch: build install
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
 
+ifneq (,$(findstring $(DISTRIBUTION),"sid"))
+	dh_python2 --no-guessing-versions
+else
 	dh_pycentral
+endif
 	dh_installmenu
 	dh_icons
 ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))