This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository gpsprune.
commit 35652e826afcb0c9cec8361b4e8089842e6aeef8 Merge: 64f96d7 e5f1fd3 Author: Bas Couwenberg <[email protected]> Date: Mon Aug 1 10:17:37 2016 +0200 Merge tag 'debian/18.5-1' into jessie-backports Conflicts: debian/changelog build.sh | 2 +- debian/changelog | 6 ++ tim/prune/GpsPrune.java | 4 +- tim/prune/function/AboutScreen.java | 3 +- .../function/gpsies/UploadGpsiesFunction.java | 5 +- tim/prune/gui/map/DiskTileCacher.java | 35 +++---- tim/prune/gui/map/MapCanvas.java | 4 +- tim/prune/gui/map/MapTile.java | 32 ++++++ tim/prune/gui/map/MapTileManager.java | 41 ++++---- tim/prune/gui/profile/ProfileChart.java | 5 +- tim/prune/lang/prune-texts_cz.properties | 8 ++ tim/prune/lang/prune-texts_es.properties | 5 + tim/prune/lang/prune-texts_ru.properties | 29 ++++-- tim/prune/lang/prune-texts_uk.properties | 10 ++ tim/prune/readme.txt | 15 ++- tim/prune/save/GpsSaver.java | 5 +- tim/prune/save/GpxExporter.java | 108 +++++++++++---------- tim/prune/save/SettingsForExport.java | 66 +++++++++++++ 18 files changed, 269 insertions(+), 114 deletions(-) diff --cc debian/changelog index 5a263a4,32e2983..c11cdbe --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,15 @@@ + gpsprune (18.5-1) unstable; urgency=medium + + * New upstream release. + + -- Bas Couwenberg <[email protected]> Tue, 26 Jul 2016 12:47:37 +0200 + +gpsprune (18.4-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Thu, 05 May 2016 11:31:11 +0200 + gpsprune (18.4-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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
