[qmapshack] 01/02: Merge tag 'debian/1.6.3-1' into jessie-backports

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository qmapshack.

commit 8c919e51c3296d475c8ac7137c3adf494e5d3906
Merge: 6d94eeb 54d45f7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 24 18:11:46 2016 +0200

    Merge tag 'debian/1.6.3-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 .hg_archival.txt                       |   4 -
 .hgsubstate                            |   2 +-
 .hgtags                                |  43 -----
 CMakeLists.txt                         |   2 +-
 CMakeLists.txt.user                    | 263 +++++++++++++++++++++++++++
 changelog.txt                          |   7 +
 debian/changelog                       |   7 +
 debian/copyright                       |  64 -------
 src/CMakeLists.txt                     |   5 +
 src/device/CDeviceWatcherLinux.cpp     |  11 +-
 src/device/IDevice.cpp                 |  11 +-
 src/gis/CGisListWks.cpp                |   4 +-
 src/gis/ovl/CDetailsOvlArea.cpp        |   6 +-
 src/gis/prj/CDetailsPrj.cpp            |   9 +-
 src/gis/rte/CDetailsRte.cpp            |   6 +-
 src/gis/trk/CDetailsTrk.cpp            |   6 +-
 src/gis/trk/CGisItemTrk.cpp            |   2 +-
 src/gis/wpt/CDetailsWpt.cpp            |   6 +-
 src/icons/2DFix.svg                    |  83 ---------
 src/icons/32x32/2DFix.png              | Bin 710 -> 0 bytes
 src/icons/32x32/3DFix.png              | Bin 875 -> 0 bytes
 src/icons/32x32/LimitMax.png           | Bin 632 -> 0 bytes
 src/icons/32x32/LimitMin.png           | Bin 686 -> 0 bytes
 src/icons/32x32/NoFix.png              | Bin 633 -> 0 bytes
 src/icons/32x32/PasteNormal.png        | Bin 0 -> 1614 bytes
 src/icons/32x32/PastePlain.png         | Bin 0 -> 904 bytes
 src/icons/3DFix.svg                    |  82 ---------
 src/icons/48x48/2DFix.png              | Bin 1022 -> 0 bytes
 src/icons/48x48/3DFix.png              | Bin 1279 -> 0 bytes
 src/icons/48x48/LimitMax.png           | Bin 928 -> 0 bytes
 src/icons/48x48/LimitMin.png           | Bin 993 -> 0 bytes
 src/icons/48x48/NoFix.png              | Bin 925 -> 0 bytes
 src/icons/48x48/PasteNormal.png        | Bin 0 -> 2633 bytes
 src/icons/48x48/PastePlain.png         | Bin 0 -> 1186 bytes
 src/icons/LimitMax.svg                 | 103 -----------
 src/icons/LimitMin.svg                 | 100 -----------
 src/icons/NoFix.svg                    |  83 ---------
 src/icons/PasteNormal.svg              | 194 ++++++++++++++++++++
 src/icons/PastePlain.svg               | 125 +++++++++++++
 src/icons/findunusedicons              |  10 ++
 src/locale/qmapshack_cs.desktop        |   3 +
 src/locale/qmapshack_cs.ts             | 140 +++++++--------
 src/map/CMapDraw.cpp                   |   9 +-
 src/map/cache/CDiskCache.cpp           |  32 +++-
 src/resources.qrc                      |  14 +-
 src/setup/IAppSetup.cpp                |   2 +-
 src/widgets/CTextEdit.cpp              |  57 ++++++
 src/widgets/CTextEdit.h                |  42 +++++
 src/widgets/CTextEditWidget.cpp        | 315 +++++++++++++++++++++++----------
 src/widgets/CTextEditWidget.h          |  92 ++++------
 src/widgets/CTextEditWidgetSelMenu.cpp |  45 +++++
 src/widgets/CTextEditWidgetSelMenu.h   |  36 ++++
 src/widgets/ITextEditWidget.ui         | 167 +++++++++++++----
 src/widgets/ITextEditWidgetSelMenu.ui  | 144 +++++++++++++++
 54 files changed, 1481 insertions(+), 855 deletions(-)

diff --cc debian/changelog
index 5217106,84a2292..a2f08a5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,10 +1,24 @@@
+ qmapshack (1.6.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop separate Files section for CTextEditWidget.{cpp,h}, now GPL-3+ too.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 14 Jul 2016 13:33:10 +0200
+ 
 +qmapshack (1.6.2-1~bpo8+2) jessie-backports; urgency=medium
 +
 +  * Add patch to fix upstream issue #149.
 +    An empty (not default-initialized) cachePath causes deletion of files in
 +    cwd; cachePath should never be empty at all...
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 14 Jul 2016 14:09:32 +0200
 +
 +qmapshack (1.6.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 09 Jul 2016 12:03:30 +0200
 +
  qmapshack (1.6.2-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