This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository osmcoastline.
commit d1462248648d0f66c131eaca77b551481b093413
Merge: 1a8ea96 a56f9e4
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Sep 8 08:37:48 2015 +0200
Merge tag 'debian/2.1.1-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
CHANGELOG.md | 30 ++++-
CMakeLists.txt | 12 +-
README.md | 2 +-
cmake/FindOSMPBF.cmake | 50 --------
cmake/FindOsmium.cmake | 79 +++++-------
debian/changelog | 23 ++++
debian/control | 5 +-
debian/patches/curently-typo.patch | 26 ----
debian/patches/reproducible-build.patch | 19 ---
debian/patches/series | 2 -
man/manpage.template | 3 +-
man/osmcoastline.md | 29 ++++-
man/osmcoastline_segments.md | 69 ++++++++++
simplify_and_split/split_tiles.sql | 3 +-
src/CMakeLists.txt | 4 +
src/coastline_ring_collection.cpp | 10 +-
src/coastline_ring_collection.hpp | 2 +-
src/options.cpp | 8 +-
src/options.hpp | 3 +
src/osmcoastline.cpp | 19 ++-
src/osmcoastline_filter.cpp | 2 -
src/osmcoastline_segments.cpp | 214 ++++++++++++++++++++++++++++++++
src/osmcoastline_ways.cpp | 2 -
23 files changed, 445 insertions(+), 171 deletions(-)
diff --cc debian/changelog
index 4c2a57e,ae23291..47cc430
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,26 +1,33 @@@
+ osmcoastline (2.1.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump minimum required libosmium2-dev to 2.4.1.
+
+ -- Bas Couwenberg <sebas...@debian.org> Mon, 31 Aug 2015 16:04:53 +0200
+
+ osmcoastline (2.1.0-2) unstable; urgency=medium
+
+ * Update Vcs-Browser URL to use HTTPS.
+ * Rebuild for geos transition.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 30 Aug 2015 16:00:19 +0200
+
+ osmcoastline (2.1.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop build dependency on osmpbf.
+ * Bump minimum required libosmium2-dev to 2.3.0.
+ * Drop patches, applied upstream.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 21 Aug 2015 21:28:32 +0200
+
+osmcoastline (2.0.1-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Update branch in gbp.conf and Vcs-Git URL.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 03 Jul 2015 19:22:37 +0200
+
osmcoastline (2.0.1-2) unstable; urgency=medium
* Add patch to make the build reproducible.
diff --cc debian/control
index 44f65d3,0a261e0..6fdd377
--- a/debian/control
+++ b/debian/control
@@@ -16,8 -15,8 +15,8 @@@ Build-Depends: debhelper (>= 9)
sqlite3,
zlib1g-dev
Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmcoastline.git/
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmcoastline.git/
-Vcs-Git: git://anonscm.debian.org/pkg-grass/osmcoastline.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/osmcoastline.git -b
jessie-backports
Homepage: http://osmcode.org/osmcoastline/
Package: osmcoastline
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmcoastline.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
