Skip to content

Commit

Permalink
Merge branch 'master' into grass
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew McAninch committed Aug 28, 2015
2 parents 5c0921c + d07cad9 commit eadb83b
Show file tree
Hide file tree
Showing 137 changed files with 2,032 additions and 611 deletions.
104 changes: 60 additions & 44 deletions debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Priority: optional
Build-Depends:
bison,
cmake (>= 2.8),
#sid stretch jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
#sid stretch jessie wheezy saucy trusty utopic vivid# debhelper (>= 9),
#precise# debhelper (>= 7),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#saucy# libgdal-dev (>= 1.9.0),
#wheezy# libgdal1-dev,
Expand All @@ -23,8 +23,8 @@ Build-Depends:
libqt4-dev (>= 4.7.0),
libqt4-opengl-dev,
libqtwebkit-dev,
#stretch jessie wheezy sid-oracle# libqwt-dev,
#precise saucy trusty utopic vivid sid# libqwt5-qt4-dev,
#stretch jessie wheezy# libqwt-dev,
#precise saucy trusty utopic vivid stretch sid# libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
Expand All @@ -35,10 +35,10 @@ Build-Depends:
#precise saucy# python-central (>= 0.5),
#saucy wheezy# python-dev,
#saucy# libpython2.7-dev,
#sid stretch jessie sid-oracle trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie wheezy precise saucy sid-oracle trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
#sid stretch jessie# pyqt4.qsci-dev,
#sid stretch jessie trusty utopic vivid sid-oracle# python-pyspatialite,
#sid stretch jessie trusty utopic vivid# python-pyspatialite,
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
Expand All @@ -50,14 +50,14 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid-oracle# oracle-instantclient11.2-devel,
#oracle# oracle-instantclient11.2-devel,
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
libqt4-sql-sqlite
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch jessie sid-oracle vivid#Standards-Version: 3.9.6
#wheezy#Standards-Version: 3.9.3
#precise saucy trusty utopic#Standards-Version: 3.8.4
#sid stretch jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
#wheezy precise saucy trusty utopic vivid#XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
Expand All @@ -71,7 +71,8 @@ Depends:
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
Recommends:
qgis-plugin-grass,
#grass6# qgis-plugin-grass,
qgis-provider-grass,
qgis-plugin-globe,
python-qgis
Suggests: gpsbabel
Expand Down Expand Up @@ -212,9 +213,9 @@ Package: libqgis-dev
Architecture: any
Section: libdevel
Depends:
grass-dev (<< 7),
grass-dev,
libexpat1-dev,
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#saucy# libgdal-dev (>= 1.9.0),
#wheezy# libgdal1-dev,
Expand Down Expand Up @@ -266,36 +267,51 @@ Description: QGIS - debugging symbols
.
This package contains debugging symbols.

Package: qgis-plugin-grass
Package: qgis-provider-grass
Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-grass-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
#!precise# grass-core
#precise# grass (<< 7)
Description: GRASS plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables GRASS data access in the QGIS geographic data viewer.

Package: qgis-plugin-grass-common
Architecture: all
Depends:
#sid stretch jessie saucy sid-oracle trusty# python2.7,
#wheezy precise# python,
${misc:Depends}
Breaks: qgis-common (<< 1.5)
Replaces: qgis-common (<< 1.5)
Description: GRASS plugin for QGIS - architecture-independent data
#grass7#Breaks: qgis-plugin-grass
#grass7#Replaces: qgis-plugin-grass
Description: GRASS plugin for QGIS
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 GRASS plugin.
This provider enables GRASS data access in QGIS.

#grass6#Package: qgis-plugin-grass
#grass6#Architecture: any
#grass6#Depends:
#grass6# qgis (= ${binary:Version}),
#grass6# qgis-plugin-grass-common (= ${source:Version}),
#grass6# qgis-provider-grass (= ${source:Version}),
#grass6# ${shlibs:Depends},
#grass6# ${misc:Depends},
#grass6##!precise# grass-core (<< 7)
#grass6##precise# grass (<< 7)
#grass6#Description: GRASS plugin for QGIS
#grass6# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#grass6# display databases of geographic information.
#grass6# .
#grass6# This plugin enables GRASS data access in QGIS.
#grass6#
#grass6#Package: qgis-plugin-grass-common
#grass6#Architecture: all
#grass6#Depends:
#grass6##saucy trusty# python2.7,
#grass6##precise# python,
#grass6# ${misc:Depends}
#grass6#Breaks: qgis-common (<< 1.5)
#grass6#Replaces: qgis-common (<< 1.5)
#grass6#Description: GRASS plugin for QGIS - architecture-independent data
#grass6# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#grass6# display databases of geographic information.
#grass6# .
#grass6# This package contains architecture-independent supporting data files for use
#grass6# with the QGIS GRASS plugin.
#grass6#
Package: qgis-plugin-globe
Architecture: any
Depends:
Expand Down Expand Up @@ -337,9 +353,9 @@ Depends:
python-dateutil,
python-tz,
python-six,
#sid stretch jessie trusty utopic vivid sid-oracle# python-pyspatialite,
#sid stretch# liblwgeom-2.1.7,
#sid stretch jessie trusty utopic vivid# python-pyspatialite,
#jessie# liblwgeom-2.1.4,
#stretch sid# liblwgeom-2.1.8,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
Expand Down Expand Up @@ -427,13 +443,13 @@ Description: QGIS API documentation
.
This package contains the QGIS API documentation.

#sid-oracle#Package: qgis-oracle-provider
#sid-oracle#Architecture: any
#sid-oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
#sid-oracle#Section: contrib/database
#sid-oracle#Description: QGIS oracle provider
#sid-oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#sid-oracle# display databases of geographic information.
#sid-oracle# .
#sid-oracle# This package contains the QGIS oracle provider.
#sid-oracle#
#oracle#Package: qgis-oracle-provider
#oracle#Architecture: any
#oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
#oracle#Section: contrib/database
#oracle#Description: QGIS oracle provider
#oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#oracle# display databases of geographic information.
#oracle# .
#oracle# This package contains the QGIS oracle provider.
#oracle#
4 changes: 0 additions & 4 deletions debian/qgis-plugin-grass.install.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER}
usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER}
usr/lib/qgis/grass/bin/qgis.g.browser{GRASSVER}
usr/lib/qgis/plugins/libgrassplugin{GRASSVER}.so
usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so
usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so
12 changes: 0 additions & 12 deletions debian/qgis-plugin-grass.postrm

This file was deleted.

13 changes: 0 additions & 13 deletions debian/qgis-plugin-grass.preinst

This file was deleted.

4 changes: 4 additions & 0 deletions debian/qgis-provider-grass.install.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER}
usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER}
usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so
usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so
2 changes: 2 additions & 0 deletions debian/qgis-provider-grass.lintian-overrides
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
12 changes: 12 additions & 0 deletions debian/qgis-provider-grass.postrm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

set -e

if [ "$1" = "remove" ]; then
dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#

exit 0
13 changes: 13 additions & 0 deletions debian/qgis-provider-grass.preinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

set -e

if [ "$1" = "install" -o "$1" = "upgrade" ]; then
dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#

exit 0

57 changes: 38 additions & 19 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ ifeq (,$(DISTRIBUTION))
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
endif

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid sid-oracle"))
ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
DISTRIBUTION := $(subst -oracle,,$(DISTRIBUTION))
WITH_ORACLE=1
endif

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid"))
DISTRIBUTION := sid
endif

Expand Down Expand Up @@ -67,6 +72,18 @@ CMAKE_OPTS := \
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
-DQT_DOC_URL=/usr/share/qt4/doc/html/

ifeq ($(GRASSVER),7)
CMAKE_OPTS += \
-DWITH_GRASS=FALSE \
-DWITH_GRASS7=TRUE \
-DGRASS_PREFIX7=/usr/lib/$(GRASS)
else
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=FALSE \
-DGRASS_PREFIX=/usr/lib/$(GRASS)
endif

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
Expand All @@ -84,7 +101,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid sid sid
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
endif

ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
ifneq (,$(WITH_ORACLE))
CMAKE_OPTS += -DWITH_ORACLE=TRUE
endif

Expand All @@ -105,18 +122,6 @@ else
CMAKE_OPTS += -DENABLE_TESTS=TRUE
endif

ifeq ($(GRASSVER),7)
CMAKE_OPTS += \
-DWITH_GRASS=FALSE \
-DWITH_GRASS7=TRUE \
-DGRASS_PREFIX7=/usr/lib/$(GRASS)
else
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=FALSE \
-DGRASS_PREFIX=/usr/lib/$(GRASS)
endif

ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie stretch trusty sid sid-oracle"))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
Expand All @@ -142,11 +147,25 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
LDFLAGS += -pg
endif

# multi distribution support:
# - remove lines with applicable excludes
# - remove prefixes with applicable includes
# - remove prefixes with not applicable excludes
# - remove remaining comments

CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)

ifneq (,$(WITH_ORACLE))
CONTROL_EXPRESSIONS += oracle
endif

define gentemplate
$(2): $(1)
sed -r \
-e 's/^#(.* |)$(DISTRIBUTION)( .*|)#//' \
-e '/^#($|[^!])/d' \
-e '/#(.+ |)!($(subst $(eval) ,|,$(CONTROL_EXPRESSIONS)))( .+|)#/d' \
-e 's/#([^#]+ |)($(subst $(eval) ,|,$(CONTROL_EXPRESSIONS)))( [^#]+|)#//g' \
-e 's/#([^#]+ |)![^#]+( [^#]*|)#//g' \
-e '/^#/d' \
-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
Expand Down Expand Up @@ -242,9 +261,9 @@ override_dh_auto_install:
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser

# qgis binary wrappers
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
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
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-provider-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qbrowser

override_dh_install:
# Don't ship srs.db, automatically updated in postinst with crssync
Expand Down
2 changes: 1 addition & 1 deletion i18n/qgis_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60419,7 +60419,7 @@ There was a problem with your symbol database.</source>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="58"/>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our sofware. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our software. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion i18n/qgis_bs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60529,7 +60529,7 @@ Problem je sa vašom bazom podataka simbola.</translation>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="58"/>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our sofware. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our software. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion i18n/qgis_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60224,7 +60224,7 @@ There was a problem with your symbol database.</source>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="58"/>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our sofware. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our software. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion i18n/qgis_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60486,7 +60486,7 @@ There was a problem with your symbol database.</source>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="58"/>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our sofware. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<source>If you need help using QGIS we have a &apos;users&apos; mailing list where users help each other with issues related to using our software. We also have a &apos;developers&apos; mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the &lt;a href=&quot;http://qgis.org/en/site/forusers/support.html#mailing-lists&quot;&gt;community section&lt;/a&gt; of the QGIS home page.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
Loading

0 comments on commit eadb83b

Please sign in to comment.