[qgis] 02/14: Merge tag 'upstream/2.8.4+dfsg'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Dec 1 22:36:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 0721aae6a16fcd1e74f23640e624cb73b3bb2b7c
Merge: cdcba8a ff02873
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Nov 30 08:14:32 2015 +0100
Merge tag 'upstream/2.8.4+dfsg'
Upstream version 2.8.4+dfsg
Conflicts:
debian/changelog
debian/control.in
debian/qgis-plugin-grass.preinst
debian/rules
CMakeLists.txt | 2 +-
ChangeLog | 561 +++++++++++++++++++++
debian/changelog | 14 +
debian/compat.in | 2 +-
debian/control.in | 137 ++---
debian/qgis-plugin-grass.install | 4 -
debian/qgis-plugin-grass.postrm | 12 -
debian/qgis-plugin-grass.preinst | 12 -
...rass.install => qgis-provider-grass.install.in} | 2 -
debian/qgis-provider-grass.lintian-overrides | 2 +
debian/qgis-provider-grass.postrm | 12 +
debian/qgis-provider-grass.preinst | 13 +
debian/rules | 36 +-
i18n/qgis_ar.ts | 2 +-
i18n/qgis_bs.ts | 2 +-
i18n/qgis_ca.ts | 2 +-
i18n/qgis_cs.ts | 2 +-
i18n/qgis_da.ts | 2 +-
i18n/qgis_de.ts | 2 +-
i18n/qgis_el.ts | 2 +-
i18n/qgis_en.ts | 4 +-
i18n/qgis_es.ts | 2 +-
i18n/qgis_et.ts | 2 +-
i18n/qgis_eu.ts | 2 +-
i18n/qgis_fa.ts | 2 +-
i18n/qgis_fi.ts | 2 +-
i18n/qgis_fr.ts | 2 +-
i18n/qgis_gl.ts | 2 +-
i18n/qgis_hi.ts | 2 +-
i18n/qgis_hr.ts | 2 +-
i18n/qgis_hu.ts | 2 +-
i18n/qgis_id.ts | 2 +-
i18n/qgis_is.ts | 2 +-
i18n/qgis_it.ts | 2 +-
i18n/qgis_ja.ts | 2 +-
i18n/qgis_km.ts | 2 +-
i18n/qgis_ko.ts | 2 +-
i18n/qgis_lt.ts | 2 +-
i18n/qgis_lv.ts | 2 +-
i18n/qgis_mn.ts | 2 +-
i18n/qgis_nb.ts | 2 +-
i18n/qgis_nl.ts | 2 +-
i18n/qgis_pl.ts | 2 +-
i18n/qgis_pt_BR.ts | 2 +-
i18n/qgis_pt_PT.ts | 2 +-
i18n/qgis_ro.ts | 2 +-
i18n/qgis_ru.ts | 2 +-
i18n/qgis_sk.ts | 2 +-
i18n/qgis_sl.ts | 2 +-
i18n/qgis_sr.ts | 2 +-
i18n/qgis_sr at latin.ts | 2 +-
i18n/qgis_sv.ts | 2 +-
i18n/qgis_th.ts | 2 +-
i18n/qgis_tr.ts | 2 +-
i18n/qgis_uk.ts | 2 +-
i18n/qgis_vi.ts | 2 +-
i18n/qgis_zh-Hans.ts | 2 +-
i18n/qgis_zh_CN.ts | 2 +-
i18n/qgis_zh_TW.ts | 2 +-
python/core/__init__.py | 6 +-
python/core/qgsdistancearea.sip | 16 +-
python/core/qgserror.sip | 2 +-
python/core/qgsfeaturestore.sip | 2 +-
python/core/qgsfield.sip | 16 +-
python/core/qgsmapunitscale.sip | 16 +-
python/core/qgsvectorlayer.sip | 6 +-
python/core/qgsvectorlayereditutils.sip | 4 +-
python/core/symbology-ng/qgsfillsymbollayerv2.sip | 8 +-
python/core/symbology-ng/qgslinesymbollayerv2.sip | 2 +-
python/core/symbology-ng/qgssvgcache.sip | 6 +-
python/core/symbology-ng/qgsvectorcolorrampv2.sip | 17 +-
.../db_manager/db_plugins/postgis/plugin.py | 493 +++++++++---------
python/plugins/processing/algs/qgis/VectorGrid.py | 2 +-
.../description/2.1.2/OrdinaryKriging(Global).txt | 33 +-
.../saga/description/2.1.2/OrdinaryKriging.txt | 10 +-
.../description/2.1.2/UniversalKriging(Global).txt | 34 +-
.../saga/description/2.1.2/UniversalKriging.txt | 45 +-
resources/function_help/lpad | 4 +-
resources/function_help/rpad | 4 +-
scripts/release.pl | 6 +-
src/app/composer/qgscomposer.cpp | 68 ++-
src/app/composer/qgscomposerscalebarwidget.cpp | 5 +
src/app/ogr/qgsopenvectorlayerdialog.cpp | 4 +-
src/app/qgisapp.cpp | 78 ++-
src/app/qgisapp.h | 6 +
src/app/qgsattributetabledialog.cpp | 3 +-
src/app/qgsidentifyresultsdialog.cpp | 2 +-
src/app/qgsmaptoolcapture.cpp | 7 +
src/app/qgsmaptoolfillring.cpp | 36 +-
src/app/qgsmergeattributesdialog.cpp | 26 +-
src/app/qgsmergeattributesdialog.h | 5 +
src/app/qgsprojectproperties.cpp | 8 +-
src/app/qgssnappingdialog.cpp | 1 +
src/app/qgstipfactory.cpp | 2 +-
src/core/composer/qgscomposerscalebar.cpp | 24 +-
src/core/composer/qgscomposition.cpp | 35 +-
src/core/qgis.h | 8 +
src/core/qgsdistancearea.cpp | 8 +
src/core/qgsdistancearea.h | 16 +-
src/core/qgserror.h | 2 +-
src/core/qgsexpression.cpp | 68 ++-
src/core/qgsfeaturestore.cpp | 5 +-
src/core/qgsfeaturestore.h | 2 +-
src/core/qgsfield.cpp | 34 +-
src/core/qgsfield.h | 4 +-
src/core/qgsmaplayer.cpp | 1 +
src/core/qgsmapunitscale.h | 22 +-
src/core/qgspallabeling.cpp | 2 +
src/core/qgsvectorfilewriter.cpp | 22 +-
src/core/qgsvectorfilewriter.h | 1 +
src/core/qgsvectorlayer.cpp | 16 +-
src/core/qgsvectorlayer.h | 6 +-
src/core/qgsvectorlayereditbuffer.cpp | 40 +-
src/core/qgsvectorlayereditutils.cpp | 5 +-
src/core/qgsvectorlayereditutils.h | 4 +-
src/core/symbology-ng/qgsellipsesymbollayerv2.cpp | 15 +-
src/core/symbology-ng/qgsellipsesymbollayerv2.h | 5 +-
src/core/symbology-ng/qgsfillsymbollayerv2.cpp | 14 +-
src/core/symbology-ng/qgsfillsymbollayerv2.h | 6 +-
src/core/symbology-ng/qgsmarkersymbollayerv2.cpp | 12 +-
src/core/symbology-ng/qgsmarkersymbollayerv2.h | 5 +-
src/core/symbology-ng/qgsrulebasedrendererv2.cpp | 2 +-
src/core/symbology-ng/qgsrulebasedrendererv2.h | 2 +-
src/core/symbology-ng/qgssvgcache.cpp | 10 +-
src/core/symbology-ng/qgssvgcache.h | 6 +-
src/core/symbology-ng/qgssymbollayerv2.cpp | 15 +-
src/core/symbology-ng/qgssymbollayerv2utils.cpp | 6 +-
src/core/symbology-ng/qgsvectorcolorrampv2.cpp | 12 +-
src/core/symbology-ng/qgsvectorcolorrampv2.h | 6 +-
.../qgsattributetablefiltermodel.cpp | 3 +-
src/gui/attributetable/qgsattributetablemodel.cpp | 5 +-
src/gui/qgsattributeform.cpp | 5 +-
src/gui/qgsmapoverviewcanvas.cpp | 1 +
.../qgssinglebandpseudocolorrendererwidget.cpp | 11 +
.../qgspointdisplacementrendererwidget.cpp | 4 +-
.../qgsvectorgradientcolorrampv2dialog.cpp | 5 +-
src/plugins/grass/qgsgrassmodule.cpp | 4 +
src/plugins/heatmap/heatmap.cpp | 8 +-
src/plugins/heatmap/heatmap.h | 4 +-
src/plugins/heatmap/heatmapgui.cpp | 20 +-
src/plugins/heatmap/heatmapgui.h | 8 +-
src/plugins/heatmap/heatmapguibase.ui | 4 +-
src/providers/ogr/qgsogrprovider.cpp | 2 +-
src/providers/oracle/qgsoracleprovider.cpp | 2 +-
src/providers/postgres/qgspostgresprovider.cpp | 7 +
src/server/qgshttprequesthandler.cpp | 1 -
src/server/qgsserverprojectparser.cpp | 33 +-
src/server/qgswfsserver.cpp | 21 +-
src/server/qgswmsconfigparser.cpp | 16 +-
src/server/qgswmsprojectparser.cpp | 8 +-
src/server/qgswmsserver.cpp | 8 +-
src/ui/qgsadvanceddigitizingdockwidgetbase.ui | 47 +-
tests/src/core/CMakeLists.txt | 1 +
tests/src/core/testqgscomposermap.cpp | 23 +-
tests/src/core/testqgsdistancearea.cpp | 31 +-
tests/src/core/testqgsmarkerlinesymbol.cpp | 154 ++++++
tests/src/python/CMakeLists.txt | 1 +
tests/src/python/test_qgsmapunitscale.py | 101 ++++
.../expected_line_offset/expected_line_offset.png | Bin 0 -> 40258 bytes
tests/testdata/marker_line_offset.qml | 284 +++++++++++
160 files changed, 2377 insertions(+), 772 deletions(-)
diff --cc debian/changelog
index 3328671,b4be35a..6d9cd81
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,199 -1,42 +1,213 @@@
+ qgis (2.8.4) UNRELEASED; urgency=medium
+
+ * Release of 2.8.4
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 27 Nov 2015 12:59:37 +0100
+
+ qgis (2.8.3-1) unstable; urgency=medium
+
+ * split grass provider off into a separate package.
+ * disable grass plugin on sid (because of GRASS7)
+ * add ubuntu wily
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 27 Nov 2015 12:59:37 +0100
+
-qgis (2.8.3) UNRELEASED; urgency=medium
+qgis (2.8.3+dfsg-5) unstable; urgency=medium
+ * Add libgsl-dev as preferred build dependency,
+ keep libgsl0-dev as alternative for backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 10 Nov 2015 23:16:08 +0100
+
+qgis (2.8.3+dfsg-4) unstable; urgency=medium
+
+ * Use desktop file in favor of menu file per CTTE #741573.
+ * Also install MIME type icon in hicolor theme.
+ * Drop libqgis* post{inst,rm}, rely on dpkg-triggers for ldconfig.
+ * Rebuild for gdal transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 24 Oct 2015 00:13:55 +0200
+
+qgis (2.8.3+dfsg-3) unstable; urgency=medium
+
+ * Update watch file to use lowercase RC in uversionmangle.
+ * Update symbols for other architectures.
+ * Rebuild for openscenegraph transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 31 Aug 2015 21:24:05 +0200
+
+qgis (2.8.3+dfsg-2) unstable; urgency=medium
+
+ * Update symbols for amd64.
+ * Add patch to fix 'software' typo.
+ * Update Vcs-Browser URL to use HTTPS.
+ * Rebuild for geos transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 29 Aug 2015 17:03:40 +0200
+
+qgis (2.8.3+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Use upstream-ltr branch in gbp.conf.
+ * Disable GRASS plugin, doesn't support GRASS 7.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 21 Aug 2015 18:12:35 +0200
+
+qgis (2.8.3+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
* Release of 2.8.3
- -- Jürgen E. Fischer <jef at norbit.de> Tue, 28 Jul 2015 14:00:12 +0200
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Drop patches included upstream, refresh remaining patches.
+ * Update copyright file, changes:
+ - Update copyright years for Jürgen E. Fischer
+ - Add copyright for Daniel Vaz
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 30 Jul 2015 02:40:05 +0200
+
+qgis (2.8.2+dfsg-3) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 27 Jul 2015 13:01:23 +0200
+
+qgis (2.8.2+dfsg-3~exp1) experimental; urgency=medium
+
+ * Limit upstream version to 2.8 LTR releases in watch file.
+ * Disable QwtPolar, embedded copies don't support Qwt > 6.0.
+ * Include change from 2.8.3 to fix segfauls caused by the deprecated
+ spatialite_init() method. (closes: #788101, #791680)
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 26 Jul 2015 16:31:54 +0200
+
+qgis (2.8.2+dfsg-2) unstable; urgency=medium
-qgis (2.8.2) unstable; urgency=medium
+ * Move from experimental to unstable.
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Jun 2015 20:35:17 +0200
+
+qgis (2.8.2+dfsg-1) experimental; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Jun 2015 17:13:17 +0200
+
+qgis (2.8.2+dfsg-1~exp2) experimental; urgency=medium
+
+ * Add debug package for QGIS libraries.
+ (closes: #786985)
+ * Update allows-to-typo.patch to also fix 'Allow' variant.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 27 May 2015 23:22:47 +0200
+
+qgis (2.8.2+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
* Release of 2.8.2
- -- Jürgen E. Fischer <jef at norbit.de> Tue, 28 Jul 2015 14:00:12 +0200
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Drop patches included upstream, refresh remaining patches.
+ * Update copyright years for Alexander Bruy.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 10 May 2015 11:42:23 +0200
+
+qgis (2.8.1+dfsg1-1) unstable; urgency=medium
+
+ * Add patches from upstream release-2_8 branch.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 27 Apr 2015 15:43:48 +0200
+
+qgis (2.8.1+dfsg1-1~exp3) experimental; urgency=medium
+
+ * Update symbols for armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386,
+ mips, mipsel, powerpc, ppc64el & s390x.
+ * Add patches from upstream release-2_8 branch.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 11 Mar 2015 18:52:57 +0100
+
+qgis (2.8.1+dfsg1-1~exp2) experimental; urgency=medium
+
+ * Don't build internal PySpatiaLite, use Debian package instead.
+ (closes: #779933)
+ * Add patch to fix FTBFS on arm*.
+ * Add patches from upstream release-2_8 branch.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 09 Mar 2015 19:19:27 +0100
+
+qgis (2.8.1+dfsg1-1~exp1) experimental; urgency=medium
+
+ * Fix upstream version extraction from changelog.
+ * Move python-qgis from Recommends to Depends.
+ * Also exclude ElvenSword gradient from repacked upstream tarball,
+ has problematic license terms restricting use.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 03 Mar 2015 08:09:28 +0100
+
+qgis (2.8.1+dfsg-1~exp1) experimental; urgency=medium
-qgis (2.8.1) unstable; urgency=medium
+ * Update copyright file, changes:
+ - Document copyright & license for src/core/pal/costcalculator* separately.
+ * Exclude dxf2shp plugin from repacked upstream tarball, see the copyright
+ file for details of the license issue.
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 28 Feb 2015 20:47:41 +0100
+
+qgis (2.8.1-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
* Release of 2.8.1
- -- Jürgen E. Fischer <jef at norbit.de> Sat, 09 May 2015 22:02:02 +0200
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update grass dependencies to prevent building with unsupported GRASS 7.
+ * Refresh patches.
+ * Add patches from release-2_8 branch.
+ * Update symbols for amd64.
-qgis (2.8.0) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 27 Feb 2015 08:39:40 +0100
- * Release of 2.8
+qgis (2.8.0-1~exp1) experimental; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Thu, 26 Feb 2015 10:12:00 +0100
+ [ Jürgen E. Fischer ]
+ * Release of 2.8
-qgis (2.7.0) unstable; urgency=medium
+ [ Bas Couwenberg ]
+ * Update Vcs-Browser URL to use cgit instead of gitweb.
+ * Update my email to use @debian.org address.
+ * Drop patches included upstream, refresh remaining patches.
+ * Update copyright file, changes:
+ - Add additional copyright holders to general files section
+ - Add copyright years to general files section
+ - Order copyright holder by year
+ - Group files sections
+ - Sort groups files sections alphanumerically
+ - Document copyright holders & licenses for external modules
+ - Add license specifications for: Apache-2.0, BSD-2-Clause,
+ dxflib-Commercial-License, GPL-2, LGPL-2.1+, QT-Commericial,
+ LGPL-2.1 with Digia Qt LGPL Exception 1.1 & GPL-3.
+ * Remove extra license file for MetaSearch plugin.
+ * Add symbols file for libqgis-server2.8.0.
+ * Update symbols for amd64.
+ * Drop obsolete WITH_INTERNAL_SPATIALITE option.
+ * Install libqgis_server.so in libqgis-dev.
+ * Install schemaExtension.xsd in qgis-server.
+ * Install contributors.json & developersmap.html in qgis-common.
+ * Use Debian packages for Leaflet & jQuery in developersmap.html.
+ * Add dependency on libqgis-server to libqgis-dev.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 25 Feb 2015 18:54:10 +0100
+
+qgis (2.7.0) UNRELEASED; urgency=medium
* New development version 2.7 after branch of 2.6
* run tests in en_US.UTF-8 locale
diff --cc debian/control.in
index ede306f,baff09d..2ce3365
--- a/debian/control.in
+++ b/debian/control.in
@@@ -244,21 -247,15 +248,17 @@@ Description: QGIS - development file
This package contains the headers and libraries needed to develop plugins for
QGIS.
- Package: qgis-dbg
+ Package: qgis-provider-grass
Architecture: any
+Section: debug
+Priority: extra
Depends:
- libqgis-core{QGIS_ABI} (= ${binary:Version}),
- libqgis-gui{QGIS_ABI} (= ${binary:Version}),
- libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
- libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
- libqgis-server{QGIS_ABI} (= ${binary:Version}),
- #!sid# libqgisgrass{QGIS_ABI} (= ${binary:Version}),
- libqgispython{QGIS_ABI} (= ${binary:Version}),
+ qgis (= ${binary:Version}),
+ ${shlibs:Depends},
${misc:Depends}
- Suggests: gdb
- Description: QGIS - debugging symbols
+ #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.
.
diff --cc debian/rules
index a9be15d,db9dfa2..fc6bff5
--- a/debian/rules
+++ b/debian/rules
@@@ -16,8 -16,9 +16,9 @@@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-arc
QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
DEB_TEST_TARGET ?= Experimental
+ BUILDDIR ?= debian/build
-QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
+QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
ifeq (,$(DISTRIBUTION))
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
@@@ -43,11 -46,12 +49,11 @@@ QGIS_MINOR=$(shell sed -ne 's/SET(CPACK
QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt)
QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
+ GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
CMAKE_OPTS := \
- -DBUILDNAME=$(DEB_BUILD_NAME) \
-DCMAKE_VERBOSE_MAKEFILE=1 \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DGRASS_PREFIX=/usr/lib/$(GRASS) \
-DBINDINGS_GLOBAL_INSTALL=TRUE \
-DPEDANTIC=TRUE \
-DWITH_QSPATIALITE=TRUE \
@@@ -65,7 -69,8 +71,9 @@@
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_SIX=FALSE \
+ -DWITH_QWTPOLAR=OFF
+ -DWITH_GRASS=TRUE \
+ -DGRASS_PREFIX=/usr/lib/$(GRASS)
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@@ -234,18 -247,34 +246,16 @@@ override_dh_auto_install
$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser
- ifeq (,$(findstring $(DISTRIBUTION),"sid"))
# 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
- endif
+ 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
- mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
-
- perl -i -pe 's=#!/usr/bin/env python=#!/usr/bin/python2.7=;' $$(find debian/tmp -name "*.py")
-
- # remove unwanted files
- $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
- $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
-
- # Don't include a copy of the world.tif also included in osgearth-data
- $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
-
- # remove extra license files
- -find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
- $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE
- $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE
- $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt
-
- # Man pages are installed by dh_installman
- $(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
- $(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
+override_dh_auto_install-indep:
+ install -o root -g root -m 755 -d $(CURDIR)/debian/tmp/usr/share/qgis/doc
+ mv -v obj-*/doc/api/html $(CURDIR)/debian/tmp/usr/share/qgis/doc/api
+override_dh_install:
dh_install --autodest --list-missing
override_dh_installchangelogs:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list