Skip to content

Commit 7d73cd8

Browse files
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents e12191b + 880540b commit 7d73cd8

7 files changed

+40
-11
lines changed

debian/changelog

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ qgis (1.8.0) UNRELEASED; urgency=low
22

33
* new development version 1.8 after branch
44
* add qgis browser (qbrowser)
5+
* add zonal statistics plugins and globe plugin
6+
* migrate unstable package to dh_python2
57

6-
-- Jürgen E. Fischer <jef@norbit.de> Mon, 23 May 2011 18:08:18 +0200
8+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 11 Aug 2011 14:22:11 +0200
79

810
qgis (1.7.0) UNRELEASED; urgency=low
911

debian/control.sid

+26-9
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ Build-Depends:
2323
pkg-config,
2424
pyqt4-dev-tools,
2525
python,
26-
python-central (>=0.5),
27-
python-dev,
26+
python-dev (>= 2.6.6-3~),
2827
python-qt4 (>=4.1.0),
2928
python-qt4-dev (>=4.1.0),
3029
python-sip (>= 4.5.0),
3130
python-sip-dev (>= 4.5.0),
31+
libosgearth-dev,
32+
libopenscenegraph-dev,
3233
git,
3334
doxygen,
3435
graphviz,
@@ -41,7 +42,7 @@ Homepage: http://qgis.org/
4142
Package: qgis
4243
Architecture: any
4344
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
44-
Recommends: qgis-plugin-grass, python-qgis
45+
Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis
4546
Suggests: gpsbabel
4647
Conflicts: uim-qt3
4748
Description: Geographic Information System (GIS)
@@ -59,7 +60,7 @@ Description: Quantum GIS - architecture-independent data
5960
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6061
and display databases of geographic information.
6162
.
62-
This package contains architecture-independent supporting data files for use
63+
This package contains architecture-independent supporting data files for use
6364
with Quantum GIS.
6465

6566
Package: libqgis{QGIS_ABI}
@@ -111,8 +112,8 @@ Description: GRASS plugin for Quantum GIS
111112

112113
Package: qgis-plugin-grass-common
113114
Architecture: all
114-
Depends: ${python:Depends}
115115
Replaces: qgis-common (<< 1.5)
116+
Depends: python
116117
Breaks: qgis-common (<< 1.5)
117118
Description: GRASS plugin for Quantum GIS - architecture-independent data
118119
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -124,9 +125,8 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
124125
Package: python-qgis
125126
Section: python
126127
Architecture: any
127-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
128+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
128129
Provides: ${python:Provides}
129-
XB-Python-Version: ${python:Versions}
130130
Description: Python bindings to Quantum GIS
131131
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
132132
and display databases of geographic information.
@@ -137,8 +137,7 @@ Package: python-qgis-common
137137
Section: python
138138
Architecture: all
139139
Provides: ${python:Provides}
140-
Depends: gdal-bin, python-gdal, ${python:Depends}
141-
XB-Python-Version: ${python:Versions}
140+
Depends: gdal-bin, python-gdal
142141
Description: Python bindings to Quantum GIS - architecture-independent files
143142
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
144143
and display databases of geographic information.
@@ -195,3 +194,21 @@ Description: Quantum GIS API documentation
195194
.
196195
This package contains the Quantum GIS API documentation.
197196

197+
Package: qgis-plugin-globe
198+
Architecture: any
199+
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
200+
Description: OSG globe plugin for Quantum GIS
201+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
202+
and display databases of geographic information.
203+
.
204+
This plugin enables 3D viewing using OSG globe in the Quantum GIS.
205+
206+
Package: qgis-plugin-globe-common
207+
Architecture: all
208+
Description: OSG GLOBE plugin for Quantum GIS - architecture-independent data
209+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
210+
and display databases of geographic information.
211+
.
212+
This package contains architecture-independent supporting data files for use
213+
with the Quantum GIS GLOBE plugin.
214+
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
libqgis{QGIS_ABI}: shlib-calls-exit
21
libqgis{QGIS_ABI}: package-name-doesnt-match-sonames
32
libqgis{QGIS_ABI}: no-symbols-control-file
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/qgis/globe

debian/qgis-plugin-globe.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/qgis/plugins/libglobeplugin.so

debian/qgis.install

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ usr/lib/qgis/plugins/libspatialqueryplugin.so
1717
usr/lib/qgis/plugins/libdisplacementplugin.so
1818
usr/lib/qgis/plugins/libofflineeditingplugin.so
1919
usr/lib/qgis/plugins/libroadgraphplugin.so
20+
usr/lib/qgis/plugins/libzonalstatisticsplugin.so
2021
usr/lib/qgis/qgis_help
2122
usr/share/pixmaps/qgis-icon.xpm
2223
usr/share/pixmaps/qgis-mime-icon.png

debian/rules

+8
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ endif
4242
# CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
4343
#endif
4444

45+
ifneq (,$(findstring $(DISTRIBUTION),"sid"))
46+
CMAKE_OPTS += -D WITH_GLOBE=TRUE
47+
endif
48+
4549
ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
4650
LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
4751
endif
@@ -160,7 +164,11 @@ binary-arch: build install
160164
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
161165
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
162166

167+
ifneq (,$(findstring $(DISTRIBUTION),"sid"))
168+
dh_python2 --no-guessing-versions
169+
else
163170
dh_pycentral
171+
endif
164172
dh_installmenu
165173
dh_icons
166174
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))

0 commit comments

Comments
 (0)