Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Sat, 09 Mar 2013 18:17:05 +, Adam D. Barratt wrote: On Sun, 2013-03-03 at 10:24 +0100, David Paleino wrote: On Thu, 28 Feb 2013 20:31:40 +, Adam D. Barratt wrote: Cool; thanks. Did you have chance to look at whether fixing the testing package just requires the source file split or if there were any other issues? The package I prepared and built for testing also required 2 other patches, to fix #683075. I guess that hasn't changed since then :) The debdiff included in MID:20130119194518.0c49613d@local only appeared to include the srsinit changes. Apologies if I simply missed it, but was a debdiff with the other changes also posted somewhere? You did see it already, but I didn't include it in the patch I posted. This is because I only made a patch for the source to be split; the actual package for testing carries two more patches, attaching them to this mail. The bigger patch is needed because an API change in freexl happened unnoticed between testing and unstable. See also your message MID:1358594334.12995.35.ca...@jacala.jungle.funky-badger.org (Sat, 19 Jan 2013 11:18:54 +). Sorry for the confusion, and thank you! David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 | http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174 From: Evgeni Golov evg...@debian.org Subject: fix linking with libgeos Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683075#39 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683075 --- libspatialite/configure |4 ++-- libspatialite/configure.ac|4 ++-- spatialite-tools/configure|2 +- spatialite-tools/configure.ac |2 +- 4 files changed, 6 insertions(+), 6 deletions(-) --- spatialite.orig/libspatialite/configure +++ spatialite/libspatialite/configure @@ -16593,7 +16593,7 @@ for ac_lib in '' geos_c; do ac_res=none required else ac_res=-l$ac_lib -LIBS=-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS +LIBS=-l$ac_lib $ac_func_search_save_LIBS fi if ac_fn_c_try_link $LINENO; then : ac_cv_search_GEOSTopologyPreserveSimplify=$ac_res @@ -16663,7 +16663,7 @@ for ac_lib in '' geos_c; do ac_res=none required else ac_res=-l$ac_lib -LIBS=-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS +LIBS=-l$ac_lib $ac_func_search_save_LIBS fi if ac_fn_c_try_link $LINENO; then : ac_cv_search_GEOSCoveredBy=$ac_res --- spatialite.orig/libspatialite/configure.ac +++ spatialite/libspatialite/configure.ac @@ -120,7 +120,7 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING( if test x$enable_geos != xno; then OMIT_GEOS_FLAGS= AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])]) - AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seems to be installed on this system.]),-lm -lgeos) + AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seems to be installed on this system.]),) #--- # --enable-geosadvanced # @@ -129,7 +129,7 @@ if test x$enable_geos != xno; then [], [geosadvanced=yes]) if test x$enable_geosadvanced != xno; then GEOSADVANCED_FLAGS=-DGEOS_ADVANCED - AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' ( v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos) + AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' ( v.3.3.0). please retry specifying: --disable-geosadvanced.]),) else GEOSADVANCED_FLAGS= fi --- spatialite.orig/spatialite-tools/configure +++ spatialite/spatialite-tools/configure @@ -16547,7 +16547,7 @@ if test ${ac_cv_lib_geos_c_GEOSTopology $as_echo_n (cached) 6 else ac_check_lib_save_LIBS=$LIBS -LIBS=-lgeos_c -lm -lgeos $LIBS +LIBS=-lgeos_c $LIBS cat confdefs.h - _ACEOF conftest.$ac_ext /* end confdefs.h. */ --- spatialite.orig/spatialite-tools/configure.ac +++ spatialite/spatialite-tools/configure.ac @@ -72,7 +72,7 @@ AC_SUBST(READLINE_LIBS) AC_CHECK_LIB(expat,XML_ParserCreate,,AC_MSG_ERROR(['expat' is required but it doesn't seems to be installed on this system.])) AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seems to be installed on this system.]),-lm) -AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seems to be installed on this system.]),-lm -lgeos) +AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seems to be installed on this system.]),) PKG_CHECK_MODULES([LIBFREEXL], [freexl], , AC_MSG_ERROR(['libfreexl' is required but it doesn't seems to be installed on this system.])) LIBSPATIALITE_CFLAGS= From: Felix Geyer fge...@debian.org Subject: fix
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
Control: tags -1 + confirmed On Mon, 2013-03-11 at 20:21 +0100, David Paleino wrote: On Sat, 09 Mar 2013 18:17:05 +, Adam D. Barratt wrote: On Sun, 2013-03-03 at 10:24 +0100, David Paleino wrote: The package I prepared and built for testing also required 2 other patches, to fix #683075. I guess that hasn't changed since then :) The debdiff included in MID:20130119194518.0c49613d@local only appeared to include the srsinit changes. Apologies if I simply missed it, but was a debdiff with the other changes also posted somewhere? You did see it already, but I didn't include it in the patch I posted. This is because I only made a patch for the source to be split; the actual package for testing carries two more patches, attaching them to this mail. The bigger patch is needed because an API change in freexl happened unnoticed between testing and unstable. Thanks for the patches. Please feel free to go ahead with the tpu upload (using the version number suggested by the subject). Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1363034112.29496.8.ca...@jacala.jungle.funky-badger.org
Processed: Re: Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
Processing control commands: tags -1 + confirmed Bug #698341 [release.debian.org] unblock: spatialite/3.0.0~beta20110817-3+deb7u1 (tpu approval) Added tag(s) confirmed. -- 698341: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698341 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.b698341.136303412126023.transcr...@bugs.debian.org
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Sun, 2013-03-03 at 10:24 +0100, David Paleino wrote: On Thu, 28 Feb 2013 20:31:40 +, Adam D. Barratt wrote: Cool; thanks. Did you have chance to look at whether fixing the testing package just requires the source file split or if there were any other issues? The package I prepared and built for testing also required 2 other patches, to fix #683075. I guess that hasn't changed since then :) The debdiff included in MID:20130119194518.0c49613d@local only appeared to include the srsinit changes. Apologies if I simply missed it, but was a debdiff with the other changes also posted somewhere? Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1362853025.26434.19.ca...@jacala.jungle.funky-badger.org
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Thu, 28 Feb 2013 20:31:40 +, Adam D. Barratt wrote: On Fri, 2013-02-15 at 21:13 +0100, David Paleino wrote: On Fri, 15 Feb 2013 18:21:29 +, Adam D. Barratt wrote: On Sun, 2013-01-27 at 20:13 +0100, David Paleino wrote: On Sun, 27 Jan 2013 14:16:08 +, Adam D. Barratt wrote: Please go ahead with the upload to unstable, as we need the issues fixing there in any case, however we proceed; thanks. Done, 3.1.0~rc2-2 just uploaded to sid. That was a little over two weeks ago now. Have there been any reported issues with the package in sid? None up to now. Cool; thanks. Did you have chance to look at whether fixing the testing package just requires the source file split or if there were any other issues? The package I prepared and built for testing also required 2 other patches, to fix #683075. I guess that hasn't changed since then :) Kindly, David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 | http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174 signature.asc Description: PGP signature
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Fri, 2013-02-15 at 21:13 +0100, David Paleino wrote: On Fri, 15 Feb 2013 18:21:29 +, Adam D. Barratt wrote: On Sun, 2013-01-27 at 20:13 +0100, David Paleino wrote: On Sun, 27 Jan 2013 14:16:08 +, Adam D. Barratt wrote: Please go ahead with the upload to unstable, as we need the issues fixing there in any case, however we proceed; thanks. Done, 3.1.0~rc2-2 just uploaded to sid. That was a little over two weeks ago now. Have there been any reported issues with the package in sid? None up to now. Cool; thanks. Did you have chance to look at whether fixing the testing package just requires the source file split or if there were any other issues? Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1362083500.32751.11.ca...@jacala.jungle.funky-badger.org
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Sun, 2013-01-27 at 20:13 +0100, David Paleino wrote: On Sun, 27 Jan 2013 14:16:08 +, Adam D. Barratt wrote: Please go ahead with the upload to unstable, as we need the issues fixing there in any case, however we proceed; thanks. Done, 3.1.0~rc2-2 just uploaded to sid. That was a little over two weeks ago now. Have there been any reported issues with the package in sid? Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1360952489.20472.29.ca...@jacala.jungle.funky-badger.org
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Fri, 15 Feb 2013 18:21:29 +, Adam D. Barratt wrote: On Sun, 2013-01-27 at 20:13 +0100, David Paleino wrote: On Sun, 27 Jan 2013 14:16:08 +, Adam D. Barratt wrote: Please go ahead with the upload to unstable, as we need the issues fixing there in any case, however we proceed; thanks. Done, 3.1.0~rc2-2 just uploaded to sid. That was a little over two weeks ago now. Have there been any reported issues with the package in sid? None up to now. Thanks for your heads up! :) David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 | http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174 signature.asc Description: PGP signature
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Sat, 2013-01-19 at 19:45 +0100, David Paleino wrote: It seems like I could come up with a patch. A whole day's worth work :) Thanks! I made a patch both for the version in sid, and the one in testing. I'd really prefer to upload it to sid, and then let it flow to testing, but the current upstream version in sid is greater than the one in testing. That upload is pre-freeze though, maybe an unblock could be granted? Given the size of the diff, I strongly suspect that we'd still end up looking at tpu. Both patches work the same way: spatial_ref_sys data is being split out of a single file (srs_init.c in one case, epsg_inlined.c in the other) into multiple smaller files. This makes gcc not die on ppc. Besides this, the patches also contain changes to Makefile.{am.in}, to make it compile correctly. I'm not attaching both patches, since they're big -- 9.8MB (testing) and 12M (unstable). The unstable one is bigger because the code contained more code definitions than the testing one. You can find them here: http://alioth.debian.org/~dapal/spatialite_testing.patch.bz2 http://alioth.debian.org/~dapal/spatialite_unstable.patch.bz2 Unfortunately the patches /were/ attached, so the mail never made it to the debian-release list. :( If I got an ACK for the sid version, I'll investigate whether it compiles both with libfreexl-dev from testing and sid. In case not, I'll patch it to compile with the version in testing (causing a sid-only RC bug), wait for it to enter testing, and then de-patch it to compile with freexl from sid. The API change in freexl must've slipped through, sorry for that. Please go ahead with the upload to unstable, as we need the issues fixing there in any case, however we proceed; thanks. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1359296168.28246.43.ca...@jacala.jungle.funky-badger.org
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Sun, 27 Jan 2013 14:16:08 +, Adam D. Barratt wrote: On Sat, 2013-01-19 at 19:45 +0100, David Paleino wrote: [..] I made a patch both for the version in sid, and the one in testing. I'd really prefer to upload it to sid, and then let it flow to testing, but the current upstream version in sid is greater than the one in testing. That upload is pre-freeze though, maybe an unblock could be granted? Given the size of the diff, I strongly suspect that we'd still end up looking at tpu. ACK. Both patches work the same way: spatial_ref_sys data is being split out of a single file (srs_init.c in one case, epsg_inlined.c in the other) into multiple smaller files. This makes gcc not die on ppc. Besides this, the patches also contain changes to Makefile.{am.in}, to make it compile correctly. I'm not attaching both patches, since they're big -- 9.8MB (testing) and 12M (unstable). The unstable one is bigger because the code contained more code definitions than the testing one. You can find them here: http://alioth.debian.org/~dapal/spatialite_testing.patch.bz2 http://alioth.debian.org/~dapal/spatialite_unstable.patch.bz2 Unfortunately the patches /were/ attached, so the mail never made it to the debian-release list. :( Sorry for the mess :/ If I got an ACK for the sid version, I'll investigate whether it compiles both with libfreexl-dev from testing and sid. In case not, I'll patch it to compile with the version in testing (causing a sid-only RC bug), wait for it to enter testing, and then de-patch it to compile with freexl from sid. The API change in freexl must've slipped through, sorry for that. Please go ahead with the upload to unstable, as we need the issues fixing there in any case, however we proceed; thanks. Done, 3.1.0~rc2-2 just uploaded to sid. Thanks for your interest and work! David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 | http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174 signature.asc Description: PGP signature
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
retitle 698341 pu: package spatialite/3.0.0~beta20110817-3+deb7u1 user 698341 release.debian@packages.debian.org usertags 698341 = pu thanks Hello RT, let's try to fix this instead of going for removal. I've applied the debdiff prepared by Felix Geyer in #683075 [0], and checked that it compiles fine in wheezy. In any case, I'm attaching the final diff (modulo s/UNRELEASED/testing-proposed-updates/) to this email. The other bug afflicting spatialite is #664547. To fix this, we need to split some huge file (I guess it's spatialite.c, 17k+ LOC) into smaller files, so that gcc doesn't die on some arches. Would you be ok with such a huge patch? Kindly, David [0]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683075#44 -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 | http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174 diff --git a/debian/changelog b/debian/changelog index be5e24a..35c1a73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +spatialite (3.0.0~beta20110817-3+deb7u1) UNRELEASED; urgency=low + + [ Felix Geyer ] + * Fix FTBFS in wheezy. (Closes: #683075) +- Add 05-fix_libgeos_search.patch from Evgeni Golov to fix configure checks. +- Add 06-freexl_compat.patch to restore compatibility with freexl in wheezy. + + -- David Paleino da...@debian.org Sat, 19 Jan 2013 08:51:49 +0100 + spatialite (3.0.0~beta20110817-3) unstable; urgency=medium [ Francesco Paolo Lovergine ] diff --git a/debian/patches/05-fix_libgeos_search.patch b/debian/patches/05-fix_libgeos_search.patch new file mode 100644 index 000..a048771 --- /dev/null +++ b/debian/patches/05-fix_libgeos_search.patch @@ -0,0 +1,74 @@ +From: Evgeni Golov evg...@debian.org +Subject: fix linking with libgeos +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683075#39 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683075 + +--- + libspatialite/configure |4 ++-- + libspatialite/configure.ac|4 ++-- + spatialite-tools/configure|2 +- + spatialite-tools/configure.ac |2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +--- spatialite.orig/libspatialite/configure spatialite/libspatialite/configure +@@ -16593,7 +16593,7 @@ for ac_lib in '' geos_c; do + ac_res=none required + else + ac_res=-l$ac_lib +-LIBS=-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS ++LIBS=-l$ac_lib $ac_func_search_save_LIBS + fi + if ac_fn_c_try_link $LINENO; then : + ac_cv_search_GEOSTopologyPreserveSimplify=$ac_res +@@ -16663,7 +16663,7 @@ for ac_lib in '' geos_c; do + ac_res=none required + else + ac_res=-l$ac_lib +-LIBS=-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS ++LIBS=-l$ac_lib $ac_func_search_save_LIBS + fi + if ac_fn_c_try_link $LINENO; then : + ac_cv_search_GEOSCoveredBy=$ac_res +--- spatialite.orig/libspatialite/configure.ac spatialite/libspatialite/configure.ac +@@ -120,7 +120,7 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING( + if test x$enable_geos != xno; then + OMIT_GEOS_FLAGS= + AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])]) +- AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seems to be installed on this system.]),-lm -lgeos) ++ AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seems to be installed on this system.]),) + #--- + # --enable-geosadvanced + # +@@ -129,7 +129,7 @@ if test x$enable_geos != xno; then + [], [geosadvanced=yes]) + if test x$enable_geosadvanced != xno; then + GEOSADVANCED_FLAGS=-DGEOS_ADVANCED +- AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' ( v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos) ++ AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' ( v.3.3.0). please retry specifying: --disable-geosadvanced.]),) + else + GEOSADVANCED_FLAGS= + fi +--- spatialite.orig/spatialite-tools/configure spatialite/spatialite-tools/configure +@@ -16547,7 +16547,7 @@ if test ${ac_cv_lib_geos_c_GEOSTopology + $as_echo_n (cached) 6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS=-lgeos_c -lm -lgeos $LIBS ++LIBS=-lgeos_c $LIBS + cat confdefs.h - _ACEOF conftest.$ac_ext + /* end confdefs.h. */ + +--- spatialite.orig/spatialite-tools/configure.ac spatialite/spatialite-tools/configure.ac +@@ -72,7 +72,7 @@ AC_SUBST(READLINE_LIBS) + + AC_CHECK_LIB(expat,XML_ParserCreate,,AC_MSG_ERROR(['expat' is required but it doesn't seems to be installed on this system.])) + AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seems to be installed on this system.]),-lm)
Bug#698341: pu: package spatialite/3.0.0~beta20110817-3+deb7u1
On Sat, 2013-01-19 at 09:13 +0100, David Paleino wrote: retitle 698341 pu: package spatialite/3.0.0~beta20110817-3+deb7u1 user 698341 release.debian@packages.debian.org usertags 698341 = pu Nope. pu is for stable; fixed up. I've applied the debdiff prepared by Felix Geyer in #683075 [0], and checked that it compiles fine in wheezy. In any case, I'm attaching the final diff (modulo s/UNRELEASED/testing-proposed-updates/) to this email. +- int ret = +- freexl_get_cell_value (handle, 0, col, type, int_value, +- dbl_value, text_value); ++ FreeXL_CellValue cell; ++ int ret = freexl_get_cell_value (handle, 0, col, cell); H, so there was an API change in freexl_get_cell_value. As the SONAME hasn't changed, are the two versions of the library ABI-compatible - i.e. a package built against either version will run correctly against the other? The other bug afflicting spatialite is #664547. To fix this, we need to split some huge file (I guess it's spatialite.c, 17k+ LOC) into smaller files, so that gcc doesn't die on some arches. Would you be ok with such a huge patch? The bug log suggests we need to split up quite a lot of source modules; more information there would be useful. In any case, this is the kind of bug which we'd generally prefer to be fixed in unstable first. (I'm not entirely sure why nothing has happened in that bug log since July.) Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1358594334.12995.35.ca...@jacala.jungle.funky-badger.org