Remove patches/no-extra-libs{,-2}

apr-config/apu-config no longer expose unnecessary libraries, and this
reduces divergence from upstream.

Signed-off-by: James McCoy <jamessan@debian.org>

4 files changed, 0 insertions, 121 deletions

diff --git a/debian/patches/no-extra-libs b/debian/patches/no-extra-libs
deleted file mode 100644
index 708ade3..0000000
--- a/debian/patches/no-extra-libs
+++ /dev/null
@@ -1,33 +0,0 @@
-Bug #338302: Use pkg-config instead of '{apr,aprutil,neon}-config --libs'
-to improve link stuff.  At the time this patch was originally deployed,
-it eliminated redundant dependencies on: libssl0.9.8, libldap2,
-libexpat2, libxml2, zlib1g.
-
---- a/build/ac-macros/apr.m4
-+++ b/build/ac-macros/apr.m4
-@@ -94,9 +94,9 @@
-       AC_MSG_ERROR([apr-config --link-ld --libs failed])
-     fi
-   else
--    SVN_APR_LIBS="`$apr_config --link-ld`"
-+    SVN_APR_LIBS="`pkg-config --libs apr-1`"
-     if test $? -ne 0; then
--      AC_MSG_ERROR([apr-config --link-ld failed])
-+      AC_MSG_ERROR([pkg-config --libs apr-1 failed])
-     fi
-   fi
-   SVN_APR_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APR_LIBS)`"
---- a/build/ac-macros/aprutil.m4
-+++ b/build/ac-macros/aprutil.m4
-@@ -98,9 +98,9 @@
-       AC_MSG_ERROR([apu-config --link-ld --libs failed])
-     fi
-   else
--    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
-+    SVN_APRUTIL_LIBS="`pkg-config --libs apr-util-1`"
-     if test $? -ne 0; then
--      AC_MSG_ERROR([apu-config --link-ld failed])
-+      AC_MSG_ERROR([pkg-config --libs apr-util-1 failed])
-     fi
-   fi
-   SVN_APRUTIL_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APRUTIL_LIBS)`"
diff --git a/debian/patches/no-extra-libs-2 b/debian/patches/no-extra-libs-2
deleted file mode 100644
index 079b66d..0000000
--- a/debian/patches/no-extra-libs-2
+++ /dev/null
@@ -1,57 +0,0 @@
-Hack the apriconv library declaration not to pull in aprutil.  (It
-might be correct on Windows, I don't know, but we don't need apriconv
-_at all_, so we don't want it to pull in aprutil for us.)
-
---- a/subversion/bindings/swig/perl/native/Makefile.PL.in
-+++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
-@@ -43,6 +43,12 @@
-                                 fs_base fs_util fs_fs fs_x/);
- 
- my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
-+sub libs_line {
-+    return join(' ', $apr_ldflags,
-+                (map {"-L$_"} @ldpaths),
-+                (map {"-lsvn_$_-1"} @_),
-+                '-lsvn_swig_perl-1', qx($swig -perl -ldflags));
-+}
- 
- my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
- my $cppflags = <<'EOT';
-@@ -86,10 +92,6 @@
-                  " -I$svnlib_builddir",
-                  " -I$swig_srcdir -g"),
-     OBJECT => q/$(O_FILES)/,
--    LIBS => [join(' ', $apr_ldflags,
--                  (map {"-L$_"} @ldpaths),
--                  @ldmodules, '-lsvn_swig_perl-1',
--                  `$swig -perl -ldflags`)],
-     LDFLAGS => join(' ', (map {"-L$_"} @ldpaths), '@LDFLAGS@ @SWIG_PL_LINK@'),
-     LDDLFLAGS => join(' ', (map {"-L$_"} @ldpaths),
-                       '@LDFLAGS@ @SWIG_PL_LINK@', $Config{lddlflags}),
-@@ -102,6 +104,7 @@
-     $_;
- }
- 
-+$config{LIBS} = [libs_line('diff', 'subr')];
- WriteMakefile(%config, NAME => 'SVN::_Core', C => ['core.c'],
-         PM => {map { ("$swig_srcdir/perl/native/$_.pm" =>
-                       "\$(INST_LIBDIR)/$_.pm") }
-@@ -116,6 +119,7 @@
-        );
- 
- for (@modules) {
-+    $config{LIBS} = [libs_line($_, 'subr')];
-     WriteMakefile(%config,
-       MAKEFILE=> "Makefile.$_",
-       NAME    => "SVN::_".perlish($_),
---- a/build.conf
-+++ b/build.conf
-@@ -1438,7 +1438,7 @@
- 
- [apriconv]
- type = lib
--external-lib = $(SVN_APRUTIL_LIBS)
-+external-lib = $(SVN_APR_LIBS)
- 
- [libhttpd]
- type = lib
diff --git a/debian/patches/ruby-test-info b/debian/patches/ruby-test-info
deleted file mode 100644
index bbddc2a..0000000
--- a/debian/patches/ruby-test-info
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/subversion/bindings/swig/ruby/test/test_info.rb
-+++ b/subversion/bindings/swig/ruby/test/test_info.rb
-@@ -26,9 +26,12 @@
- 
-     info = make_info(commit_info.revision)
-     assert_equal(@author, info.author)
--    assert_equal(commit_info.date, info.date)
--    assert_equal(commit_info.revision, info.revision)
--    assert_equal(log, info.log)
-+    # FIXME: Strange debian buildd error #1
-+    # https://buildd.debian.org/fetch.cgi?pkg=subversion;ver=1.6.5dfsg-1;arch=powerpc;stamp=1250968748
-+    # https://buildd.debian.org/fetch.cgi?pkg=subversion;ver=1.6.11dfsg-1;arch=powerpc;stamp=1271760487
-+    # assert_equal(commit_info.date, info.date)
-+    # assert_equal(commit_info.revision, info.revision)
-+    # assert_equal(log, info.log)
-   end
- 
-   def test_dirs_changed
-@@ -47,7 +50,9 @@
- 
-     info = make_info(commit_info.revision)
-     assert_equal(["/", "#{dir}/"], info.changed_dirs)
--    assert_equal(commit_info.revision, info.revision)
-+    # FIXME: Strange Debian buildd error #2
-+    # https://buildd.debian.org/fetch.cgi?pkg=subversion;ver=1.6.5dfsg-1;arch=powerpc;stamp=1250968748
-+    # assert_equal(commit_info.revision, info.revision)
-     assert_equal(log, info.log)
-   end
- 
diff --git a/debian/patches/series b/debian/patches/series
index 8aded54..437319c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 build-fixes
 last-changed-date-charset
-no-extra-libs
-no-extra-libs-2
 repos-templates
 rpath
 ruby-no-strict-aliasing