~ubuntu-branches/ubuntu/natty/subversion/natty-security

Viewing all changes in revision 49.

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2011-01-28 14:14:19 UTC
  • mfrom: (0.4.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110128141419-468hdqfx477bre63
Tags: 1.6.12dfsg-4ubuntu1
* Merge with Debian unstable. Remaining changes:
  - Create pot file on build.
  - Build a python-subversion-dbg package.
  - (Build-)depend on default-jre-headless/-jdk.
  - Do not apply java-build patch.
  - debian/rules: Manually create the doxygen output directory, otherwise
    we get weird build failures when running parallel builds.
  - Disable the serf backend because serf is in universe.
  - Don't override LD_LIBRARY_PATH completely but prepend to it as to not
    break fakeroot.
  - Fix FTBFS against Python 2.7 by disabling some problematic tests.
  - debian/tools/Makefile:
    + Add APR_LIBS and use it when linking svn-make-config
    + svn_config_ensure() moved from libsvn_client/libsvn_client-1.la to
      libsvn_subr/libsvn_subr-1.la.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: