[gpsprune] 01/02: Merge tag 'debian/18.2-1' into jessie-backports

[Sebastiaan Couwenberg]

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

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

commit be07ce9eeb9eba9a87b6718312d89206e8ddbad4
Merge: c7b3362 87efe11
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 22 23:55:30 2015 +0100

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

 build.sh                                          |   2 +-
 debian/changelog                                  |  12 ++
 debian/gpsprune.desktop                           |   7 +-
 debian/gpsprune.xpm                               |  48 --------
 debian/icons/hicolor/128x128/apps/gpsprune.png    | Bin 0 -> 7176 bytes
 debian/icons/hicolor/16x16/apps/gpsprune.png      | Bin 0 -> 1208 bytes
 debian/icons/hicolor/32x32/apps/gpsprune.png      | Bin 0 -> 1619 bytes
 debian/icons/hicolor/48x48/apps/gpsprune.png      | Bin 0 -> 2438 bytes
 debian/icons/hicolor/64x64/apps/gpsprune.png      | Bin 0 -> 3333 bytes
 debian/icons/hicolor/96x96/apps/gpsprune.png      | Bin 0 -> 5720 bytes
 debian/install                                    |   2 +-
 debian/menu                                       |   6 -
 debian/source/include-binaries                    |   6 +
 tim/prune/GpsPrune.java                           |   4 +-
 tim/prune/function/AboutScreen.java               |   6 +-
 tim/prune/function/search/wikimedia_galleries.txt |   4 +-
 tim/prune/gui/images/add_photo_icon.png           | Bin
 tim/prune/gui/images/add_textfile_icon.png        | Bin
 tim/prune/lang/prune-texts_da.properties          |  84 -------------
 tim/prune/lang/prune-texts_fa.properties          |  73 -----------
 tim/prune/lang/prune-texts_in.properties          | 111 -----------------
 tim/prune/lang/prune-texts_it.properties          |   7 ++
 tim/prune/lang/prune-texts_nl.properties          |  23 ++--
 tim/prune/lang/prune-texts_no.properties          | 142 ----------------------
 tim/prune/lang/prune-texts_pl.properties          |   9 ++
 tim/prune/lang/prune-texts_sv.properties          | 102 ----------------
 tim/prune/readme.txt                              |  12 +-
 tim/prune/save/GpxExporter.java                   |   4 +-
 tim/prune/save/KmlExporter.java                   |   4 +-
 tim/prune/save/xml/XmlUtils.java                  |  26 +++-
 30 files changed, 94 insertions(+), 600 deletions(-)

diff --cc debian/changelog
index dce27ee,b69d5b2..b8ea9d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ gpsprune (18.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Add trailing semicolon to fix Keywords syntax in desktop file.
+   * Don't use full paths for Exec & Icon in desktop file.
+   * Add list of files (%F) field code for Exec key.
+   * Add MimeType key for application/gpx+xml in desktop file.
+   * Also install application icon in hicolor theme.
+   * Use desktop file in favor of menu file per CTTE #741573.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 17 Dec 2015 02:38:46 +0100
+ 
 +gpsprune (18.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 08 Oct 2015 10:27:17 +0200
 +
  gpsprune (18.1-1) unstable; urgency=medium
  
    * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git