This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch stretch-backports in repository qmapshack.
commit f83eac4e1c133d8b53d742595a2f2980a41907b2 Merge: 38a4415 ea84dd9 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Jul 31 07:54:12 2017 +0200 Merge tag 'debian/1.9.0-1' into stretch-backports CMakeLists.txt | 4 +- CMakeLists.txt.user | 6 +- changelog.txt | 13 + debian/changelog | 7 + debian/gbp.conf | 14 +- src/CMainWindow.cpp | 277 +- src/CMainWindow.h | 17 +- src/CMakeLists.txt | 14 + src/IMainWindow.ui | 42 +- src/canvas/CCanvas.cpp | 61 +- src/canvas/CCanvas.h | 8 +- src/canvas/IDrawObject.cpp | 4 +- src/cursors/cursorAdd.png | Bin 1194 -> 0 bytes src/cursors/cursorMovePoint.png | Bin 1335 -> 0 bytes src/cursors/cursorPointAdd.png | Bin 0 -> 1342 bytes src/cursors/cursorPointDel.png | Bin 0 -> 1390 bytes src/cursors/cursorPointMove.png | Bin 0 -> 1440 bytes src/cursors/wptHighlightBlue.png | Bin 5295 -> 4734 bytes src/cursors/wptHighlightBlue.svg | 37 +- src/dem/CDemDraw.cpp | 40 + src/dem/CDemDraw.h | 3 + src/dem/CDemVRT.cpp | 49 +- src/dem/CDemVRT.h | 1 + src/dem/IDem.cpp | 79 +- src/dem/IDem.h | 13 + src/gis/CGisListWks.cpp | 9 +- src/gis/CGisWidget.cpp | 60 +- src/gis/CGisWidget.h | 6 +- src/gis/{Poi.h => CSetupFilter.cpp} | 40 +- src/gis/{Poi.h => CSetupFilter.h} | 27 +- src/gis/IGisItem.h | 2 +- src/gis/IGisWidget.ui | 67 +- src/gis/ISetupFilter.ui | 60 + src/gis/Poi.h | 1 + src/gis/fit/CFitProject.cpp | 8 +- src/gis/fit/decoder/CFitByteDataTransformer.cpp | 13 +- src/gis/fit/decoder/CFitDecoder.cpp | 8 +- src/gis/fit/decoder/CFitDefinitionMessage.cpp | 2 +- src/gis/fit/decoder/CFitDefinitionMessage.h | 2 +- src/gis/fit/decoder/CFitDevFieldDefinition.cpp | 3 +- .../fit/decoder/CFitDevFieldDefinitionState.cpp | 2 +- src/gis/fit/decoder/CFitFieldBuilder.cpp | 2 +- src/gis/fit/decoder/CFitFieldDataState.cpp | 121 +- src/gis/fit/decoder/CFitFieldDefinition.cpp | 6 +- src/gis/fit/decoder/CFitMessage.cpp | 2 +- src/gis/fit/decoder/CFitRecordContentState.cpp | 5 +- src/gis/fit/decoder/IFitDecoderState.cpp | 2 +- src/gis/fit/defs/CFitFieldProfile.cpp | 14 +- src/gis/fit/defs/CFitFieldProfile.h | 3 +- src/gis/fit/defs/fit_enums.h | 342 ++- src/gis/fit/defs/fit_fields.h | 225 +- src/gis/fit/serialization.cpp | 1 - src/gis/gpx/CGpxProject.cpp | 4 + src/gis/gpx/serialization.cpp | 9 +- src/gis/prj/IGisProject.cpp | 50 +- src/gis/prj/IGisProject.h | 11 + src/gis/rte/CGisItemRte.cpp | 3 + src/gis/rte/router/CRouterRoutino.cpp | 6 +- src/gis/search/CSearchGoogle.cpp | 7 +- src/gis/trk/CDetailsTrk.cpp | 6 +- src/gis/trk/CGisItemTrk.cpp | 8 +- src/gis/trk/CGisItemTrk.h | 1 + src/gis/trk/CKnownExtension.cpp | 52 +- src/gis/trk/CKnownExtension.h | 3 + .../trk/filter/CFilterTerrainSlope.cpp} | 44 +- .../{Poi.h => trk/filter/CFilterTerrainSlope.h} | 29 +- src/gis/trk/filter/IFilterTerrainSlope.ui | 99 + src/gis/trk/filter/filter.cpp | 22 + src/gis/wpt/CDetailsGeoCache.cpp | 2 +- src/helpers/CProgressDialog.cpp | 3 +- src/helpers/CToolBarConfig.cpp | 110 + src/helpers/CToolBarConfig.h | 51 + src/helpers/CToolBarSetupDialog.cpp | 107 + src/helpers/CToolBarSetupDialog.h | 63 + src/helpers/IToolBarSetupDialog.ui | 72 + src/icons/32x32/CSrcDistance.png | Bin 0 -> 763 bytes src/icons/32x32/CSrcSeaLevelPressure.png | Bin 0 -> 1894 bytes src/icons/32x32/CSrcVertSpeed.png | Bin 0 -> 1215 bytes src/icons/32x32/PointAdd.png | Bin 0 -> 581 bytes src/icons/32x32/PointDel.png | Bin 0 -> 738 bytes src/icons/32x32/PointMove.png | Bin 848 -> 975 bytes src/icons/32x32/ToggleDem.png | Bin 0 -> 792 bytes src/icons/32x32/ToggleDocks.png | Bin 0 -> 1491 bytes src/icons/32x32/ToggleGis.png | Bin 0 -> 1096 bytes src/icons/32x32/ToggleMaps.png | Bin 0 -> 1146 bytes src/icons/32x32/ToggleRouter.png | Bin 0 -> 1055 bytes src/icons/32x32/ToolBar.png | Bin 0 -> 393 bytes src/icons/32x32/ToolBarSetup.png | Bin 0 -> 2080 bytes src/icons/48x48/CSrcDistance.png | Bin 0 -> 944 bytes src/icons/48x48/CSrcSeaLevelPressure.png | Bin 0 -> 3227 bytes src/icons/48x48/CSrcVertSpeed.png | Bin 0 -> 1957 bytes src/icons/48x48/PointAdd.png | Bin 0 -> 769 bytes src/icons/48x48/PointDel.png | Bin 0 -> 1023 bytes src/icons/48x48/PointMove.png | Bin 1319 -> 1425 bytes src/icons/48x48/ToggleDem.png | Bin 0 -> 1095 bytes src/icons/48x48/ToggleDocks.png | Bin 0 -> 2168 bytes src/icons/48x48/ToggleGis.png | Bin 0 -> 1562 bytes src/icons/48x48/ToggleMaps.png | Bin 0 -> 1730 bytes src/icons/48x48/ToggleRouter.png | Bin 0 -> 1493 bytes src/icons/48x48/ToolBar.png | Bin 0 -> 429 bytes src/icons/48x48/ToolBarSetup.png | Bin 0 -> 3512 bytes src/icons/CSrcDistance.svg | 121 + src/icons/CSrcSeaLevelPressure.svg | 127 + src/icons/CSrcVertSpeed.svg | 484 ++++ src/icons/PointAdd.svg | 354 +++ src/icons/PointDel.svg | 354 +++ src/icons/PointMove.svg | 331 ++- src/icons/ToggleDem.svg | 97 + src/icons/ToggleDocks.svg | 214 ++ src/icons/ToggleGis.svg | 125 + src/icons/ToggleMaps.svg | 99 + src/icons/ToggleRouter.svg | 128 + src/icons/ToolBar.svg | 121 + src/icons/ToolBarSetup.svg | 126 + src/locale/qmapshack.ts | 830 +++--- src/locale/qmapshack_cs.ts | 830 +++--- src/locale/qmapshack_de.ts | 847 +++--- src/locale/qmapshack_es.ts | 2801 +++++++++++--------- src/locale/qmapshack_fr.ts | 832 +++--- src/locale/qmapshack_nl.ts | 828 +++--- src/locale/qmapshack_ru.ts | 834 +++--- src/map/CMapIMG.cpp | 74 +- src/map/CMapIMG.h | 4 + src/map/CMapPropSetup.cpp | 36 + src/map/CMapPropSetup.h | 2 + src/map/CMapVRT.cpp | 6 +- src/map/IMap.cpp | 6 + src/map/IMap.h | 18 + src/map/IMapPropSetup.ui | 75 + src/mouse/CMouseMoveWpt.cpp | 2 +- src/mouse/CMouseNormal.cpp | 5 +- src/mouse/IScrOptSelect.ui | 2 +- src/mouse/line/CLineOpAddPoint.cpp | 2 +- src/mouse/line/CLineOpDeletePoint.cpp | 2 +- src/mouse/line/CLineOpMovePoint.cpp | 2 +- src/mouse/line/ILineOp.cpp | 1 + src/mouse/line/IScrOptEditLine.ui | 4 +- src/plot/CPlotAxis.cpp | 4 +- src/plot/IPlot.cpp | 8 +- src/resources.qrc | 32 +- src/setup/IAppSetup.cpp | 2 +- src/setup/IAppSetup.h | 2 + src/widgets/CHistoryListWidget.cpp | 9 +- src/widgets/CSelectDoubleListWidget.cpp | 262 ++ src/widgets/CSelectDoubleListWidget.h | 60 + src/widgets/ISelectDoubleListWidget.ui | 135 + 146 files changed, 10103 insertions(+), 3619 deletions(-) diff --cc debian/changelog index 9f8ea36,1b5e382..9ce1e87 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,10 +1,17 @@@ + qmapshack (1.9.0-1) unstable; urgency=medium + + * New upstream release. + * Update gbp.conf to use common configuration. + + -- Bas Couwenberg <sebas...@debian.org> Mon, 24 Jul 2017 18:11:29 +0200 + +qmapshack (1.8.1-1~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + * Update branch in gbp.conf & Vcs-Git URL. + + -- Bas Couwenberg <sebas...@debian.org> Sun, 02 Jul 2017 15:55:57 +0200 + qmapshack (1.8.1-1) unstable; urgency=medium * Bump Standards-Version to 4.0.0, no changes. diff --cc debian/gbp.conf index d6ede88,21d0417..2faff05 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@@ -1,4 -1,16 +1,16 @@@ [DEFAULT] + + # The default name for the upstream branch is "upstream". + # Change it if the name is different (for instance, "master"). + upstream-branch = upstream + + # The default name for the Debian branch is "master". + # Change it if the name is different (for instance, "debian/unstable"). -debian-branch = master +debian-branch = stretch-backports + + # git-import-orig uses the following names for the upstream tags. + # Change the value if you are not using git-import-orig + upstream-tag = upstream/%(version)s + + # Always use pristine-tar. pristine-tar = True - compression = gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel