This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository geos.
commit 50fcda21499537f98f6a4ee9be7e91b7aacd4364
Merge: a5530e7 472d358
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Aug 1 17:50:35 2015 +0200
Merge branch 'gcc5'
Conflicts:
debian/changelog
debian/changelog | 2 +
debian/control | 18 +--
debian/control.in | 18 +--
debian/gbp.conf | 2 +-
debian/{libgeos-c++.dirs => libgeos-3.4.2v5.dirs} | 0
...libgeos-c++.install => libgeos-3.4.2v5.install} | 0
...bgeos-3.4.2.symbols => libgeos-3.4.2v5.symbols} | 139 ++++++++++++++++++++-
debian/{libgeos-c1.dirs => libgeos-c1v5.dirs} | 0
.../{libgeos-c1.install => libgeos-c1v5.install} | 0
.../{libgeos-c1.symbols => libgeos-c1v5.symbols} | 7 +-
debian/rules | 3 -
11 files changed, 169 insertions(+), 20 deletions(-)
diff --cc debian/changelog
index e5f138f,842dbb3..cf0ea77
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,10 @@@
geos (3.4.2-8) UNRELEASED; urgency=medium
- * Append v5 to library package names for GCC 5 transition.
* Sync control & control.in to not lose libjs-jquery dependency.
++ * Append v5 to library package names for GCC 5 transition.
+ * Update symbols for amd64.
- -- Bas Couwenberg <sebas...@debian.org> Sun, 19 Jul 2015 23:27:13 +0200
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 19 Jul 2015 23:36:12 +0200
geos (3.4.2-7) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/geos.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
