This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository gpsprune.
commit 4bb3584a057edfd7f421111963f359d5b8313d62 Merge: bd0c3fb 7238f1d Author: Bas Couwenberg <[email protected]> Date: Thu May 5 11:30:45 2016 +0200 Merge tag 'debian/18.4-1' into jessie-backports Conflicts: debian/changelog debian/control build.sh | 2 +- debian/changelog | 7 +++++ debian/control | 2 +- tim/prune/GpsPrune.java | 6 ++--- tim/prune/function/AboutScreen.java | 2 +- tim/prune/function/browser/UrlGenerator.java | 19 -------------- tim/prune/gui/MenuManager.java | 4 --- tim/prune/lang/prune-texts_af.properties | 2 -- tim/prune/lang/prune-texts_cz.properties | 3 ++- tim/prune/lang/prune-texts_de.properties | 2 -- tim/prune/lang/prune-texts_de_CH.properties | 4 +-- tim/prune/lang/prune-texts_en.properties | 2 -- tim/prune/lang/prune-texts_es.properties | 11 ++++++-- tim/prune/lang/prune-texts_fr.properties | 2 -- tim/prune/lang/prune-texts_hu.properties | 4 +-- tim/prune/lang/prune-texts_it.properties | 5 ++-- tim/prune/lang/prune-texts_nl.properties | 2 -- tim/prune/lang/prune-texts_pl.properties | 9 +++++-- tim/prune/lang/prune-texts_pt.properties | 2 -- tim/prune/lang/prune-texts_ro.properties | 2 -- tim/prune/lang/prune-texts_ru.properties | 5 +++- tim/prune/load/BabelFileFormats.java | 35 +++++++++---------------- tim/prune/readme.txt | 12 ++++++--- tim/prune/save/GpsSaver.java | 39 ++++++++++++++++++++++++++++ 24 files changed, 100 insertions(+), 83 deletions(-) diff --cc debian/changelog index db34322,2b264bb..c2ec6a7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,10 +1,16 @@@ + gpsprune (18.4-1) unstable; urgency=medium + + * New upstream release. + * Bump Standards-Version to 3.9.8, no changes. + + -- Bas Couwenberg <[email protected]> Fri, 29 Apr 2016 12:20:44 +0200 + +gpsprune (18.3-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Sat, 20 Feb 2016 16:24:43 +0100 + gpsprune (18.3-1) unstable; urgency=medium * New upstream release. diff --cc debian/control index c9ef4ad,f51f899..3493e69 --- 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.7 + 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 Package: gpsprune -- 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
