[qgis] 01/03: Merge tag 'debian/2.8.4+dfsg-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Dec 14 11:30:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qgis.
commit 7de0cf44a26b0859525fe2f81a0abc2ec716bba4
Merge: b0da4b9 35d8827
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 13 14:16:07 2015 +0100
Merge tag 'debian/2.8.4+dfsg-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
debian/rules
CMakeLists.txt | 2 +-
ChangeLog | 561 +++++++++++++++++++
debian/changelog | 46 ++
debian/compat.in | 2 +-
debian/control | 69 ++-
debian/control.in | 166 +++---
debian/libqgis-analysis2.8.3.postinst | 10 -
debian/libqgis-analysis2.8.3.postrm | 10 -
...2.8.3.install => libqgis-analysis2.8.4.install} | 0
...2.8.3.symbols => libqgis-analysis2.8.4.symbols} | 24 +-
debian/libqgis-core2.8.3.postinst | 10 -
debian/libqgis-core2.8.3.postrm | 10 -
...core2.8.3.install => libqgis-core2.8.4.install} | 0
...core2.8.3.symbols => libqgis-core2.8.4.symbols} | 214 ++++----
debian/libqgis-gui2.8.3.postinst | 10 -
debian/libqgis-gui2.8.3.postrm | 10 -
...s-gui2.8.3.install => libqgis-gui2.8.4.install} | 0
...s-gui2.8.3.symbols => libqgis-gui2.8.4.symbols} | 136 +++--
debian/libqgis-networkanalysis2.8.3.postinst | 10 -
debian/libqgis-networkanalysis2.8.3.postrm | 10 -
...nstall => libqgis-networkanalysis2.8.4.install} | 0
...ymbols => libqgis-networkanalysis2.8.4.symbols} | 16 +-
...er2.8.3.install => libqgis-server2.8.4.install} | 0
...er2.8.3.symbols => libqgis-server2.8.4.symbols} | 38 +-
debian/libqgisgrass2.8.3.postinst | 10 -
debian/libqgisgrass2.8.3.postrm | 10 -
...rass2.8.3.install => libqgisgrass2.8.4.install} | 0
debian/libqgisgrass2.8.4.lintian-overrides | 5 +
...rass2.8.3.symbols => libqgisgrass2.8.4.symbols} | 38 +-
debian/libqgispython2.8.3.postinst | 10 -
debian/libqgispython2.8.3.postrm | 10 -
...hon2.8.3.install => libqgispython2.8.4.install} | 0
...hon2.8.3.symbols => libqgispython2.8.4.symbols} | 21 +-
debian/patches/allows-to-typo.patch | 70 +--
debian/patches/occurrences-typo.patch | 607 +++++++++++++++++++++
debian/patches/series | 2 +-
debian/patches/software-typo.patch | 524 ------------------
debian/python-qgis.lintian-overrides | 8 +-
debian/qbrowser.desktop | 2 +-
debian/qgis-icon.xpm | 170 ------
debian/qgis-mime-icon128x128.png | Bin 0 -> 14941 bytes
debian/qgis-mime-icon16x16.png | Bin 0 -> 1429 bytes
debian/qgis-mime-icon22x22.png | Bin 0 -> 1617 bytes
debian/qgis-mime-icon24x24.png | Bin 0 -> 1799 bytes
debian/qgis-mime-icon32x32.png | Bin 0 -> 2576 bytes
debian/qgis-mime-icon36x36.png | Bin 0 -> 3027 bytes
debian/qgis-mime-icon42x42.png | Bin 0 -> 3699 bytes
debian/qgis-mime-icon48x48.png | Bin 0 -> 4482 bytes
debian/qgis-mime-icon64x64.png | Bin 0 -> 6749 bytes
debian/qgis-mime-icon72x72.png | Bin 0 -> 7875 bytes
debian/qgis-mime-icon80x80.png | Bin 0 -> 9206 bytes
debian/qgis-mime-icon8x8.png | Bin 0 -> 602 bytes
debian/qgis-mime-icon96x96.png | Bin 0 -> 11765 bytes
debian/qgis-plugin-grass.install | 4 -
debian/qgis-plugin-grass.postrm | 12 -
debian/qgis-plugin-grass.preinst | 12 -
...n-grass.install => qgis-provider-grass.install} | 2 -
...rass.install => qgis-provider-grass.install.in} | 2 -
debian/qgis-provider-grass.postrm | 12 +
debian/qgis-provider-grass.preinst | 13 +
debian/qgis.desktop | 2 +-
debian/qgis.menu | 3 -
debian/qgis.xml | 22 +-
debian/rules | 49 +-
debian/source.lintian-overrides | 6 +-
debian/source/include-binaries | 13 +
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 ++++++++++
213 files changed, 3378 insertions(+), 1955 deletions(-)
diff --cc debian/changelog
index 5b5c46a,35b08d7..5e992e3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,49 +1,56 @@@
+ qgis (2.8.4+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 08 Dec 2015 18:01:50 +0100
+
+ qgis (2.8.4+dfsg-1~exp2) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 Dec 2015 14:23:35 +0100
+
+ qgis (2.8.4+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.8.4
+ * split grass provider off into a separate package.
+ * disable grass plugin on sid (because of GRASS7)
+ * add ubuntu wily
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Drop software-typo.patch, applied upstream. Refresh remaining patches.
+ * Add patch to fix 'occurrences' typo.
+ * Update symbols for amd64.
+ * Add build dependency on dh-python.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 01 Dec 2015 21:29:34 +0100
+
+ 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~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Re-enable GRASS plugin, still works with GRASS 6.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 Sep 2015 22:04:39 +0200
+
qgis (2.8.3+dfsg-3) unstable; urgency=medium
* Update watch file to use lowercase RC in uversionmangle.
diff --cc debian/control
index c039900,47ce16a..5161129
--- a/debian/control
+++ b/debian/control
@@@ -66,7 -68,9 +68,8 @@@ Depends: ${shlibs:Depends}
python-qgis (= ${binary:Version}),
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
-Recommends:
-# qgis-plugin-grass,
+Recommends: qgis-plugin-grass,
+ qgis-provider-grass,
qgis-plugin-globe
Suggests: gpsbabel
Conflicts: uim-qt3
@@@ -239,31 -243,44 +242,43 @@@ Description: QGIS - debugging symbol
.
This package contains debugging symbols.
+ Package: qgis-provider-grass
+ Architecture: any
+ Depends: qgis (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+ Breaks: qgis-plugin-grass (<< 2.8.4)
+ Replaces: qgis-plugin-grass (<< 2.8.4)
-Description: GRASS plugin for QGIS
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This provider enables GRASS data access in QGIS.
+
-#Package: qgis-plugin-grass
-#Architecture: any
-#Depends: qgis (= ${binary:Version}),
-# qgis-plugin-grass-common (= ${source:Version}),
-# ${shlibs:Depends},
-# ${misc:Depends},
-# grass-core (<< 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: python2.7,
-# ${misc:Depends}
-#Breaks: qgis-common (<< 1.5)
-#Replaces: qgis-common (<< 1.5)
-#Description: GRASS 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 GRASS plugin.
+Package: qgis-plugin-grass
+Architecture: any
+Depends: qgis (= ${binary:Version}),
+ qgis-plugin-grass-common (= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
- grass-core (<< 7)
++ grass-core
+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: python2.7,
+ ${misc:Depends}
+Breaks: qgis-common (<< 1.5)
+Replaces: qgis-common (<< 1.5)
+Description: GRASS 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 GRASS plugin.
Package: qgis-plugin-globe
Architecture: any
diff --cc debian/rules
index 5f0e049,ed2fa48..ac45cd2
--- a/debian/rules
+++ b/debian/rules
@@@ -23,7 -24,12 +24,12 @@@ ifeq (,$(DISTRIBUTION)
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
endif
- ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie jessie-backports 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 wily"))
++ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie jessie-backports stretch precise trusty utopic vivid wily"))
DISTRIBUTION := sid
endif
--
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