This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository gpsprune.
commit a7099035522ecac17b17ff02de140d891875236c Merge: acf45f1 fdca1f5 Author: Bas Couwenberg <[email protected]> Date: Thu Dec 29 07:18:05 2016 +0100 Merge tag 'debian/18.6-1' into jessie-backports Conflicts: debian/changelog debian/control build.sh | 2 +- debian/changelog | 8 ++++++++ debian/control | 5 ++--- debian/copyright | 4 ++-- debian/gpsprune.1 | 2 +- debian/scripts/get-tiles.py | 2 +- debian/scripts/gpsprune | 4 ++-- debian/upstream/metadata | 6 +++--- debian/watch | 2 +- tim/prune/GpsPrune.java | 4 ++-- tim/prune/function/CheckVersionScreen.java | 2 +- tim/prune/function/srtm/DownloadSrtmFunction.java | 2 +- tim/prune/function/srtm/LookupSrtmFunction.java | 3 ++- tim/prune/function/srtm/TileFinder.java | 2 +- tim/prune/lang/prune-texts_es.properties | 9 ++++++--- tim/prune/lang/prune-texts_fr.properties | 14 ++++++++++++-- tim/prune/readme.txt | 13 +++++++++---- 17 files changed, 55 insertions(+), 29 deletions(-) diff --cc debian/changelog index c025e3e,c92883c..9b07d5d --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,11 +1,17 @@@ + gpsprune (18.6-1) unstable; urgency=medium + + * New upstream release. + * Drop Debian OpenStreetMap Team from Uploaders. + * Update URLs to use HTTPS. + + -- Bas Couwenberg <[email protected]> Mon, 19 Dec 2016 07:29:16 +0100 + +gpsprune (18.5-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Mon, 01 Aug 2016 10:17:41 +0200 + gpsprune (18.5-1) unstable; urgency=medium * New upstream release. diff --cc debian/control index 3493e69,c25b2a2..24ef86c --- a/debian/control +++ b/debian/control @@@ -13,11 -12,11 +12,11 @@@ Build-Depends: ant fastjar, libjava3d-java, libvecmath-java, - libmetadata-extractor-java (>= 2.7.2) + libmetadata-extractor-java (>= 2.6.4) Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gpsprune.git -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 + Homepage: https://activityworkshop.net/software/gpsprune/index.html Package: gpsprune Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

