[gpsprune] 01/02: Merge tag 'debian/18.3-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 df3498890dd277a2c7f59ded808a96e222470f07
Merge: 5cc1334 044d890
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 20 16:24:33 2016 +0100

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

 build.sh                                           |   2 +-
 debian/changelog                                   |  12 ++++++
 debian/control                                     |   4 +-
 debian/copyright                                   |   4 +-
 debian/icons/hicolor/128x128/apps/gpsprune.png     | Bin 7176 -> 0 bytes
 debian/icons/hicolor/16x16/apps/gpsprune.png       | Bin 1208 -> 0 bytes
 debian/icons/hicolor/32x32/apps/gpsprune.png       | Bin 1619 -> 0 bytes
 debian/icons/hicolor/64x64/apps/gpsprune.png       | Bin 3333 -> 0 bytes
 debian/install                                     |   1 -
 debian/rules                                       |   9 +++++
 debian/source/include-binaries                     |   6 ---
 tim/prune/GpsPrune.java                            |  43 +++++++++++++++++++--
 tim/prune/config/Config.java                       |   2 +
 tim/prune/copyright.txt                            |   2 +-
 tim/prune/function/SaveConfig.java                 |   7 ++++
 tim/prune/gui/images/window_icon_22.png            | Bin 0 -> 1161 bytes
 tim/prune/gui/images/window_icon_24.png            | Bin 0 -> 1255 bytes
 tim/prune/gui/images/window_icon_36.png            | Bin 0 -> 1869 bytes
 .../prune/gui/images/window_icon_48.png            | Bin 2438 -> 2438 bytes
 tim/prune/gui/images/window_icon_72.png            | Bin 0 -> 3829 bytes
 .../prune/gui/images/window_icon_96.png            | Bin 5720 -> 5720 bytes
 tim/prune/lang/prune-texts_fr.properties           |  12 +++++-
 tim/prune/readme.txt                               |  15 +++++--
 tim/prune/save/GpxExporter.java                    |  13 +++----
 tim/prune/save/KmlExporter.java                    |   2 +-
 tim/prune/save/xml/XmlUtils.java                   |   2 +-
 26 files changed, 104 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index a9992c6,1f4369a..3b9c5f7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ gpsprune (18.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update copyright file, changes:
+     - Update copyright years for activityworkshop.net
+     - Drop copyright character from copyright statements
+   * Install upstream application icon for hicolor theme.
+   * Update Vcs-Git URL to use HTTPS.
+   * Bump Standards-Version to 3.9.7, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 15 Feb 2016 07:38:07 +0100
+ 
 +gpsprune (18.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 22 Dec 2015 23:55:34 +0100
 +
  gpsprune (18.2-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index c965e31,c2dc51f..c9ef4ad
--- a/debian/control
+++ b/debian/control
@@@ -13,10 -13,10 +13,10 @@@ Build-Depends: ant
                 fastjar,
                 libjava3d-java,
                 libvecmath-java,
 -               libmetadata-extractor-java (>= 2.7.2)
 +               libmetadata-extractor-java (>= 2.6.4)
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gpsprune.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/gpsprune.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gpsprune.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gpsprune.git -b jessie-backports
  Homepage: http://activityworkshop.net/software/gpsprune/index.html
  
  Package: gpsprune

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