This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository gpsprune.
commit e3344353df72ee4d91f3709cbe2eb1a828cce2e6
Merge: 581c9cb 2e9a257
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Thu Oct 8 10:27:11 2015 +0200
Merge tag 'debian/18.1-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
build.sh | 2 +-
debian/changelog | 7 +
debian/control | 2 +-
tim/prune/GpsPrune.java | 4 +-
tim/prune/UpdateMessageBroker.java | 35 +-
tim/prune/data/Selection.java | 8 +-
tim/prune/data/SpeedCalculator.java | 36 +-
tim/prune/data/Timestamp.java | 10 +-
tim/prune/function/GetWikipediaFunction.java | 72 ++-
tim/prune/function/PhotoPopupFunction.java | 49 +-
tim/prune/function/charts/Charter.java | 2 +-
tim/prune/function/gpsies/TrackListModel.java | 17 +-
tim/prune/function/search/SearchResult.java | 19 +-
tim/prune/function/search/wikimedia_galleries.txt | 662 ++++++++++++++++++++++
tim/prune/lang/prune-texts_cz.properties | 1 +
tim/prune/lang/prune-texts_de.properties | 3 +-
tim/prune/lang/prune-texts_de_CH.properties | 1 +
tim/prune/lang/prune-texts_en.properties | 1 +
tim/prune/lang/prune-texts_hu.properties | 1 +
tim/prune/lang/prune-texts_nl.properties | 8 +
tim/prune/lang/prune-texts_ro.properties | 1 +
tim/prune/lang/prune-texts_uk.properties | 36 +-
tim/prune/readme.txt | 16 +-
23 files changed, 937 insertions(+), 56 deletions(-)
diff --cc debian/changelog
index 2b2235a,4c871e1..aa49932
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
+ gpsprune (18.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update Vcs-Browser URL to use HTTPS.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 02 Oct 2015 12:43:15 +0200
+
+gpsprune (18-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Add patch to rename symbols as used in libmetadata-extractor-java 2.6.4.
+ * Downgrade minimum required libmetadata-extractor-java version to 2.6.4.
+
+ -- Bas Couwenberg <sebas...@debian.org> Mon, 27 Jul 2015 12:12:53 +0200
+
gpsprune (18-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index b1598f2,278b229..c965e31
--- 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
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/gpsprune.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gpsprune.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/gpsprune.git
+Vcs-Git: git://anonscm.debian.org/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
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
