[qgis] branch jessie-backports updated (b0da4b9 -> f7d0d6f)

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Dec 14 11:29:57 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch jessie-backports
in repository qgis.

      from  b0da4b9   Rebuild for jessie-backports.
      adds  c5c575a   Use desktop file in favor of menu file per CTTE #741573.
      adds  14ea170   Also install MIME type icon in hicolor theme.
      adds  50d660c   Drop libqgis* post{inst,rm}, rely on dpkg-triggers for ldconfig.
      adds  f8458ec   Fix syntax for Keywords list in desktop files.
      adds  30bd9a8   Set distribution to unstable.
      adds  ce259d6   Add libgsl-dev as preferred build dependency, keep libgsl0-dev as alternative for backports.
      adds  cdcba8a   Set distribution to unstable.
      adds  ff02873   Imported Upstream version 2.8.4+dfsg
      adds  0721aae   Merge tag 'upstream/2.8.4+dfsg'
      adds  a4084d5   Fix CMake options to include GRASS options.
      adds  fa7e0ba   New upstream release.
      adds  0b12242   Drop software-typo.patch, applied upstream. Refresh remaining patches.
      adds  0021d21   Add python-pyspatialite to build dependencies.
      adds  6077452   Drop unused lintian override.
      adds  45bb1b8   Re-enable GRASS support for qgis-provider-grass.
      adds  ad92520   Add patch to fix 'occurrences' typo.
      adds  3708d9e   Drop changes from upstrema control.in.
      adds  325fba9   Add lintian override for hardening-no-fortify-functions false positive.
      adds  21097ee   Update symbols for amd64.
      adds  e794756   Add build dependency on dh-python.
      adds  9e4305c   Set distribution to experimental.
      adds  64f374f   Update symbols for other architectures.
      adds  c497665   Set distribution to unstable.
      adds  bba8958   Update symbols for other architectures.
      adds  35d8827   Set distribution to unstable.
       new  7de0cf4   Merge tag 'debian/2.8.4+dfsg-1' into jessie-backports
       new  a05e360   Fix qgis-provider-grass in control file.
       new  f7d0d6f   Rebuild for jessie-backports.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt                                     |   2 +-
 ChangeLog                                          | 561 +++++++++++++++++++
 debian/changelog                                   |  52 ++
 debian/compat.in                                   |   2 +-
 debian/control                                     |  70 ++-
 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 ------
 .../qgis-mime-icon128x128.png                      | Bin
 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, 3385 insertions(+), 1955 deletions(-)
 delete mode 100644 debian/libqgis-analysis2.8.3.postinst
 delete mode 100644 debian/libqgis-analysis2.8.3.postrm
 rename debian/{libqgis-analysis2.8.3.install => libqgis-analysis2.8.4.install} (100%)
 rename debian/{libqgis-analysis2.8.3.symbols => libqgis-analysis2.8.4.symbols} (97%)
 delete mode 100644 debian/libqgis-core2.8.3.postinst
 delete mode 100644 debian/libqgis-core2.8.3.postrm
 rename debian/{libqgis-core2.8.3.install => libqgis-core2.8.4.install} (100%)
 rename debian/{libqgis-core2.8.3.symbols => libqgis-core2.8.4.symbols} (98%)
 delete mode 100644 debian/libqgis-gui2.8.3.postinst
 delete mode 100644 debian/libqgis-gui2.8.3.postrm
 rename debian/{libqgis-gui2.8.3.install => libqgis-gui2.8.4.install} (100%)
 rename debian/{libqgis-gui2.8.3.symbols => libqgis-gui2.8.4.symbols} (98%)
 delete mode 100644 debian/libqgis-networkanalysis2.8.3.postinst
 delete mode 100644 debian/libqgis-networkanalysis2.8.3.postrm
 rename debian/{libqgis-networkanalysis2.8.3.install => libqgis-networkanalysis2.8.4.install} (100%)
 rename debian/{libqgis-networkanalysis2.8.3.symbols => libqgis-networkanalysis2.8.4.symbols} (89%)
 rename debian/{libqgis-server2.8.3.install => libqgis-server2.8.4.install} (100%)
 rename debian/{libqgis-server2.8.3.symbols => libqgis-server2.8.4.symbols} (97%)
 delete mode 100644 debian/libqgisgrass2.8.3.postinst
 delete mode 100644 debian/libqgisgrass2.8.3.postrm
 rename debian/{libqgisgrass2.8.3.install => libqgisgrass2.8.4.install} (100%)
 create mode 100644 debian/libqgisgrass2.8.4.lintian-overrides
 rename debian/{libqgisgrass2.8.3.symbols => libqgisgrass2.8.4.symbols} (88%)
 delete mode 100644 debian/libqgispython2.8.3.postinst
 delete mode 100644 debian/libqgispython2.8.3.postrm
 rename debian/{libqgispython2.8.3.install => libqgispython2.8.4.install} (100%)
 rename debian/{libqgispython2.8.3.symbols => libqgispython2.8.4.symbols} (71%)
 create mode 100644 debian/patches/occurrences-typo.patch
 delete mode 100644 debian/patches/software-typo.patch
 delete mode 100644 debian/qgis-icon.xpm
 copy images/icons/qgis-mime-icon.png => debian/qgis-mime-icon128x128.png (100%)
 create mode 100644 debian/qgis-mime-icon16x16.png
 create mode 100644 debian/qgis-mime-icon22x22.png
 create mode 100644 debian/qgis-mime-icon24x24.png
 create mode 100644 debian/qgis-mime-icon32x32.png
 create mode 100644 debian/qgis-mime-icon36x36.png
 create mode 100644 debian/qgis-mime-icon42x42.png
 create mode 100644 debian/qgis-mime-icon48x48.png
 create mode 100644 debian/qgis-mime-icon64x64.png
 create mode 100644 debian/qgis-mime-icon72x72.png
 create mode 100644 debian/qgis-mime-icon80x80.png
 create mode 100644 debian/qgis-mime-icon8x8.png
 create mode 100644 debian/qgis-mime-icon96x96.png
 delete mode 100755 debian/qgis-plugin-grass.postrm
 delete mode 100755 debian/qgis-plugin-grass.preinst
 copy debian/{qgis-plugin-grass.install => qgis-provider-grass.install} (68%)
 copy debian/{qgis-plugin-grass.install => qgis-provider-grass.install.in} (68%)
 create mode 100755 debian/qgis-provider-grass.postrm
 create mode 100755 debian/qgis-provider-grass.preinst
 delete mode 100644 debian/qgis.menu
 create mode 100644 tests/src/core/testqgsmarkerlinesymbol.cpp
 create mode 100644 tests/src/python/test_qgsmapunitscale.py
 create mode 100644 tests/testdata/control_images/markerlinesymbol/expected_line_offset/expected_line_offset.png
 create mode 100644 tests/testdata/marker_line_offset.qml

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