Skip to content
Permalink
Browse files

debian packaging update: reenable globe plugin on debian unstable

  • Loading branch information
jef-n committed Jan 18, 2014
1 parent 174577b commit c3a217435098fe1d7ad3eb9b43d3249f4c117562
Showing with 47 additions and 45 deletions.
  1. +2 −2 debian/changelog
  2. +20 −21 debian/control.sid
  3. +20 −21 debian/control.sid-oracle
  4. +5 −1 debian/rules
@@ -4,9 +4,9 @@ qgis (2.1.0) UNRELEASED; urgency=low
* drop qgis_icon.xpm and use "upstream" version
* Update Qt dependency to 4.7
* drop support for Debian squeeze and Ubuntu lucid, maverick, natty and oneiric
* disable globe support for jessie and unstable (because of #728318)
* disable globe support for jessie (because of #728318)

-- Jürgen E. Fischer <jef@norbit.de> Thu, 12 Dec 2013 14:02:28 +0100
-- Jürgen E. Fischer <jef@norbit.de> Sat, 18 Jan 2014 03:33:14 +0100

qgis (1.9.0) UNRELEASED; urgency=low

@@ -30,8 +30,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
# libosgearth-dev,
# libopenscenegraph-dev,
libosgearth-dev,
libopenscenegraph-dev,
git,
doxygen,
graphviz,
@@ -46,8 +46,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
#, qgis-plugin-globe
Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe
Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
@@ -207,21 +206,21 @@ Description: QGIS API documentation
.
This package contains the QGIS 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 QGIS
# QGIS 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 QGIS.

#Package: qgis-plugin-globe-common
#Architecture: all
#Description: OSG GLOBE plugin for QGIS - architecture-independent data
# QGIS 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 QGIS GLOBE plugin.
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 QGIS
QGIS 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 QGIS.

Package: qgis-plugin-globe-common
Architecture: all
Description: OSG GLOBE plugin for QGIS - architecture-independent data
QGIS 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 QGIS GLOBE plugin.

@@ -30,8 +30,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
# libosgearth-dev,
# libopenscenegraph-dev,
libosgearth-dev,
libopenscenegraph-dev,
git,
doxygen,
graphviz,
@@ -47,8 +47,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
#, qgis-plugin-globe
Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe
Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
@@ -208,23 +207,23 @@ Description: QGIS API documentation
.
This package contains the QGIS 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 QGIS
# QGIS 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 QGIS.

#Package: qgis-plugin-globe-common
#Architecture: all
#Description: OSG GLOBE plugin for QGIS - architecture-independent data
# QGIS 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 QGIS GLOBE plugin.
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 QGIS
QGIS 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 QGIS.

Package: qgis-plugin-globe-common
Architecture: all
Description: OSG GLOBE plugin for QGIS - architecture-independent data
QGIS 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 QGIS GLOBE plugin.

Package: qgis-oracle-provider
Architecture: any
@@ -78,7 +78,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric jessie sid sid-oracle"))
ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric jessie"))
CMAKE_OPTS += -D WITH_GLOBE=FALSE
else
CMAKE_OPTS += -D WITH_GLOBE=TRUE
@@ -92,6 +92,10 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
CMAKE_OPTS += -D WITH_ORACLE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid sid-oracle"))
CMAKE_OPTS += -D SPATIALINDEX_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libspatialindex.so
endif

ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy sid"))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)

0 comments on commit c3a2174

Please sign in to comment.
You can’t perform that action at this time.