On Mon, Mar 23, 2020 at 12:50:42PM -0300, Lucas Kanashiro wrote: > diff -Nru subversion-1.13.0/debian/control > subversion-1.13.0.new/debian/control > --- subversion-1.13.0/debian/control 2020-01-19 10:59:14.000000000 -0300 > +++ subversion-1.13.0.new/debian/control 2020-03-23 11:39:46.474677200 > -0300 > @@ -32,7 +32,7 @@ > rename, > ruby, > ruby-dev, > - swig, > + swig3.0,
I had forgotten that multiple versions of swig were still in the archive. This will work around the issue until next upstream release happens. > zlib1g-dev > Build-Conflicts: libsvn-dev (<< 1.13~) > Rules-Requires-Root: no > diff -Nru subversion-1.13.0/debian/patches/fix-swig-ruby-includes.patch > subversion-1.13.0.new/debian/patches/fix-swig-ruby-includes.patch > --- subversion-1.13.0/debian/patches/fix-swig-ruby-includes.patch > 1969-12-31 21:00:00.000000000 -0300 > +++ subversion-1.13.0.new/debian/patches/fix-swig-ruby-includes.patch > 2020-03-23 11:39:46.450677157 -0300 > @@ -0,0 +1,15 @@ > +Description: Do not include ruby include subdir which has headers that > + clash with standard ones, such as assert.h. > +Author: Dimitri John Ledkov <[email protected]> > + > +--- a/build/ac-macros/swig.m4 > ++++ b/build/ac-macros/swig.m4 > +@@ -168,7 +168,7 @@ > + AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[ > + if test -d "$rbconfig_rubyhdrdir"; then > + dnl Ruby >=1.9 > +- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir > -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward" > ++ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir > -I$rbconfig_rubyhdrdir/ruby/backward" The use of /ruby looks like a very old change, which isn't needed anymore. I'll forward this upstream. Thanks for the info and patches. I'll get a new upload ready soon. Cheers, -- James GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7 2D23 DFE6 91AE 331B A3DB
