This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository qmapshack.
commit 5d5e78ef38abebfac1268256366344285257b8ce Merge: 540b981 42b2243 Author: Bas Couwenberg <[email protected]> Date: Sat Jul 9 12:03:20 2016 +0200 Merge tag 'debian/1.6.2-1' into jessie-backports Conflicts: debian/changelog debian/patches/series .hg_archival.txt | 4 + .hgsub | 1 + .hgsubstate | 1 + .hgtags | 43 + CMakeLists.txt | 27 +- CMakeLists.txt.user | 250 --- MacOSX/bundle.sh | 84 +- MacOSX/env-path.sh | 2 +- changelog.txt | 27 + debian/changelog | 18 + debian/control | 2 +- debian/copyright | 2 +- debian/patches/hurd.patch | 15 - debian/patches/kfreebsd.patch | 16 - debian/patches/original-typo.patch | 2 +- debian/patches/series | 3 - debian/watch | 5 +- msvc_64/3rdparty.txt | 8 +- src/CMainWindow.cpp | 85 +- src/CMainWindow.h | 3 + src/CMakeLists.txt | 59 +- src/canvas/CCanvas.cpp | 10 +- src/canvas/CCanvas.h | 12 +- src/dem/CDemList.cpp | 23 +- src/dem/CDemList.h | 2 + src/dem/IDemList.ui | 2 +- src/gis/CGisListDB.cpp | 1 + src/gis/CGisListWks.cpp | 55 +- src/gis/CGisListWks.h | 2 + src/gis/CGisWidget.cpp | 21 +- src/gis/CGisWidget.h | 2 + src/gis/IGisItem.cpp | 33 +- src/gis/IGisItem.h | 12 + src/gis/WptIcons.cpp | 3 +- src/gis/db/CDBFolderSqlite.cpp | 26 +- src/gis/db/CDBFolderSqlite.h | 3 +- src/gis/db/IDB.cpp | 26 +- src/gis/db/IDB.h | 2 +- src/gis/db/IDBMysql.cpp | 3 +- src/gis/db/IDBSqlite.cpp | 4 +- src/gis/db/IDBSqlite.h | 2 +- src/gis/fit/CFitProject.cpp | 2 +- src/gis/gpx/CGpxProject.cpp | 20 + src/gis/gpx/serialization.cpp | 2 + src/gis/prj/CDetailsPrj.cpp | 76 +- src/gis/prj/IGisProject.h | 1 + src/gis/qms/serialization.cpp | 39 +- src/gis/rte/CCreateRouteFromWpt.cpp | 10 +- src/gis/rte/CGisItemRte.cpp | 194 +- src/gis/rte/CGisItemRte.h | 22 +- src/gis/rte/CScrOptRte.cpp | 8 + src/gis/rte/CScrOptRte.h | 1 + src/gis/rte/IScrOptRte.ui | 14 + src/gis/rte/router/CRouterRoutino.cpp | 14 +- src/gis/trk/CDetailsTrk.cpp | 94 +- src/gis/trk/CDetailsTrk.h | 15 - src/gis/trk/CGisItemTrk.cpp | 248 ++- src/gis/trk/CGisItemTrk.h | 78 +- src/gis/trk/CKnownExtension.cpp | 17 + src/gis/trk/CKnownExtension.h | 41 +- src/gis/trk/CPropertyTrk.cpp | 6 +- src/gis/trk/CPropertyTrk.h | 8 +- src/gis/trk/CTableTrk.cpp | 208 ++ src/gis/trk/CTableTrk.h | 64 + src/gis/trk/IDetailsTrk.ui | 23 +- src/gis/trk/filter/CFilterInvalid.cpp | 2 +- src/gis/trk/filter/IFilterInvalid.ui | 2 +- src/gis/trk/filter/filter.cpp | 23 +- src/helpers/CElevationDialog.cpp | 13 +- src/helpers/CPositionDialog.cpp | 14 +- src/helpers/CWptIconDialog.cpp | 1 + src/helpers/IWptIconDialog.ui | 2 +- src/icons/32x32/AreaOn.png | Bin 0 -> 1907 bytes src/icons/32x32/RouteOn.png | Bin 0 -> 1222 bytes src/icons/32x32/SQLiteNoConn.png | Bin 0 -> 1986 bytes src/icons/32x32/TrackOn.png | Bin 0 -> 1436 bytes src/icons/32x32/Waypoint.png | Bin 0 -> 705 bytes src/icons/32x32/WaypointOn.png | Bin 0 -> 1189 bytes src/icons/48x48/AreaOn.png | Bin 0 -> 3076 bytes src/icons/48x48/RouteOn.png | Bin 0 -> 1877 bytes src/icons/48x48/SQLiteNoConn.png | Bin 0 -> 3352 bytes src/icons/48x48/TrackOn.png | Bin 0 -> 2205 bytes src/icons/48x48/Waypoint.png | Bin 0 -> 1089 bytes src/icons/48x48/WaypointOn.png | Bin 0 -> 1810 bytes src/icons/AreaOn.svg | 242 +++ src/icons/Route.svg | 12 +- src/icons/RouteOn.svg | 116 ++ src/icons/SQLiteNoConn.svg | 187 ++ src/icons/Track.svg | 4 +- src/icons/{Track.svg => TrackOn.svg} | 34 +- src/icons/Waypoint.svg | 82 + src/icons/WaypointOn.svg | 101 + src/icons/hicolor/128x128/apps/QMapShack.png | Bin 0 -> 5461 bytes src/icons/hicolor/16x16/apps/QMapShack.png | Bin 0 -> 868 bytes src/icons/hicolor/192x192/apps/QMapShack.png | Bin 0 -> 8793 bytes src/icons/hicolor/22x22/apps/QMapShack.png | Bin 0 -> 1153 bytes src/icons/hicolor/24x24/apps/QMapShack.png | Bin 0 -> 1239 bytes src/icons/hicolor/256x256/apps/QMapShack.png | Bin 0 -> 12480 bytes src/icons/hicolor/32x32/apps/QMapShack.png | Bin 0 -> 1178 bytes src/icons/hicolor/36x36/apps/QMapShack.png | Bin 0 -> 1316 bytes src/icons/hicolor/40x40/apps/QMapShack.png | Bin 0 -> 1443 bytes src/icons/hicolor/42x42/apps/QMapShack.png | Bin 0 -> 1530 bytes src/icons/hicolor/48x48/apps/QMapShack.png | Bin 0 -> 1738 bytes src/icons/hicolor/512x512/apps/QMapShack.png | Bin 0 -> 19731 bytes src/icons/hicolor/64x64/apps/QMapShack.png | Bin 0 -> 2323 bytes src/icons/hicolor/72x72/apps/QMapShack.png | Bin 0 -> 2709 bytes src/icons/hicolor/80x80/apps/QMapShack.png | Bin 0 -> 3161 bytes src/icons/hicolor/8x8/apps/QMapShack.png | Bin 0 -> 551 bytes src/icons/hicolor/96x96/apps/QMapShack.png | Bin 0 -> 3908 bytes src/icons/hicolor/scalable/apps/QMapShack.svg | 2117 ++++++++++++++++++++ src/locale/qmapshack.ts | 704 ++++--- src/locale/qmapshack_cs.ts | 748 ++++--- src/locale/qmapshack_de.ts | 886 ++++---- src/locale/qmapshack_es.ts | 724 ++++--- src/locale/qmapshack_fr.ts | 728 ++++--- src/locale/qmapshack_nl.ts | 728 ++++--- src/main.cpp | 3 + src/map/CMapDraw.cpp | 11 +- src/map/CMapIMG.cpp | 8 +- src/map/CMapItem.cpp | 54 +- src/map/CMapJNX.cpp | 24 +- src/map/CMapList.cpp | 36 +- src/map/CMapList.h | 2 + src/map/CMapMAP.h | 6 +- src/map/CMapPropSetup.cpp | 19 +- src/map/CMapTMS.cpp | 17 +- src/map/CMapTMS.h | 6 +- src/map/CMapWMTS.h | 4 +- src/map/IMap.cpp | 24 +- src/map/IMap.h | 53 +- src/map/IMapList.ui | 2 +- src/map/OpenStreetMap.tms | 2 +- src/map/cache/CDiskCache.cpp | 71 +- src/map/cache/CDiskCache.h | 26 +- src/map/cache/IDiskCache.h | 41 - src/mouse/CMouseEditArea.cpp | 10 +- src/mouse/CMouseEditRte.cpp | 13 +- src/mouse/CMouseEditTrk.cpp | 13 +- src/mouse/CMouseSelect.cpp | 23 +- src/mouse/IScrOptSelect.ui | 14 +- src/mouse/line/IMouseEditLine.cpp | 15 +- src/plot/CPlotAxis.cpp | 2 +- src/plot/IPlot.cpp | 4 +- src/print/CPrintDialog.h | 15 +- src/qlgt/CQmsDb.cpp | 3 +- src/resources.qrc | 10 + src/setup/CAppSetupMac.cpp | 8 +- src/setup/IAppSetup.cpp | 2 +- src/tool/CMapVrtBuilder.cpp | 2 +- src/widgets/CTextEditWidget.cpp | 67 +- src/widgets/CTextEditWidget.h | 8 +- src/widgets/ITextEditWidget.ui | 48 +- test/OSX_uitest/qmstestcase.py | 273 +++ test/OSX_uitest/suite.py | 59 + test/OSX_uitest/testdatabase.py | 56 + test/OSX_uitest/testmaps.py | 125 ++ test/OSX_uitest/testroute.py | 229 +++ test/OSX_uitest/testtools.py | 108 + test/OSX_uitest/uiautomator.py | 502 +++++ test/OSX_uitest/uitest.cfg | 15 + .../unittest/CFitProject.cpp | 18 +- {src/test => test/unittest}/CGisItemTrk.cpp | 4 +- {src/test => test/unittest}/CGpxProject.cpp | 5 +- {src/test => test/unittest}/CKnownExtension.cpp | 4 +- test/unittest/CMakeLists.txt | 90 + {src/test => test/unittest}/CQmsProject.cpp | 4 +- {src/test => test/unittest}/CSlfReader.cpp | 2 +- {src/test => test/unittest}/TestHelper.cpp | 2 +- {src/test => test/unittest}/TestHelper.h | 2 +- test/unittest/input/fit/2015-05-07-22-03-17.fit | Bin 0 -> 54979 bytes .../unittest/input/fit/2015-05-07-22-03-17.fit.xml | 17 +- .../input/fit/2016-03-12_15-16-50_4_20.fit | Bin 0 -> 2846 bytes .../input/fit/2016-03-12_15-16-50_4_20.fit.xml | 24 + test/unittest/input/fit/Warisouderghem_course.fit | Bin 0 -> 38115 bytes .../input/fit/Warisouderghem_course.fit.xml | 22 + test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx | 117 ++ .../input/gpx/gpx_ext_GarminTPX1_cns.gpx.xml | 12 +- .../input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx | 0 .../input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml | 0 .../unittest}/input/gpx/gpx_ext_GarminTPX1_tp1.gpx | 0 .../input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml | 0 .../unittest}/input/gpx/qtt_gpx_file0.gpx | 0 .../unittest}/input/gpx/qtt_gpx_file0.gpx.xml | 0 .../unittest}/input/qms/V1.6.0_file1.qms | Bin .../unittest}/input/qms/V1.6.0_file1.qms.xml | 0 .../unittest}/input/qms/V1.6.0_file2.qms | Bin .../unittest}/input/qms/V1.6.0_file2.qms.xml | 0 {src/test => test/unittest}/input/randomize_hr.awk | 0 .../unittest}/input/slf/qtt_slf_file0.slf | 0 .../unittest}/input/slf/qtt_slf_file0.slf.xml | 0 {src/test => test/unittest}/main.cpp | 25 +- {src/test => test/unittest}/test_QMapShack.h | 22 +- 192 files changed, 8868 insertions(+), 3111 deletions(-) diff --cc debian/changelog index 120ac9d,80057f7..a231e7c --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,21 +1,28 @@@ + qmapshack (1.6.2-1) unstable; urgency=medium + + * New upstream release. + * Update watch file to handle new tag convention and filenamemangling. + * Drop patches applied upstream, refresh remaining patch. + * Drop custom hicolor icons installation, fixed upstream. + * Update copyright file, update years for Ivo Kronenberg, + + -- Bas Couwenberg <[email protected]> Sun, 03 Jul 2016 16:46:33 +0200 + + qmapshack (1.6.1-3) unstable; urgency=medium + + * Add patch to fix build failure with Qt5 < 5.4. + * Install application icons in hicolor theme. + * Bump Standards-Version to 3.9.8, changes: hicolor icons. + + -- Bas Couwenberg <[email protected]> Thu, 05 May 2016 16:36:19 +0200 + +qmapshack (1.6.1-2~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * Add patch to fix build failure with Qt5 < 5.4. + + -- Bas Couwenberg <[email protected]> Fri, 01 Apr 2016 19:42:01 +0200 + qmapshack (1.6.1-2) unstable; urgency=medium * Add patch for kFreeBSD support. diff --cc debian/control index 01c1d17,6450ce8..8c6997e --- a/debian/control +++ b/debian/control @@@ -16,9 -16,9 +16,9 @@@ Build-Depends: cmake qttools5-dev, qttools5-dev-tools, qtscript5-dev - Standards-Version: 3.9.7 + Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qmapshack.git -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qmapshack.git +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qmapshack.git -b jessie-backports Homepage: https://bitbucket.org/maproom/qmapshack/wiki/Home Package: qmapshack -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
