Skip to content
Permalink
Browse files

Merge branch 'master' into grass

  • Loading branch information
Andrew McAninch
Andrew McAninch committed Aug 28, 2015
2 parents 5c0921c + d07cad9 commit eadb83ba6039241affc9d2d1eab121971bb2e7b3
Showing with 2,032 additions and 611 deletions.
  1. +60 −44 debian/control.in
  2. +0 −4 debian/qgis-plugin-grass.install.in
  3. +0 −12 debian/qgis-plugin-grass.postrm
  4. +0 −13 debian/qgis-plugin-grass.preinst
  5. +4 −0 debian/qgis-provider-grass.install.in
  6. +2 −0 debian/qgis-provider-grass.lintian-overrides
  7. +12 −0 debian/qgis-provider-grass.postrm
  8. +13 −0 debian/qgis-provider-grass.preinst
  9. +38 −19 debian/rules
  10. +1 −1 i18n/qgis_ar.ts
  11. +1 −1 i18n/qgis_bs.ts
  12. +1 −1 i18n/qgis_ca.ts
  13. +1 −1 i18n/qgis_cs.ts
  14. +1 −1 i18n/qgis_da.ts
  15. +1 −1 i18n/qgis_de.ts
  16. +1 −1 i18n/qgis_el.ts
  17. +2 −2 i18n/qgis_en.ts
  18. +1 −1 i18n/qgis_es.ts
  19. +1 −1 i18n/qgis_et.ts
  20. +1 −1 i18n/qgis_eu.ts
  21. +1 −1 i18n/qgis_fa.ts
  22. +1 −1 i18n/qgis_fi.ts
  23. +1 −1 i18n/qgis_fr.ts
  24. +1 −1 i18n/qgis_gl.ts
  25. +1 −1 i18n/qgis_hi.ts
  26. +1 −1 i18n/qgis_hr.ts
  27. +1 −1 i18n/qgis_hu.ts
  28. +1 −1 i18n/qgis_id.ts
  29. +1 −1 i18n/qgis_is.ts
  30. +1 −1 i18n/qgis_it.ts
  31. +1 −1 i18n/qgis_ja.ts
  32. +1 −1 i18n/qgis_km.ts
  33. +1 −1 i18n/qgis_ko.ts
  34. +1 −1 i18n/qgis_lt.ts
  35. +1 −1 i18n/qgis_lv.ts
  36. +1 −1 i18n/qgis_nb.ts
  37. +1 −1 i18n/qgis_nl.ts
  38. +1 −1 i18n/qgis_pl.ts
  39. +1 −1 i18n/qgis_pt_BR.ts
  40. +1 −1 i18n/qgis_pt_PT.ts
  41. +1 −1 i18n/qgis_ro.ts
  42. +1 −1 i18n/qgis_ru.ts
  43. +1 −1 i18n/qgis_sk.ts
  44. +1 −1 i18n/qgis_sl.ts
  45. +1 −1 i18n/qgis_sr.ts
  46. +1 −1 i18n/qgis_sr@latin.ts
  47. +1 −1 i18n/qgis_sv.ts
  48. +1 −1 i18n/qgis_th.ts
  49. +1 −1 i18n/qgis_tr.ts
  50. +1 −1 i18n/qgis_vi.ts
  51. +1 −1 i18n/qgis_zh-Hans.ts
  52. +1 −1 i18n/qgis_zh_CN.ts
  53. +1 −1 i18n/qgis_zh_TW.ts
  54. +48 −27 python/core/qgsapplication.sip
  55. +15 −0 python/core/qgspallabeling.sip
  56. +2 −0 python/gui/attributetable/qgsfieldconditionalformatwidget.sip
  57. +1 −0 resources/CMakeLists.txt
  58. BIN resources/themes/Night Mapping/icons/caret-down_ffffff_14.png
  59. BIN resources/themes/Night Mapping/icons/caret-right_ffffff_14.png
  60. BIN resources/themes/Night Mapping/icons/check.png
  61. +59 −0 resources/themes/Night Mapping/icons/cross.svg
  62. BIN resources/themes/Night Mapping/icons/down_arrow.png
  63. +67 −0 resources/themes/Night Mapping/icons/eye-blocked.svg
  64. +56 −0 resources/themes/Night Mapping/icons/eye.svg
  65. +515 −0 resources/themes/Night Mapping/style.qss
  66. +4 −0 src/app/composer/qgscomposer.cpp
  67. +1 −0 src/app/main.cpp
  68. +18 −4 src/app/qgisapp.cpp
  69. +2 −0 src/app/qgisapp.h
  70. +4 −0 src/app/qgsadvanceddigitizingcanvasitem.cpp
  71. +1 −0 src/app/qgsadvanceddigitizingcanvasitem.h
  72. +5 −0 src/app/qgsadvanceddigitizingdockwidget.cpp
  73. +1 −1 src/app/qgsbookmarks.cpp
  74. +11 −1 src/app/qgsmaptooladdcircularstring.cpp
  75. +2 −0 src/app/qgsmaptooladdcircularstring.h
  76. +8 −0 src/app/qgsmaptoolcapture.cpp
  77. +2 −1 src/app/qgsmaptoolcapture.h
  78. +1 −1 src/app/qgsmaptoolcircularstringcurvepoint.cpp
  79. +13 −0 src/app/qgsoptions.cpp
  80. +2 −0 src/app/qgsoptions.h
  81. +4 −1 src/app/qgsversioninfo.cpp
  82. +8 −3 src/app/qgswelcomepage.cpp
  83. +5 −0 src/app/qgswelcomepage.h
  84. +1 −1 src/core/composer/qgsatlascomposition.cpp
  85. +1 −1 src/core/composer/qgscomposerattributetable.cpp
  86. +15 −0 src/core/geometry/qgscircularstringv2.cpp
  87. +5 −0 src/core/geometry/qgscompoundcurvev2.cpp
  88. +1 −0 src/core/geometry/qgsgeometry.cpp
  89. +73 −28 src/core/qgsapplication.cpp
  90. +45 −28 src/core/qgsapplication.h
  91. +14 −0 src/core/qgsexpression.cpp
  92. +6 −9 src/core/qgsexpression.h
  93. +45 −7 src/core/qgspallabeling.cpp
  94. +18 −0 src/core/qgspallabeling.h
  95. +3 −1 src/core/qgsvectorlayer.cpp
  96. +6 −1 src/core/qgsvectorlayereditutils.cpp
  97. +2 −0 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  98. +10 −2 src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
  99. +2 −0 src/gui/attributetable/qgsfieldconditionalformatwidget.h
  100. +1 −1 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  101. +4 −1 src/gui/qgsvariableeditorwidget.cpp
  102. +10 −1 src/plugins/grass/CMakeLists.txt
  103. +1 −1 src/plugins/grass/modules/db.out.ogr.qgm
  104. +6 −3 src/plugins/grass/modules/r.basins.fill.qgm
  105. +4 −2 src/plugins/grass/modules/r.carve.qgm
  106. +4 −2 src/plugins/grass/modules/r.circle.qgm
  107. +4 −2 src/plugins/grass/modules/r.fill.dir.qgm
  108. +4 −2 src/plugins/grass/modules/r.lake.seed.qgm
  109. +6 −3 src/plugins/grass/modules/r.lake.xy.qgm
  110. +4 −2 src/plugins/grass/modules/r.random.qgm
  111. +4 −2 src/plugins/grass/modules/r.random.raster.qgm
  112. +3 −1 src/plugins/grass/modules/r.reclass.area.greater.qgm
  113. +3 −1 src/plugins/grass/modules/r.reclass.area.lesser.qgm
  114. +7 −4 src/plugins/grass/modules/r.water.outlet.qgm
  115. +1 −1 src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
  116. +1 −1 src/plugins/grass/modules/v.normal.qgm
  117. +27 −10 src/plugins/grass/qgsgrassmoduleparam.cpp
  118. +1 −1 src/plugins/grass/qtermwidget/SearchBar.cpp
  119. +66 −38 src/providers/wms/qgswmscapabilities.cpp
  120. +7 −0 src/providers/wms/qgswmscapabilities.h
  121. +16 −4 src/providers/wms/qgswmsdataitems.cpp
  122. +4 −0 src/providers/wms/qgswmsdataitems.h
  123. +2 −5 src/server/qgswmsserver.cpp
  124. +0 −2 src/ui/qgisapp.ui
  125. +85 −262 src/ui/qgsoptionsbase.ui
  126. +3 −0 tests/src/core/testqgscomposermap.cpp
  127. +1 −0 tests/src/core/testqgscomposermultiframe.cpp
  128. +2 −2 tests/src/core/testqgscomposertablev2.cpp
  129. +4 −3 tests/src/core/testqgsrasterlayer.cpp
  130. +1 −0 tests/src/python/CMakeLists.txt
  131. +131 −0 tests/src/python/test_qgspallabeling_placement.py
  132. BIN ...ata/control_images/expected_pal_placement/sp_point_placement_around/sp_point_placement_around.png
  133. BIN ...ontrol_images/expected_pal_placement/sp_point_placement_around/sp_point_placement_around_mask.png
  134. BIN .../expected_pal_placement/sp_point_placement_around_obstacle/sp_point_placement_around_obstacle.png
  135. BIN ...cted_pal_placement/sp_point_placement_around_obstacle/sp_point_placement_around_obstacle_mask.png
  136. BIN tests/testdata/labeling/pal_features_v3.sqlite
  137. +339 −0 tests/testdata/labeling/point2.qml
@@ -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,
@@ -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,
@@ -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,
@@ -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
@@ -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
@@ -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,
@@ -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:
@@ -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},
@@ -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#
@@ -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

This file was deleted.

This file was deleted.

@@ -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
@@ -0,0 +1,2 @@
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
@@ -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
@@ -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

@@ -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

@@ -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)
@@ -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

@@ -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)
@@ -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" \
@@ -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
</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>
</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>
</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>
</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>

0 comments on commit eadb83b

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