[qgis] branch master updated (115dcce -> 9e1351d)

Bas Couwenberg sebastic at xs4all.nl
Wed Dec 3 14:27:39 UTC 2014


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

sebastic-guest pushed a change to branch master
in repository qgis.

      from  115dcce   Mark allows-to-typo.patch as Applied-Upstream.
       new  1d1ecb0   Imported Upstream version 2.6.1
       new  080e6fa   Merge tag 'upstream/2.6.1'
       new  df0b611   New upstream release.
       new  9e1351d   Refresh patches.

The 4 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                                          |    208 +
 cmake_templates/Doxyfile.in                        |      2 +-
 debian/changelog                                   |     10 +-
 debian/control                                     |     32 +-
 ...2.6.0.install => libqgis-analysis2.6.1.install} |      0
 ...6.0.postinst => libqgis-analysis2.6.1.postinst} |      0
 ...is2.6.0.postrm => libqgis-analysis2.6.1.postrm} |      0
 ...2.6.0.symbols => libqgis-analysis2.6.1.symbols} |      0
 ...core2.6.0.install => libqgis-core2.6.1.install} |      0
 ...re2.6.0.postinst => libqgis-core2.6.1.postinst} |      0
 ...s-core2.6.0.postrm => libqgis-core2.6.1.postrm} |      0
 ...core2.6.0.symbols => libqgis-core2.6.1.symbols} |      0
 ....install => libqgis-customwidgets2.6.1.install} |      0
 ...s-gui2.6.0.install => libqgis-gui2.6.1.install} |      0
 ...gui2.6.0.postinst => libqgis-gui2.6.1.postinst} |      0
 ...gis-gui2.6.0.postrm => libqgis-gui2.6.1.postrm} |      0
 ...s-gui2.6.0.symbols => libqgis-gui2.6.1.symbols} |      0
 ...nstall => libqgis-networkanalysis2.6.1.install} |      0
 ...tinst => libqgis-networkanalysis2.6.1.postinst} |      0
 ....postrm => libqgis-networkanalysis2.6.1.postrm} |      0
 ...ymbols => libqgis-networkanalysis2.6.1.symbols} |      0
 ...rass2.6.0.install => libqgisgrass2.6.1.install} |      0
 ...ss2.6.0.postinst => libqgisgrass2.6.1.postinst} |      0
 ...sgrass2.6.0.postrm => libqgisgrass2.6.1.postrm} |      0
 ...rass2.6.0.symbols => libqgisgrass2.6.1.symbols} |      0
 ...hon2.6.0.install => libqgispython2.6.1.install} |      0
 ...n2.6.0.postinst => libqgispython2.6.1.postinst} |      0
 ...ython2.6.0.postrm => libqgispython2.6.1.postrm} |      0
 ...hon2.6.0.symbols => libqgispython2.6.1.symbols} |      0
 debian/patches/allows-to-typo.patch                |    199 +-
 doc/TRANSLATORS                                    |     75 +-
 doc/api_break.dox                                  |      4 +
 i18n/CMakeLists.txt                                |      2 +-
 i18n/qgis_af.ts                                    |     99 +-
 i18n/qgis_ar.ts                                    |    101 +-
 i18n/qgis_bg.ts                                    |     99 +-
 i18n/qgis_bn.ts                                    |     99 +-
 i18n/qgis_bs.ts                                    |     98 +-
 i18n/qgis_ca.ts                                    |     96 +-
 i18n/qgis_cs.ts                                    |     94 +-
 i18n/qgis_da.ts                                    |     95 +-
 i18n/qgis_de.ts                                    |    430 +-
 i18n/qgis_el.ts                                    |     97 +-
 i18n/qgis_en.ts                                    |     99 +-
 i18n/qgis_es.ts                                    |  77047 +++++-------
 i18n/qgis_et.ts                                    |     99 +-
 i18n/qgis_eu.ts                                    |     93 +-
 i18n/qgis_fa.ts                                    |     98 +-
 i18n/qgis_fi.ts                                    | 114249 +++++++++---------
 i18n/qgis_fr.ts                                    |     93 +-
 i18n/qgis_gl.ts                                    |     93 +-
 i18n/qgis_he.ts                                    |     99 +-
 i18n/qgis_hi.ts                                    |  25097 ++--
 i18n/qgis_hr.ts                                    |    100 +-
 i18n/qgis_hu.ts                                    |     92 +-
 i18n/qgis_id.ts                                    |     92 +-
 i18n/qgis_is.ts                                    |     97 +-
 i18n/qgis_it.ts                                    |     93 +-
 i18n/qgis_ja.ts                                    |     92 +-
 i18n/qgis_ka.ts                                    |     99 +-
 i18n/qgis_km.ts                                    |     93 +-
 i18n/qgis_ko.ts                                    |     92 +-
 i18n/qgis_lo.ts                                    |     99 +-
 i18n/qgis_lt.ts                                    |     96 +-
 i18n/qgis_lv.ts                                    |     94 +-
 i18n/qgis_ml.ts                                    |     99 +-
 i18n/qgis_mn.ts                                    |     99 +-
 i18n/qgis_mr.ts                                    |     99 +-
 i18n/qgis_nb.ts                                    |    111 +-
 i18n/qgis_nl.ts                                    |     93 +-
 i18n/qgis_pl.ts                                    |     94 +-
 i18n/qgis_pt_BR.ts                                 |     93 +-
 i18n/qgis_pt_PT.ts                                 |     93 +-
 i18n/qgis_ro.ts                                    |     94 +-
 i18n/qgis_ru.ts                                    |     94 +-
 i18n/qgis_sk.ts                                    |     98 +-
 i18n/qgis_sl.ts                                    |     97 +-
 i18n/qgis_sq.ts                                    |     99 +-
 i18n/qgis_sr_Cyrl.ts                               |    100 +-
 i18n/qgis_sr_Latn.ts                               |    100 +-
 i18n/qgis_sv.ts                                    |     99 +-
 i18n/qgis_sw.ts                                    |     99 +-
 i18n/qgis_ta.ts                                    |     99 +-
 i18n/qgis_te.ts                                    |     99 +-
 i18n/qgis_th.ts                                    |     98 +-
 i18n/qgis_tl.ts                                    |    100 +-
 i18n/qgis_tr.ts                                    |     96 +-
 i18n/qgis_uk.ts                                    |    100 +-
 i18n/qgis_vi.ts                                    |     98 +-
 i18n/qgis_xh.ts                                    |     98 +-
 i18n/qgis_zh_CN.ts                                 |     96 +-
 i18n/qgis_zh_TW.ts                                 |     94 +-
 python/CMakeLists.txt                              |      1 +
 python/core/composer/qgscomposerhtml.sip           |      4 +-
 python/core/qgsgeometry.sip                        |      2 +-
 python/core/symbology-ng/qgsfillsymbollayerv2.sip  |      8 +-
 python/ext-libs/owslib/csw.py                      |      9 +-
 python/gui/symbology-ng/qgscolorrampcombobox.sip   |      6 +
 python/plugins/MetaSearch/dialogs/maindialog.py    |      7 +-
 scripts/ts2cpp.pl                                  |      5 +
 src/app/qgisapp.cpp                                |      2 +-
 src/browser/CMakeLists.txt                         |      2 +
 src/browser/main.cpp                               |     36 +
 src/core/composer/qgscomposerhtml.cpp              |     18 +-
 src/core/composer/qgscomposerhtml.h                |      4 +-
 src/core/layertree/qgslayertreelayer.cpp           |      5 +-
 src/core/layertree/qgslayertreemodellegendnode.cpp |     10 +-
 src/core/qgsgeometry.h                             |      2 +-
 src/core/qgslegendrenderer.cpp                     |      2 +-
 src/core/qgsmaphittest.cpp                         |      1 +
 src/core/qgsvectorfilewriter.cpp                   |     15 +-
 src/core/qgsvectorlayer.cpp                        |      3 +
 src/core/qgsvectorlayerfeatureiterator.cpp         |      4 +-
 src/core/symbology-ng/qgsfillsymbollayerv2.h       |      8 +-
 src/core/symbology-ng/qgslinesymbollayerv2.cpp     |     26 +-
 src/core/symbology-ng/qgslinesymbollayerv2.h       |      1 +
 .../symbology-ng/qgspointdisplacementrenderer.cpp  |     98 +-
 .../symbology-ng/qgspointdisplacementrenderer.h    |     20 +-
 src/core/symbology-ng/qgsvectorcolorrampv2.cpp     |     14 +-
 src/gui/qgsidentifymenu.cpp                        |      2 +-
 .../qgscategorizedsymbolrendererv2widget.cpp       |      2 +-
 src/gui/symbology-ng/qgscolorrampcombobox.cpp      |      6 +
 src/gui/symbology-ng/qgscolorrampcombobox.h        |      6 +
 src/mapserver/qgsserverprojectparser.cpp           |      5 +-
 src/mapserver/qgswmsserver.cpp                     |      2 +
 src/providers/oracle/CMakeLists.txt                |      1 +
 src/ui/qgisapp.ui                                  |      4 +-
 src/ui/qgscomposermapwidgetbase.ui                 |      8 +-
 tests/src/python/test_qgsappstartup.py             |      6 +-
 130 files changed, 103289 insertions(+), 119753 deletions(-)
 rename debian/{libqgis-analysis2.6.0.install => libqgis-analysis2.6.1.install} (100%)
 rename debian/{libqgis-analysis2.6.0.postinst => libqgis-analysis2.6.1.postinst} (100%)
 rename debian/{libqgis-analysis2.6.0.postrm => libqgis-analysis2.6.1.postrm} (100%)
 rename debian/{libqgis-analysis2.6.0.symbols => libqgis-analysis2.6.1.symbols} (100%)
 rename debian/{libqgis-core2.6.0.install => libqgis-core2.6.1.install} (100%)
 rename debian/{libqgis-core2.6.0.postinst => libqgis-core2.6.1.postinst} (100%)
 rename debian/{libqgis-core2.6.0.postrm => libqgis-core2.6.1.postrm} (100%)
 rename debian/{libqgis-core2.6.0.symbols => libqgis-core2.6.1.symbols} (100%)
 rename debian/{libqgis-customwidgets2.6.0.install => libqgis-customwidgets2.6.1.install} (100%)
 rename debian/{libqgis-gui2.6.0.install => libqgis-gui2.6.1.install} (100%)
 rename debian/{libqgis-gui2.6.0.postinst => libqgis-gui2.6.1.postinst} (100%)
 rename debian/{libqgis-gui2.6.0.postrm => libqgis-gui2.6.1.postrm} (100%)
 rename debian/{libqgis-gui2.6.0.symbols => libqgis-gui2.6.1.symbols} (100%)
 rename debian/{libqgis-networkanalysis2.6.0.install => libqgis-networkanalysis2.6.1.install} (100%)
 rename debian/{libqgis-networkanalysis2.6.0.postinst => libqgis-networkanalysis2.6.1.postinst} (100%)
 rename debian/{libqgis-networkanalysis2.6.0.postrm => libqgis-networkanalysis2.6.1.postrm} (100%)
 rename debian/{libqgis-networkanalysis2.6.0.symbols => libqgis-networkanalysis2.6.1.symbols} (100%)
 rename debian/{libqgisgrass2.6.0.install => libqgisgrass2.6.1.install} (100%)
 rename debian/{libqgisgrass2.6.0.postinst => libqgisgrass2.6.1.postinst} (100%)
 rename debian/{libqgisgrass2.6.0.postrm => libqgisgrass2.6.1.postrm} (100%)
 rename debian/{libqgisgrass2.6.0.symbols => libqgisgrass2.6.1.symbols} (100%)
 rename debian/{libqgispython2.6.0.install => libqgispython2.6.1.install} (100%)
 rename debian/{libqgispython2.6.0.postinst => libqgispython2.6.1.postinst} (100%)
 rename debian/{libqgispython2.6.0.postrm => libqgispython2.6.1.postrm} (100%)
 rename debian/{libqgispython2.6.0.symbols => libqgispython2.6.1.symbols} (100%)

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