This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch gcc5 in repository geos.
commit 6272715c4a9279ec3c32f93b6c60a58fe3fd7f61 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Jul 19 23:27:32 2015 +0200 Append v5 to library package names for GCC 5 transition. --- debian/changelog | 6 ++++++ debian/control | 16 ++++++++++------ debian/control.in | 16 ++++++++++------ debian/{libgeos-c++.dirs => libgeos-3.4.2v5.dirs} | 0 debian/{libgeos-c++.install => libgeos-3.4.2v5.install} | 0 .../{libgeos-3.4.2.symbols => libgeos-3.4.2v5.symbols} | 2 +- debian/{libgeos-c1.dirs => libgeos-c1v5.dirs} | 0 debian/{libgeos-c1.install => libgeos-c1v5.install} | 0 debian/{libgeos-c1.symbols => libgeos-c1v5.symbols} | 2 +- debian/rules | 3 --- 10 files changed, 28 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 951dea1..e6f61c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +geos (3.4.2-8) UNRELEASED; urgency=medium + + * Append v5 to library package names for GCC 5 transition. + + -- Bas Couwenberg <sebas...@debian.org> Sun, 19 Jul 2015 23:27:13 +0200 + geos (3.4.2-7) unstable; urgency=medium * Update symbols for other architectures. diff --git a/debian/control b/debian/control index 51dc2ea..6e38c57 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Homepage: http://trac.osgeo.org/geos/ Package: libgeos-dev Architecture: any Section: libdevel -Depends: libgeos-c1 (= ${binary:Version}), +Depends: libgeos-c1v5 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files @@ -36,7 +36,7 @@ Description: Geometry engine for GIS - Development files Package: libgeos++-dev Architecture: any Section: libdevel -Depends: libgeos-3.4.2 (= ${binary:Version}), +Depends: libgeos-3.4.2v5 (= ${binary:Version}), libgeos-dev, ${misc:Depends} Suggests: libgdal-doc @@ -51,11 +51,13 @@ Description: Geometry engine for GIS - C++ development files programs should use the stable C API instead of the unstable C++ one. -Package: libgeos-c1 +Package: libgeos-c1v5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libgeos-c1 (<< 3.4.2-8) +Replaces: libgeos-c1 (<< 3.4.2-8) Description: Geometry engine for Geographic Information Systems - C Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the @@ -73,11 +75,13 @@ Description: Geometry engine for Geographic Information Systems - C Library This package contains the C library. A C++ library is provided by the libgeos-* package. -Package: libgeos-3.4.2 +Package: libgeos-3.4.2v5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libgeos-3.4.2 (<< 3.4.2-8) +Replaces: libgeos-3.4.2 (<< 3.4.2-8) Description: Geometry engine for Geographic Information Systems - C++ Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the @@ -153,8 +157,8 @@ Architecture: any Section: debug Priority: extra Pre-Depends: ${misc:Pre-Depends} -Depends: libgeos-3.4.2 (= ${binary:Version}), - libgeos-c1 (= ${binary:Version}), +Depends: libgeos-3.4.2v5 (= ${binary:Version}), + libgeos-c1v5 (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for the GEOS library GEOS provides a spatial object model and fundamental geometric diff --git a/debian/control.in b/debian/control.in index cc93817..0f3c40b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -22,7 +22,7 @@ Homepage: http://trac.osgeo.org/geos/ Package: libgeos-dev Architecture: any Section: libdevel -Depends: libgeos-c1 (= ${binary:Version}), +Depends: libgeos-c1v5 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files @@ -36,7 +36,7 @@ Description: Geometry engine for GIS - Development files Package: libgeos++-dev Architecture: any Section: libdevel -Depends: libgeos-@VERSION@ (= ${binary:Version}), +Depends: libgeos-@VERSION@v5 (= ${binary:Version}), libgeos-dev, ${misc:Depends} Suggests: libgdal-doc @@ -51,11 +51,13 @@ Description: Geometry engine for GIS - C++ development files programs should use the stable C API instead of the unstable C++ one. -Package: libgeos-c1 +Package: libgeos-c1v5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libgeos-c1 (<< 3.4.2-8) +Replaces: libgeos-c1 (<< 3.4.2-8) Description: Geometry engine for Geographic Information Systems - C Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the @@ -73,11 +75,13 @@ Description: Geometry engine for Geographic Information Systems - C Library This package contains the C library. A C++ library is provided by the libgeos-* package. -Package: libgeos-@VERSION@ +Package: libgeos-@VERSION@v5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libgeos-@VERSION@ (<< 3.4.2-8) +Replaces: libgeos-@VERSION@ (<< 3.4.2-8) Description: Geometry engine for Geographic Information Systems - C++ Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the @@ -152,8 +156,8 @@ Architecture: any Section: debug Priority: extra Pre-Depends: ${misc:Pre-Depends} -Depends: libgeos-@VERSION@ (= ${binary:Version}), - libgeos-c1 (= ${binary:Version}), +Depends: libgeos-@VERSION@v5 (= ${binary:Version}), + libgeos-c1v5 (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for the GEOS library GEOS provides a spatial object model and fundamental geometric diff --git a/debian/libgeos-c++.dirs b/debian/libgeos-3.4.2v5.dirs similarity index 100% rename from debian/libgeos-c++.dirs rename to debian/libgeos-3.4.2v5.dirs diff --git a/debian/libgeos-c++.install b/debian/libgeos-3.4.2v5.install similarity index 100% rename from debian/libgeos-c++.install rename to debian/libgeos-3.4.2v5.install diff --git a/debian/libgeos-3.4.2.symbols b/debian/libgeos-3.4.2v5.symbols similarity index 99% rename from debian/libgeos-3.4.2.symbols rename to debian/libgeos-3.4.2v5.symbols index 40c21f6..b63ebc0 100644 --- a/debian/libgeos-3.4.2.symbols +++ b/debian/libgeos-3.4.2v5.symbols @@ -1,5 +1,5 @@ # SymbolsHelper-Confirmed: 3.4.2 amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc s390x sparc -libgeos-3.4.2.so libgeos-3.4.2 #MINVER# +libgeos-3.4.2.so libgeos-3.4.2v5 #MINVER# (arch=!amd64 !arm64 !s390x)_ZN4geos11planargraph11PlanarGraph17findNodesOfDegreeEj@Base 3.4.2 (arch=!amd64 !arm64 !s390x)_ZN4geos11planargraph11PlanarGraph17findNodesOfDegreeEjRSt6vectorIPNS0_4NodeESaIS4_EE@Base 3.4.2 _ZN4geos11planargraph11PlanarGraph17findNodesOfDegreeEm@Base 3.4.2 diff --git a/debian/libgeos-c1.dirs b/debian/libgeos-c1v5.dirs similarity index 100% rename from debian/libgeos-c1.dirs rename to debian/libgeos-c1v5.dirs diff --git a/debian/libgeos-c1.install b/debian/libgeos-c1v5.install similarity index 100% rename from debian/libgeos-c1.install rename to debian/libgeos-c1v5.install diff --git a/debian/libgeos-c1.symbols b/debian/libgeos-c1v5.symbols similarity index 99% rename from debian/libgeos-c1.symbols rename to debian/libgeos-c1v5.symbols index 649a042..17cf38c 100644 --- a/debian/libgeos-c1.symbols +++ b/debian/libgeos-c1v5.symbols @@ -1,5 +1,5 @@ # SymbolsHelper-Confirmed: 3.4.2 amd64 armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc sparc -libgeos_c.so.1 libgeos-c1 #MINVER# +libgeos_c.so.1 libgeos-c1v5 #MINVER# GEOSArea@Base 3.4.2 GEOSArea_r@Base 3.4.2 GEOSBoundary@Base 3.4.2 diff --git a/debian/rules b/debian/rules index 2857ff9..5bcd9bf 100755 --- a/debian/rules +++ b/debian/rules @@ -56,9 +56,6 @@ override_dh_auto_configure: debian/control CXX="$(CXX)" \ $(shell dpkg-buildflags --export=configure) - cp debian/libgeos-c++.install debian/libgeos-$(VER).install - cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs - override_dh_auto_build-arch: dh_auto_build --arch -- 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