[qmapshack] 01/02: Merge tag 'debian/1.5.1-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Nov 28 20:16:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qmapshack.
commit 73337d208fa1f0d57f17d27fc2dd47108dd0500f
Merge: 98ba8c5 6bc775e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Nov 28 20:00:09 2015 +0100
Merge tag 'debian/1.5.1-1' into jessie-backports
Conflicts:
debian/changelog
CMakeLists.txt | 7 +-
CMakeLists.txt.user | 115 +-
CMakeLists.txt.user => CMakeLists.txt.user.044d553 | 2 +-
Doxyfile | 221 +-
MacOSX/build-cask.sh | 2 +-
MacOSX/build-qmapshack.sh | 18 +-
MacOSX/bundle.sh | 6 +-
MacOSX/env-path.sh | 5 +-
README.md | 8 +-
call_Uncrustify.cfg | 5 +-
changelog.txt | 17 +
debian/changelog | 13 +
debian/copyright | 4 +-
src/CMainWindow.cpp | 86 +-
src/CMainWindow.h | 4 +-
src/CMakeLists.txt | 62 +-
src/GeoMath.cpp | 2 +-
src/IAbout.ui | 55 +-
src/canvas/CCanvas.cpp | 32 +-
src/canvas/CCanvas.h | 10 +-
src/canvas/IDrawContext.cpp | 8 -
src/canvas/IDrawContext.h | 34 +-
src/canvas/IDrawObject.cpp | 3 -
src/canvas/IDrawObject.h | 7 +-
src/dem/CDemItem.cpp | 2 +-
src/dem/CDemPropSetup.cpp | 133 +-
src/dem/CDemPropSetup.h | 9 +-
src/dem/CDemVRT.cpp | 1 -
src/dem/CDemVRT.h | 2 +-
src/dem/IDem.cpp | 84 +-
src/dem/IDem.h | 54 +-
src/dem/IDemPathSetup.ui | 2 +-
src/dem/IDemPropSetup.ui | 395 +++-
src/device/CDeviceGarmin.cpp | 3 -
src/device/CDeviceGarmin.h | 8 +-
src/device/IDeviceWatcher.h | 4 +-
src/gis/CGisListDB.cpp | 3 +-
src/gis/CGisListDB.h | 2 +-
src/gis/CGisListWks.cpp | 4 -
src/gis/CGisListWks.h | 8 +-
src/gis/IGisItem.cpp | 79 +-
src/gis/IGisItem.h | 38 +-
src/gis/IGisLine.cpp | 13 -
src/gis/IGisLine.h | 12 +-
src/gis/db/CDBFolderDatabase.h | 2 +-
src/gis/db/CDBProject.cpp | 39 +-
src/gis/db/CSelectSaveAction.cpp | 1 -
src/gis/db/CSelectSaveAction.h | 2 +-
src/gis/db/CSetupDatabase.cpp | 4 +-
src/gis/gpx/CGpxProject.cpp | 44 +-
src/gis/gpx/serialization.cpp | 439 ++--
src/gis/ovl/CDetailsOvlArea.cpp | 3 +-
src/gis/ovl/CDetailsOvlArea.h | 2 +-
src/gis/ovl/CGisItemOvlArea.cpp | 28 +-
src/gis/ovl/CGisItemOvlArea.h | 22 +-
src/gis/ovl/CScrOptOvlArea.cpp | 2 +-
src/gis/ovl/IDetailsOvlArea.ui | 2 +-
src/gis/prj/CDetailsPrj.cpp | 4 +-
src/gis/prj/CDetailsPrj.h | 4 +-
src/gis/prj/IGisProject.cpp | 33 +-
src/gis/prj/IGisProject.h | 28 +-
src/gis/qms/CQmsProject.cpp | 11 +-
src/gis/qms/serialization.cpp | 29 +-
src/gis/rte/CDetailsRte.cpp | 3 +-
src/gis/rte/CDetailsRte.h | 2 +-
src/gis/rte/CGisItemRte.cpp | 49 +-
src/gis/rte/CGisItemRte.h | 41 +-
src/gis/rte/CScrOptRte.cpp | 3 +-
src/gis/rte/IDetailsRte.ui | 5 +-
src/gis/rte/IScrOptRte.ui | 15 +
src/gis/rte/router/CRouterRoutino.cpp | 1 -
src/gis/rte/router/CRouterRoutino.h | 2 +-
src/gis/tnv/CTwoNavProject.cpp | 8 +-
src/gis/tnv/serialization.cpp | 120 +-
src/gis/trk/CActivityTrk.cpp | 5 +-
src/gis/trk/CActivityTrk.h | 4 +-
src/gis/trk/CCutTrk.cpp | 82 +
src/gis/{rte/CDetailsRte.h => trk/CCutTrk.h} | 46 +-
src/gis/trk/CDetailsTrk.cpp | 361 ++-
src/gis/trk/CDetailsTrk.h | 28 +-
src/gis/trk/CGisItemTrk.cpp | 757 +++---
src/gis/trk/CGisItemTrk.h | 227 +-
src/gis/trk/CKnownExtension.cpp | 137 ++
src/gis/trk/CKnownExtension.h | 57 +
src/gis/trk/CPropertyTrk.cpp | 119 +
src/gis/trk/CPropertyTrk.h | 79 +
src/gis/trk/CScrOptTrk.cpp | 2 +-
src/gis/trk/ICutTrk.ui | 121 +
src/gis/trk/IDetailsTrk.ui | 572 +++--
src/gis/trk/IScrOptTrk.ui | 7 +-
.../trk/filter/CFilterInvalid.cpp} | 31 +-
.../trk/filter/CFilterInvalid.h} | 26 +-
src/gis/trk/filter/IFilterInvalid.ui | 108 +
src/gis/trk/filter/filter.cpp | 58 +-
src/gis/wpt/CDetailsGeoCache.cpp | 1 -
src/gis/wpt/CDetailsGeoCache.h | 2 +-
src/gis/wpt/CDetailsWpt.cpp | 75 +-
src/gis/wpt/CDetailsWpt.h | 2 +-
src/gis/wpt/CGisItemWpt.cpp | 97 +-
src/gis/wpt/CGisItemWpt.h | 58 +-
src/gis/wpt/CScrOptWpt.cpp | 23 +-
src/gis/wpt/CSetupNewWpt.cpp | 25 +-
src/gis/wpt/IDetailsGeoCache.ui | 4 +-
src/gis/wpt/IDetailsWpt.ui | 4 +-
src/gis/wpt/IScrOptWpt.ui | 2 +-
src/grid/CGrid.cpp | 5 -
src/grid/CGrid.h | 8 +-
src/helpers/CAppSetup.cpp | 4 +-
src/helpers/CDraw.cpp | 66 +-
src/helpers/CDraw.h | 27 +-
src/helpers/CPhotoViewer.cpp | 71 +-
src/helpers/CPhotoViewer.h | 11 +-
src/helpers/CSelectCopyAction.cpp | 1 -
src/helpers/CSelectCopyAction.h | 2 +-
templates/header.h => src/helpers/INotifiable.h | 16 +-
src/helpers/ISelectCopyAction.ui | 3 +
src/icons/32x32/CSrcATemp.png | Bin 0 -> 753 bytes
src/icons/32x32/CSrcCAD.png | Bin 0 -> 857 bytes
src/icons/32x32/CSrcDepth.png | Bin 0 -> 735 bytes
src/icons/32x32/CSrcElevation.png | Bin 0 -> 392 bytes
src/icons/32x32/CSrcHR.png | Bin 0 -> 1326 bytes
src/icons/32x32/CSrcSlope.png | Bin 0 -> 890 bytes
src/icons/32x32/CSrcSolid.png | Bin 0 -> 212 bytes
src/icons/32x32/CSrcSpeed.png | Bin 0 -> 1214 bytes
src/icons/32x32/CSrcUnknown.png | Bin 0 -> 665 bytes
src/icons/32x32/CSrcWTemp.png | Bin 0 -> 1063 bytes
src/icons/32x32/Progress.png | Bin 0 -> 487 bytes
src/icons/48x48/CSrcATemp.png | Bin 0 -> 1080 bytes
src/icons/48x48/CSrcCAD.png | Bin 0 -> 1378 bytes
src/icons/48x48/CSrcDepth.png | Bin 0 -> 1100 bytes
src/icons/48x48/CSrcElevation.png | Bin 0 -> 471 bytes
src/icons/48x48/CSrcHR.png | Bin 0 -> 2170 bytes
src/icons/48x48/CSrcSlope.png | Bin 0 -> 1375 bytes
src/icons/48x48/CSrcSolid.png | Bin 0 -> 264 bytes
src/icons/48x48/CSrcSpeed.png | Bin 0 -> 2015 bytes
src/icons/48x48/CSrcUnknown.png | Bin 0 -> 953 bytes
src/icons/48x48/CSrcWTemp.png | Bin 0 -> 1599 bytes
src/icons/48x48/Progress.png | Bin 0 -> 650 bytes
src/icons/CSrcATemp.svg | 116 +
src/icons/CSrcCAD.svg | 142 ++
src/icons/CSrcDepth.svg | 126 +
src/icons/CSrcElevation.svg | 77 +
src/icons/CSrcHR.svg | 81 +
src/icons/CSrcSlope.svg | 87 +
src/icons/CSrcSolid.svg | 78 +
src/icons/CSrcSpeed.svg | 88 +
src/icons/CSrcUnknown.svg | 82 +
src/icons/CSrcWTemp.svg | 122 +
src/icons/Progress.svg | 76 +
src/icons/makeicons | 47 +-
src/locale/qmapshack_cs.ts | 1557 ++++++++-----
src/locale/qmapshack_de.ts | 1531 +++++++-----
src/locale/qmapshack_es.ts | 1511 +++++++-----
src/locale/qmapshack_fr.ts | 1509 +++++++-----
src/locale/qmapshack_nl.ts | 2438 +++++++++++---------
src/map/CMapIMG.cpp | 11 +-
src/map/CMapIMG.h | 4 +-
src/map/CMapItem.cpp | 2 +-
src/map/CMapItem.h | 4 +-
src/map/CMapJNX.cpp | 4 -
src/map/CMapJNX.h | 8 +-
src/map/CMapTMS.cpp | 7 +-
src/map/CMapTMS.h | 12 +-
src/map/CMapVRT.cpp | 4 +-
src/map/CMapVRT.h | 4 +-
src/map/CMapWMTS.cpp | 8 +-
src/map/CMapWMTS.h | 8 +-
src/map/IMap.cpp | 8 -
src/map/IMap.h | 18 +-
src/map/cache/CDiskCache.cpp | 1 -
src/map/cache/CDiskCache.h | 4 +-
src/map/garmin/CGarminPoint.cpp | 13 -
src/map/garmin/CGarminPoint.h | 12 +-
src/map/garmin/CGarminPolygon.cpp | 41 +-
src/map/garmin/CGarminPolygon.h | 22 +-
src/map/garmin/CGarminTyp.cpp | 14 +-
src/map/garmin/CGarminTyp.h | 4 +-
src/map/garmin/IGarminStrTbl.cpp | 6 -
src/map/garmin/IGarminStrTbl.h | 18 +-
src/mouse/CMouseEditArea.cpp | 2 +-
src/mouse/CMouseEditRte.cpp | 2 +-
src/mouse/CMouseEditTrk.cpp | 3 +-
src/mouse/CMouseEditTrk.h | 2 +-
src/mouse/CMouseNormal.cpp | 25 +-
src/mouse/CMouseNormal.h | 8 +-
src/mouse/CMousePrint.cpp | 8 -
src/mouse/CMousePrint.h | 16 +-
src/mouse/CMouseRangeTrk.cpp | 33 +-
src/mouse/CMouseRangeTrk.h | 6 +-
src/mouse/CScrOptRangeTrk.cpp | 6 +-
src/mouse/CScrOptUnclutter.cpp | 1 -
src/mouse/CScrOptUnclutter.h | 2 +-
src/mouse/IMouse.h | 4 +
src/mouse/IScrOpt.cpp | 19 -
src/mouse/IScrOpt.h | 2 -
src/mouse/line/CLineOpAddPoint.cpp | 2 -
src/mouse/line/CLineOpAddPoint.h | 4 +-
src/mouse/line/CLineOpMovePoint.cpp | 1 -
src/mouse/line/CLineOpMovePoint.h | 2 +-
src/mouse/line/CLineOpSelectRange.cpp | 18 +-
src/mouse/line/CLineOpSelectRange.h | 6 +-
src/mouse/line/CScrOptRangeLine.cpp | 2 +-
src/mouse/line/ILineOp.cpp | 8 -
src/mouse/line/ILineOp.h | 24 +-
src/mouse/line/IMouseEditLine.cpp | 14 +-
src/mouse/line/IMouseEditLine.h | 10 +-
src/mouse/line/IScrOptRangeLine.ui | 2 +-
src/pics/about.png | Bin 27155 -> 154467 bytes
src/plot/CPlot.cpp | 123 +
src/plot/{CPlotSpeed.h => CPlot.h} | 32 +-
src/plot/CPlotAxis.cpp | 20 -
src/plot/CPlotAxis.h | 32 +-
src/plot/CPlotData.cpp | 26 +-
src/plot/CPlotData.h | 21 +-
src/plot/CPlotDistance.cpp | 125 -
src/plot/CPlotProfile.cpp | 18 +-
src/plot/CPlotSpeed.cpp | 123 -
src/plot/CPlotTrack.cpp | 1 -
src/plot/CPlotTrack.h | 2 +-
src/plot/IPlot.cpp | 35 +-
src/plot/IPlot.h | 36 +-
src/plot/ITrack.cpp | 6 -
src/plot/ITrack.h | 12 +-
src/print/CPrintDialog.cpp | 24 +-
src/print/CPrintDialog.h | 4 +-
src/qlgt/CQlb.h | 6 +-
src/qlgt/CQlgtWpt.cpp | 2 +-
src/qlgt/converter.cpp | 6 +-
src/resources.qrc | 25 +
src/tool/CImportDatabase.cpp | 10 +-
src/tool/CMapVrtBuilder.cpp | 19 +-
src/tool/CMapVrtBuilder.h | 2 +-
src/tool/CRoutinoDatabaseBuilder.cpp | 3 -
src/tool/CRoutinoDatabaseBuilder.h | 6 +-
src/tool/IToolShell.cpp | 27 +-
src/tool/IToolShell.h | 1 +
src/units/IUnitsSetup.ui | 49 +-
src/version.h | 2 +-
src/widgets/CColorLegend.cpp | 182 ++
.../CPhotoAlbum.h => widgets/CColorLegend.h} | 55 +-
.../source.cpp => src/widgets/CDoubleSpinBox.cpp | 21 +-
.../CPlotDistance.h => widgets/CDoubleSpinBox.h} | 34 +-
src/{helpers => widgets}/CFadingIcon.cpp | 1 -
src/{helpers => widgets}/CFadingIcon.h | 2 +-
src/{helpers => widgets}/CHistoryListWidget.cpp | 2 +-
src/{helpers => widgets}/CHistoryListWidget.h | 0
src/{helpers => widgets}/CPhotoAlbum.cpp | 42 +-
src/{helpers => widgets}/CPhotoAlbum.h | 4 +-
src/{helpers => widgets}/CTextEditWidget.cpp | 0
src/{helpers => widgets}/CTextEditWidget.h | 0
src/widgets/CTinySpinBox.cpp | 96 +
src/widgets/CTinySpinBox.h | 71 +
src/{helpers => widgets}/IPhotoAlbum.ui | 0
src/{helpers => widgets}/ITextEditWidget.ui | 0
templates/header.h | 2 +-
templates/source.cpp | 4 -
256 files changed, 10891 insertions(+), 6424 deletions(-)
diff --cc debian/changelog
index ac5e083,75429e0..fbdf816
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,23 @@@
+ qmapshack (1.5.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 22 Nov 2015 18:49:33 +0100
+
+ qmapshack (1.5.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update paths for moved files in copyright file.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 22 Nov 2015 17:00:59 +0100
+
+qmapshack (1.4.0-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Drop qt53-qFormatLogMessage.patch, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 22 Nov 2015 14:01:25 +0100
+
qmapshack (1.4.0-1) unstable; urgency=medium
* New upstream release.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list