[qmapshack] 01/02: Merge tag 'debian/1.7.1-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Mon Sep 19 07:56:01 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 1c369e6e62d377ee86b3d75ec43836941316302b
Merge: 467c473 9243a91
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Sep 19 09:28:42 2016 +0200
Merge tag 'debian/1.7.1-1' into jessie-backports
Conflicts:
debian/changelog
.hgsub | 1 -
.hgsubstate | 1 -
CMakeLists.txt | 4 +-
CMakeLists.txt.user | 4 +-
CPackConfig.cmake | 2 +-
changelog.txt | 18 +
cmake/Modules/FindGDAL.cmake | 3 +
cmake/Modules/FindPROJ.cmake | 2 +
cmake/Modules/FindROUTINO.cmake | 3 +
debian/changelog | 15 +
debian/copyright | 1 +
debian/patches/original-typo.patch | 16 -
debian/patches/series | 1 -
debian/rules | 4 +-
doc/.hgignore | 18 +
src/CMakeLists.txt | 6 +-
src/gis/CGisListDB.cpp | 276 ++++-
src/gis/CGisListDB.h | 12 +
src/gis/CGisListWks.cpp | 90 +-
src/gis/CGisListWks.h | 14 +
src/gis/CGisWidget.cpp | 11 +-
src/gis/IGisItem.cpp | 39 +-
src/gis/IGisItem.h | 11 +-
src/gis/IGisLine.cpp | 13 +-
src/gis/IGisLine.h | 3 +
src/gis/db/CDBFolderLostFound.h | 2 +
src/gis/db/CDBFolderMysql.cpp | 21 +-
src/gis/db/CDBFolderMysql.h | 3 +
src/gis/db/CDBFolderSqlite.cpp | 23 +-
src/gis/db/CDBFolderSqlite.h | 3 +
src/gis/db/CDBItem.cpp | 20 +-
src/gis/db/CDBItem.h | 24 +-
src/gis/db/CDBProject.cpp | 97 +-
src/gis/db/CDBProject.h | 4 +-
src/gis/db/CLostFoundProject.cpp | 22 +-
src/gis/db/CSearchDatabase.cpp | 293 +++++
.../CSelectActivity.h => db/CSearchDatabase.h} | 35 +-
src/gis/db/CSelectDBFolder.cpp | 5 +
src/gis/db/CSelectSaveAction.cpp | 4 +-
src/gis/db/IDBFolder.cpp | 95 +-
src/gis/db/IDBFolder.h | 26 +
src/gis/db/IDBFolderSql.h | 1 +
src/gis/db/IDBMysql.cpp | 142 ++-
src/gis/db/IDBMysql.h | 2 +
src/gis/db/IDBSqlite.cpp | 189 +++-
src/gis/db/IDBSqlite.h | 3 +
src/gis/db/ISearchDatabase.ui | 96 ++
src/gis/db/macros.h | 2 +-
src/gis/fit/CFitProject.cpp | 2 +
src/gis/fit/CFitProject.h | 1 +
src/gis/fit/decoder/CFitCrcState.h | 1 +
src/gis/fit/decoder/CFitHeaderState.h | 1 +
src/gis/fit/decoder/CFitRecordContentState.h | 1 +
src/gis/gpx/CGpxProject.cpp | 23 +-
src/gis/ovl/CGisItemOvlArea.cpp | 46 +-
src/gis/ovl/CGisItemOvlArea.h | 7 +-
src/gis/ovl/CScrOptOvlArea.cpp | 2 +-
src/gis/prj/CDetailsPrj.cpp | 63 +-
src/gis/prj/IDetailsPrj.ui | 5 -
src/gis/prj/IGisProject.cpp | 116 +-
src/gis/prj/IGisProject.h | 43 +-
src/gis/qms/CQmsProject.cpp | 2 +-
src/gis/qms/serialization.cpp | 45 +-
src/gis/rte/CCreateRouteFromWpt.cpp | 4 +-
src/gis/rte/CDetailsRte.cpp | 2 +-
src/gis/rte/CGisItemRte.cpp | 44 +-
src/gis/rte/CGisItemRte.h | 8 +-
src/gis/rte/CScrOptRte.cpp | 2 +-
src/gis/slf/CSlfProject.cpp | 2 +
src/gis/tnv/CTwoNavProject.cpp | 3 +-
src/gis/trk/CActivityTrk.cpp | 473 ++++----
src/gis/trk/CActivityTrk.h | 19 +-
src/gis/trk/CDetailsTrk.cpp | 65 +-
src/gis/trk/CDetailsTrk.h | 3 +-
src/gis/trk/CGisItemTrk.cpp | 61 +-
src/gis/trk/CGisItemTrk.h | 14 +-
src/gis/trk/CScrOptTrk.cpp | 2 +-
src/gis/trk/CSelectActivity.cpp | 72 --
src/gis/trk/IDetailsTrk.ui | 34 +-
src/gis/trk/ISelectActivity.ui | 28 -
src/gis/wpt/CGisItemWpt.cpp | 43 +-
src/gis/wpt/CGisItemWpt.h | 8 +-
src/gis/wpt/CScrOptWpt.cpp | 2 +-
src/helpers/CSelectCopyAction.cpp | 4 +-
src/helpers/Platform.h | 66 +-
src/icons/32x32/SearchDatabase.png | Bin 0 -> 2033 bytes
src/icons/32x32/SortName.png | Bin 0 -> 658 bytes
src/icons/48x48/SearchDatabase.png | Bin 0 -> 3133 bytes
src/icons/48x48/SortName.png | Bin 0 -> 946 bytes
src/icons/SearchDatabase.svg | 178 +++
src/icons/SortName.svg | 90 ++
src/locale/qmapshack.ts | 1118 ++++++++++++-------
src/locale/qmapshack_cs.ts | 1176 +++++++++++++-------
src/locale/qmapshack_de.ts | 1116 ++++++++++++-------
src/locale/qmapshack_es.ts | 1120 ++++++++++++-------
src/locale/qmapshack_fr.ts | 1119 ++++++++++++-------
src/locale/qmapshack_nl.ts | 1117 ++++++++++++-------
src/map/CMapIMG.cpp | 70 +-
src/map/CMapJNX.cpp | 2 +-
src/map/cache/CDiskCache.cpp | 15 +-
src/map/garmin/IGarminStrTbl.cpp | 8 +-
src/mouse/CMouseRangeTrk.cpp | 8 +-
src/mouse/CMouseRangeTrk.h | 2 +-
src/mouse/CScrOptRangeTrk.cpp | 14 +-
src/mouse/CScrOptRangeTrk.h | 8 +
src/plot/IPlot.cpp | 7 +-
src/plot/IPlot.h | 2 +-
src/qlgt/CQmsDb.cpp | 5 +-
src/resources.qrc | 4 +
src/widgets/CTextEditWidget.cpp | 19 +-
src/widgets/CTextEditWidgetSelMenu.cpp | 6 +-
src/widgets/CTextEditWidgetSelMenu.h | 6 +-
112 files changed, 6860 insertions(+), 3347 deletions(-)
diff --cc debian/changelog
index 5fccb9d,1404439..8697e67
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,18 +1,25 @@@
+ qmapshack (1.7.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 13 Sep 2016 14:19:02 +0200
+
+ qmapshack (1.7.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Disable icon regeneration on hurd-i386, inkscape fails there too.
+ * Update copyright file, add Rainer Woitok to copyright holders.
+ * Drop original-typo.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 13 Sep 2016 10:06:55 +0200
+
+qmapshack (1.6.3-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Drop patch to fix upstream issue #149, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 24 Jul 2016 18:11:50 +0200
+
qmapshack (1.6.3-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