[gpsprune] 01/02: Merge tag 'debian/18-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Jul 27 10:35:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository gpsprune.
commit ecddfcee59ef6aba3df90d87df42d5d711e9358c
Merge: 41967c1 32df27f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jul 27 11:57:33 2015 +0200
Merge tag 'debian/18-1' into jessie-backports
Conflicts:
debian/changelog
build.sh | 2 +-
debian/changelog | 20 +
debian/control | 2 +-
tim/prune/App.java | 47 +-
tim/prune/DataStatus.java | 10 +-
tim/prune/FunctionLibrary.java | 13 +-
tim/prune/GpsPrune.java | 4 +-
tim/prune/I18nManager.java | 46 +-
tim/prune/config/Config.java | 7 +-
tim/prune/copyright.txt | 2 +-
tim/prune/data/Field.java | 3 +-
tim/prune/data/SourceInfo.java | 2 +-
tim/prune/data/Timestamp.java | 5 +-
tim/prune/data/Track.java | 15 +-
tim/prune/data/TrackInfo.java | 8 +-
tim/prune/function/AboutScreen.java | 6 +-
tim/prune/function/GetWikipediaFunction.java | 14 +-
tim/prune/function/GetWikipediaXmlHandler.java | 23 +-
...mlHandler.java => OpenCachingDeXmlHandler.java} | 48 +-
tim/prune/function/RearrangePhotosFunction.java | 2 +-
...ction.java => SearchOpenCachingDeFunction.java} | 74 +--
tim/prune/function/SearchWikipediaNames.java | 14 +-
tim/prune/function/SetLanguage.java | 14 +-
tim/prune/function/autoplay/AutoplayFunction.java | 334 ++++++++++
tim/prune/function/autoplay/PointInfo.java | 98 +++
tim/prune/function/autoplay/PointList.java | 115 ++++
tim/prune/function/browser/BrowserLauncher.java | 1 +
tim/prune/function/browser/UrlGenerator.java | 194 ++++--
tim/prune/function/browser/WebMapFunction.java | 46 ++
tim/prune/function/cache/ManageCacheFunction.java | 1 +
tim/prune/function/cache/RowInfo.java | 16 -
tim/prune/function/cache/TileSet.java | 33 +-
.../compress/DeleteMarkedPointsFunction.java | 56 ++
.../function/compress/MarkAndDeleteFunction.java | 15 +-
tim/prune/function/compress/MarkLiftsFunction.java | 143 ++++
tim/prune/function/gpsies/GetGpsiesFunction.java | 4 +-
tim/prune/function/gpsies/GpsiesXmlHandler.java | 12 +-
tim/prune/function/gpsies/TrackListModel.java | 11 +-
.../GenericDownloaderFunction.java | 3 +-
.../function/search/SearchMapillaryFunction.java | 231 +++++++
.../GpsiesTrack.java => search/SearchResult.java} | 36 +-
tim/prune/function/srtm/LookupSrtmFunction.java | 7 +-
.../function/srtm/gen/GenerateTileLookup.java | 11 +-
tim/prune/gui/IconManager.java | 12 +-
tim/prune/gui/MenuManager.java | 122 ++--
tim/prune/gui/TripleStateCheckBox.java | 78 +++
tim/prune/gui/UndoManager.java | 26 +-
tim/prune/gui/images/add_photo_icon.png | Bin
tim/prune/gui/images/add_textfile_icon.png | Bin
tim/prune/gui/images/pause.png | Bin 0 -> 424 bytes
tim/prune/gui/images/play.png | Bin 0 -> 523 bytes
tim/prune/gui/images/points_connected.gif | Bin 922 -> 0 bytes
tim/prune/gui/images/points_connected.png | Bin 0 -> 586 bytes
tim/prune/gui/images/points_disconnected.gif | Bin 897 -> 0 bytes
tim/prune/gui/images/points_disconnected.png | Bin 0 -> 513 bytes
tim/prune/gui/images/points_hidden.png | Bin 0 -> 403 bytes
tim/prune/gui/images/rewind.png | Bin 0 -> 549 bytes
tim/prune/gui/map/DiskTileCacher.java | 3 +-
tim/prune/gui/map/MapCanvas.java | 23 +-
tim/prune/gui/map/MapSource.java | 17 +-
tim/prune/gui/map/MapSourceLibrary.java | 4 +-
tim/prune/gui/profile/ProfileChart.java | 6 +
tim/prune/jpeg/ExternalExifLibrary.java | 34 +-
tim/prune/lang/prune-texts_af.properties | 2 +-
tim/prune/lang/prune-texts_cz.properties | 2 +-
tim/prune/lang/prune-texts_da.properties | 84 +++
tim/prune/lang/prune-texts_de.properties | 22 +-
tim/prune/lang/prune-texts_de_CH.properties | 38 +-
tim/prune/lang/prune-texts_en.properties | 24 +-
tim/prune/lang/prune-texts_es.properties | 16 +-
tim/prune/lang/prune-texts_fa.properties | 73 +++
tim/prune/lang/prune-texts_fr.properties | 23 +-
tim/prune/lang/prune-texts_hu.properties | 15 +-
tim/prune/lang/prune-texts_in.properties | 111 ++++
tim/prune/lang/prune-texts_it.properties | 13 +-
tim/prune/lang/prune-texts_ja.properties | 2 +-
tim/prune/lang/prune-texts_ko.properties | 2 +-
tim/prune/lang/prune-texts_nl.properties | 12 +-
tim/prune/lang/prune-texts_no.properties | 142 ++++
tim/prune/lang/prune-texts_pl.properties | 4 +-
tim/prune/lang/prune-texts_pt.properties | 20 +-
tim/prune/lang/prune-texts_ro.properties | 724 ++++++++++++++++-----
tim/prune/lang/prune-texts_ru.properties | 6 +-
tim/prune/lang/prune-texts_sv.properties | 102 +++
tim/prune/lang/prune-texts_tr.properties | 2 +-
tim/prune/lang/prune-texts_uk.properties | 2 +-
tim/prune/lang/prune-texts_zh.properties | 2 +-
tim/prune/load/FileLoader.java | 1 +
tim/prune/load/xml/GpxHandler.java | 2 +-
tim/prune/load/xml/KmlHandler.java | 66 +-
tim/prune/load/xml/XmlHandler.java | 4 +-
tim/prune/readme.txt | 35 +-
tim/prune/save/BaseImageConfigDialog.java | 3 +-
tim/prune/save/FileSaver.java | 17 +-
tim/prune/save/GpxExporter.java | 10 +-
tim/prune/threedee/TerrainHelper.java | 44 +-
tim/prune/threedee/TerrainPatch.java | 116 ++++
tim/prune/undo/UndoStack.java | 56 +-
98 files changed, 3212 insertions(+), 658 deletions(-)
diff --cc debian/changelog
index 77e4e12,4bc0c4c..09ccf28
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,23 +1,30 @@@
+ gpsprune (18-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop metadata-extractor.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 22 Jul 2015 09:20:46 +0200
+
+ gpsprune (17.2-2) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 01 Jun 2015 19:27:07 +0200
+
+ gpsprune (17.2-2~exp1) experimental; urgency=medium
+
+ * Add patch to rename symbols as used in libmetadata-extractor-java 2.7.2.
+ * Bump minimum required libmetadata-extractor-java version to 2.7.2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 11 Mar 2015 11:44:43 +0100
+
+gpsprune (17.2-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Update branch in gbp.conf and Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 05 May 2015 16:06:59 +0200
+
gpsprune (17.2-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index b1598f2,cb4c54c..da2665a
--- a/debian/control
+++ b/debian/control
@@@ -13,10 -13,10 +13,10 @@@ Build-Depends: ant
fastjar,
libjava3d-java,
libvecmath-java,
- libmetadata-extractor-java (>= 2.6.4)
+ libmetadata-extractor-java (>= 2.7.2)
Standards-Version: 3.9.6
Vcs-Browser: http://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
More information about the Pkg-grass-devel
mailing list