[qmapshack] 01/02: Merge tag 'debian/1.7.2-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Sat Dec 24 10:42:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qmapshack.
commit 2d004c8b5d2bb5362dfc838776fefc6fce44a486
Merge: 889720f 6e7f278
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Dec 24 11:23:06 2016 +0100
Merge tag 'debian/1.7.2-1' into jessie-backports
Conflicts:
debian/changelog
3rdparty/alglib/CMakeLists.txt | 46 +
3rdparty/alglib/gpl2.txt | 339 +
3rdparty/alglib/gpl3.txt | 674 +
3rdparty/alglib/manual.cpp.html | 46946 ++++++++++
3rdparty/alglib/src/alglibinternal.cpp | 16708 ++++
3rdparty/alglib/src/alglibinternal.h | 1276 +
3rdparty/alglib/src/alglibmisc.cpp | 5583 ++
3rdparty/alglib/src/alglibmisc.h | 1306 +
3rdparty/alglib/src/ap.cpp | 11067 +++
3rdparty/alglib/src/ap.h | 1648 +
3rdparty/alglib/src/dataanalysis.cpp | 36237 +++++++
3rdparty/alglib/src/dataanalysis.h | 7657 ++
3rdparty/alglib/src/diffequations.cpp | 1150 +
3rdparty/alglib/src/diffequations.h | 268 +
3rdparty/alglib/src/fasttransforms.cpp | 3555 +
3rdparty/alglib/src/fasttransforms.h | 692 +
3rdparty/alglib/src/integration.cpp | 3934 +
3rdparty/alglib/src/integration.h | 838 +
3rdparty/alglib/src/interpolation.cpp | 35593 +++++++
3rdparty/alglib/src/interpolation.h | 7216 ++
3rdparty/alglib/src/linalg.cpp | 43932 +++++++++
3rdparty/alglib/src/linalg.h | 7908 ++
3rdparty/alglib/src/optimization.cpp | 37535 ++++++++
3rdparty/alglib/src/optimization.h | 6880 ++
3rdparty/alglib/src/solvers.cpp | 13593 +++
3rdparty/alglib/src/solvers.h | 4056 +
3rdparty/alglib/src/specialfunctions.cpp | 9640 ++
3rdparty/alglib/src/specialfunctions.h | 1978 +
3rdparty/alglib/src/statistics.cpp | 19993 ++++
3rdparty/alglib/src/statistics.h | 1377 +
3rdparty/alglib/src/stdafx.h | 2 +
3rdparty/alglib/tests/test_c.cpp | 93729 +++++++++++++++++++
3rdparty/alglib/tests/test_i.cpp | 11827 +++
3rdparty/alglib/tests/test_x.cpp | 1572 +
CMakeLists.txt | 15 +-
CMakeLists.txt.user | 8 +-
MacOSX/bundle.sh | 116 +-
changelog.txt | 32 +
cmake/Modules/FindALGLIB.cmake | 75 +
debian/changelog | 11 +
debian/control | 1 +
debian/copyright | 9 +
debian/patches/alglib.patch | 14 +
.../cmake-patch-to-find-alglib-on-RH-systems.patch | 32 +
debian/patches/series | 3 +
debian/patches/spelling-errors.patch | 118 +
debian/rules | 2 +-
doc/.hgignore | 18 -
src/CMainWindow.cpp | 34 +-
src/CMainWindow.h | 1 +
src/CMakeLists.txt | 36 +-
src/GeoMath.cpp | 5 +
src/GeoMath.h | 6 +
src/IAbout.ui | 2 +-
src/IMainWindow.ui | 13 +
src/canvas/CCanvas.cpp | 17 +-
src/canvas/CCanvas.h | 4 +
src/canvas/IDrawContext.cpp | 2 +-
src/dem/CDemDraw.cpp | 5 +-
src/dem/CDemVRT.cpp | 2 +-
src/device/CDeviceGarmin.cpp | 21 +-
src/device/CDeviceGarmin.h | 2 +-
src/device/IDeviceWatcher.cpp | 10 +-
src/gis/CGisListDB.cpp | 28 +-
src/gis/CGisListDB.h | 4 +-
src/gis/CGisListWks.cpp | 48 +-
src/gis/CGisListWks.h | 4 +
src/gis/CGisWidget.cpp | 47 +-
src/gis/CGisWidget.h | 4 +
src/gis/IGisItem.cpp | 4 +-
src/gis/IGisItem.h | 14 +-
src/gis/IGisLine.cpp | 20 -
src/gis/IGisLine.h | 9 +-
src/gis/IGisWidget.ui | 27 +
src/gis/WptIcons.cpp | 2 +-
src/gis/db/CDBProject.cpp | 2 +-
src/gis/db/CExportDatabase.cpp | 119 +
.../CScrOptPrint.cpp => gis/db/CExportDatabase.h} | 38 +-
src/gis/db/CExportDatabaseThread.cpp | 171 +
.../CExportDatabaseThread.h} | 54 +-
src/gis/db/IDBFolder.cpp | 15 +-
src/gis/db/IDBFolder.h | 2 +
src/gis/db/IDBFolderSql.cpp | 2 +-
src/gis/db/IDBSqlite.cpp | 2 +-
src/gis/db/IExportDatabase.ui | 129 +
src/gis/fit/CFitProject.cpp | 2 +-
src/gis/fit/serialization.cpp | 14 +-
src/gis/gpx/CGpxProject.cpp | 96 +-
src/gis/gpx/CGpxProject.h | 2 +-
src/gis/gpx/serialization.cpp | 207 +-
src/gis/ovl/CGisItemOvlArea.h | 2 +-
src/gis/prj/CDetailsPrj.cpp | 77 +-
src/gis/prj/CDetailsPrj.h | 6 +-
src/gis/prj/IGisProject.cpp | 60 +-
src/gis/prj/IGisProject.h | 21 +-
src/gis/qms/CQmsProject.cpp | 2 +-
src/gis/qms/serialization.cpp | 16 +-
src/gis/rte/CGisItemRte.cpp | 20 +-
src/gis/rte/CGisItemRte.h | 6 +-
src/gis/rte/router/CRouterMapQuest.cpp | 8 +-
src/gis/slf/CSlfProject.cpp | 2 +-
src/gis/slf/CSlfReader.cpp | 6 +-
src/gis/tnv/CTwoNavProject.cpp | 8 +-
src/gis/tnv/serialization.cpp | 8 +-
src/gis/trk/CActivityTrk.cpp | 138 +-
src/gis/trk/CActivityTrk.h | 10 +-
src/gis/trk/CDetailsTrk.cpp | 38 +-
src/gis/trk/CDetailsTrk.h | 6 +-
src/gis/trk/CGisItemTrk.cpp | 1069 +-
src/gis/trk/CGisItemTrk.h | 392 +-
src/gis/trk/CKnownExtension.cpp | 10 +-
src/gis/trk/CPropertyTrk.cpp | 4 +-
src/gis/trk/CScrOptTrk.cpp | 8 +
src/gis/trk/CScrOptTrk.h | 1 +
src/gis/trk/CSelectActivityColor.cpp | 2 +-
src/gis/trk/CSelectActivityColor.h | 6 +-
src/gis/trk/CTableTrk.cpp | 163 +-
src/gis/trk/CTableTrk.h | 10 +-
src/gis/trk/CTrackData.cpp | 182 +
src/gis/trk/CTrackData.h | 265 +
src/gis/trk/IDetailsTrk.ui | 4 +-
src/gis/trk/IScrOptTrk.ui | 14 +
src/gis/trk/filter/CFilterInterpolateElevation.cpp | 72 +
.../trk/filter/CFilterInterpolateElevation.h} | 28 +-
src/gis/trk/filter/CFilterReplaceElevation.cpp | 4 +-
...terReplaceElevation.cpp => CFilterSubPt2Pt.cpp} | 17 +-
.../trk/filter/CFilterSubPt2Pt.h} | 28 +-
src/gis/trk/filter/IFilterInterpolateElevation.ui | 141 +
src/gis/trk/filter/IFilterSubPt2Pt.ui | 99 +
src/gis/trk/filter/filter.cpp | 239 +-
src/gis/wpt/CGisItemWpt.cpp | 10 +-
src/gis/wpt/CGisItemWpt.h | 2 +-
src/helpers/CDraw.cpp | 2 +-
src/helpers/CDraw.h | 4 +-
src/helpers/CProgressDialog.cpp | 2 +-
src/helpers/CSelectProjectDialog.cpp | 67 +-
src/helpers/CSelectProjectDialog.h | 15 +-
src/icons/32x32/CopyTrkWithWpt.png | Bin 0 -> 1119 bytes
src/icons/32x32/FilterSubPt2Pt.png | Bin 0 -> 521 bytes
src/icons/32x32/SaveGISAsGpx11.png | Bin 0 -> 806 bytes
src/icons/48x48/CopyTrkWithWpt.png | Bin 0 -> 1658 bytes
src/icons/48x48/FilterSubPt2Pt.png | Bin 0 -> 693 bytes
src/icons/48x48/SaveGISAsGpx11.png | Bin 0 -> 1149 bytes
src/icons/CopyTrkWithWpt.svg | 227 +
src/icons/FilterSubPt2Pt.svg | 167 +
src/icons/SaveGISAsGpx11.svg | 126 +
src/locale/qmapshack.ts | 947 +-
src/locale/qmapshack_cs.ts | 2680 +-
src/locale/qmapshack_de.ts | 1141 +-
src/locale/qmapshack_es.ts | 2030 +-
src/locale/qmapshack_fr.ts | 3047 +-
src/locale/qmapshack_nl.ts | 2159 +-
src/map/CMapDraw.cpp | 6 +-
src/map/CMapTMS.cpp | 4 +-
src/map/CMapWMTS.cpp | 4 +-
src/map/OSM_Topo.tms | 6 +-
src/mouse/CMouseEditArea.cpp | 2 +-
src/mouse/CMouseEditRte.cpp | 2 +-
src/mouse/CMouseEditTrk.cpp | 2 +-
src/mouse/CMouseNormal.cpp | 4 +-
src/mouse/CMousePrint.cpp | 2 -
src/mouse/CMouseRangeTrk.cpp | 29 +-
src/mouse/CMouseSelect.h | 2 +-
src/mouse/CScrOptPrint.cpp | 1 -
src/mouse/CScrOptRangeTrk.cpp | 9 +-
src/mouse/CScrOptUnclutter.cpp | 4 +-
src/mouse/line/CLineOpAddPoint.cpp | 16 +-
src/mouse/line/CLineOpAddPoint.h | 8 +-
src/mouse/line/CLineOpDeletePoint.cpp | 2 +-
src/mouse/line/CLineOpMovePoint.cpp | 18 +-
src/mouse/line/CLineOpMovePoint.h | 8 +-
src/mouse/line/CLineOpSelectRange.cpp | 4 +-
src/mouse/line/CLineOpSelectRange.h | 7 +-
src/mouse/line/ILineOp.cpp | 41 +-
src/mouse/line/ILineOp.h | 15 +-
src/mouse/line/IMouseEditLine.cpp | 39 +-
src/mouse/line/IMouseEditLine.h | 9 +-
src/plot/CPlot.cpp | 15 +-
src/plot/CPlot.h | 2 +-
src/plot/CPlotProfile.cpp | 76 +-
src/plot/CPlotProfile.h | 2 +-
src/plot/IPlot.cpp | 114 +-
src/plot/IPlot.h | 47 +-
src/plot/ITrack.cpp | 25 +-
src/qlgt/CQlgtTrack.h | 18 +-
src/qlgt/converter.cpp | 12 +-
src/resources.qrc | 7 +-
src/widgets/CColorLegend.cpp | 5 +-
src/widgets/CColorLegend.h | 6 +-
test/unittest/CGpxProject.cpp | 2 +-
test/unittest/CKnownExtension.cpp | 31 +-
test/unittest/CMakeLists.txt | 2 +
test/unittest/main.cpp | 6 +-
193 files changed, 445021 insertions(+), 9846 deletions(-)
diff --cc debian/changelog
index f5c2dae,69502fb..2f433b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
+ qmapshack (1.7.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Disable icon regeneration on mips64el, inkscape fails there too.
+ * Add libalglib-dev to build dependencies.
+ * Add license & copyright for alglib.
+ * Add patch to tweak FindALGLIB.cmake for Debian package.
+ * Add patch to fix spelling errors.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 13 Dec 2016 17:13:01 +0100
+
+qmapshack (1.7.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 19 Sep 2016 09:29:15 +0200
+
qmapshack (1.7.1-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