Merge subversion 1.6.6dfsg-2 (main) from Debian unstable (main).

Checked OK in lucid pbuilder, now subscribing u-m-s....

Following conversation with Scott Kitterman I've pushed some updates to the branch, and will be attaching a debdiff.

Note, however, that part of the work of this merge was repairing erroneously diverged bzr history in the debian vs. ubuntu bzr branches, as produced by some less-than-optimal decisions of the auto-importer.

Therefore if the debdiff is used for upload, it is important that my branch is pushed into the official packaging branch concurrently with the upload (after having 'bzr mark-uploaded' run on it), rather than letting the auto-importer import the upload.

Actually, the earlier discussed idea of reverting to the Debian unmodified "XS-Python-Version: 2.4, 2.5, 2.6" does not work.

Instead we are going with "XS-Python-Version: >= 2.4" which should be upstreamable back to Debian and works for us.

New debdiff coming.

Testbuild in progress:
https://edge.launchpad.net/~maxb/+archive/ppa/+build/1391259
https://edge.launchpad.net/~maxb/+archive/ppa/+build/1391260

This bug was fixed in the package subversion - 1.6.6dfsg-2ubuntu1

---------------
subversion (1.6.6dfsg-2ubuntu1) lucid; urgency=low

  * Merge from debian unstable (LP: #483953).
    Includes enabling kwallet support (LP: #481792, #466078).
    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.
  * Amend the XS-Python-Version line to ">= 2.4" rather than explicit
    versions (only building for 2.6 in Lucid since that is the onl Python in
    Lucid).

subversion (1.6.6dfsg-2) unstable; urgency=low

  * Update svn-bisect (Closes: #535234), fix bugs, add features,
    and write a manpage. Also mention it in the subversion-tools
    Description. (Closes: #535187)
  * Move from db4.7 to db4.8, tracking apr-util. (Closes: #557457)
  * Move the example XSL and CSS files for mod_dav_svn to
    /usr/share/doc/libapache2-svn/examples/. (Closes: #553535)
  * patches/ruby-test-info: New patch to maybe address a FTBFS. (#545372)
    Thanks Michael Diers, Joe Swatosh and Stefan Sperling. I expect that
    this is not the only fix needed, but we shall see.
  * patches/16x-po: New patch: a couple translation updates from 1.6.7.
  * libsvn-java: depend on ${shlibs:Depends}, thanks Lintian.
  * python-subversion: Update an outdated Lintian override.
  * libsvn1: Add a handful of Lintian overrides.

subversion (1.6.6dfsg-1) unstable; urgency=low

  * New upstream release.
    - Reintroduce svn_load_dirs.pl: Dolby has agreed to an explicit free
      software license. Thanks Blair Zajac for following up on this.
    - patches/ruby-test-core: New patch from upstream to fix a new failure
      in the ruby testsuite.
  * Standards-Version 3.8.3 (no changes).
  * control: Some housecleaning: remove some Conflicts/Replaces/Provides
    that haven't been needed since etch.
  * patches/build-fixes: add a small fix for parallel builds.
    (Closes: #531369, #543110)
  * patches/svn2cl-upstream: New patch to fix the XSL to better comply
    with XML standards. (Closes: #546990)
  * Enable kwallet support. (Closes: #539564)
    - patches/kwallet-wid: New patch based very loosely on upstream work, to
      let the kwallet library know your terminal's Window ID, if available.
    - patches/apr-abi, patches/rpath: Fix the LINK_CXX target, now that
      we're finally using it.
  * Set dependency_libs='' in all .la files (Closes: #544877), as per:
    http://lists.debian.org/debian-devel/2009/08/msg00783.html
 -- Max Bowsher <email address hidden> Fri, 11 Dec 2009 23:48:13 +0000