lp://staging/~mdiers/ubuntu/natty/subversion/ppa-proposed

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~svn/ubuntu/natty/subversion/ppa at revision 54

Max Bowsher (community): Approve on 2011-03-22

Diff: 2645 lines (+603/-244)

44 files modified

CHANGES (+54/-0)
Makefile.in (+7/-1)
README.Debian-tarball (+2/-2)
configure (+11/-11)
debian/changelog (+58/-30)
debian/patches/build-fixes (+12/-21)
debian/patches/change-range (+88/-0)
debian/patches/loosen-sqlite-version-check (+18/-0)
debian/patches/series (+2/-0)
debian/rules (+3/-8)
debian/subversion.install (+2/-2)
debian/tools/Makefile (+0/-21)
debian/tools/README (+0/-5)
debian/tools/svn-make-config.c (+0/-60)
subversion/bindings/javahl/native/Outputer.cpp (+4/-0)
subversion/bindings/swig/perl/native/Makefile.PL.in (+1/-1)
subversion/bindings/swig/perl/native/core.c (+4/-4)
subversion/bindings/swig/python/core.c (+4/-4)
subversion/bindings/swig/ruby/core.c (+4/-4)
subversion/bindings/swig/ruby/test/util.rb (+3/-0)
subversion/include/svn_version.h (+3/-3)
subversion/libsvn_client/merge.c (+13/-5)
subversion/libsvn_fs/fs-loader.c (+1/-0)
subversion/libsvn_fs_fs/fs_fs.c (+8/-2)
subversion/libsvn_ra_neon/mergeinfo.c (+3/-1)
subversion/libsvn_ra_neon/options.c (+21/-5)
subversion/libsvn_ra_serf/mergeinfo.c (+3/-1)
subversion/libsvn_ra_serf/serf.c (+20/-4)
subversion/libsvn_ra_serf/update.c (+3/-1)
subversion/libsvn_repos/fs-wrap.c (+2/-0)
subversion/libsvn_repos/log.c (+15/-5)
subversion/libsvn_repos/rev_hunt.c (+3/-2)
subversion/libsvn_subr/error.c (+14/-1)
subversion/libsvn_wc/props.c (+22/-14)
subversion/mod_dav_svn/repos.c (+21/-3)
subversion/mod_dav_svn/version.c (+3/-1)
subversion/po/zh_CN.po (+18/-18)
subversion/tests/libsvn_fs/fs-test.c (+64/-4)
subversion/tests/libsvn_fs/locks-test.c (+22/-0)
subversion/tests/libsvn_fs_base/changes-test.c (+4/-0)
subversion/tests/libsvn_fs_base/fs-base-test.c (+12/-0)
subversion/tests/libsvn_fs_fs/fs-pack-test.c (+3/-0)
subversion/tests/libsvn_repos/repos-test.c (+37/-0)
subversion/tests/svn_test.h (+11/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

55. By Michael Diers on 2011-03-22

Merge Debian (1.6.16dfsg-1).

54. By Michael Diers on 2011-03-17

Merge Ubuntu natty (1.6.12dfsg-4ubuntu1).
Note that the patch for CVE-2010-4539 is included in 1.6.15, so
what remains is the patch for the SQLite version check.

53. By Max Bowsher on 2011-01-05

Discard packaging patches which were backports from 1.6.15.

52. By Max Bowsher on 2011-01-05

Merge new upstream 1.6.15.

51. By Max Bowsher on 2011-01-05

Merge Debian (1.6.12dfsg-3).

50. By Max Bowsher on 2011-01-05

Discard PPA changelog entries, as there are no remaining changes vs. Ubuntu.

49. By Max Bowsher on 2011-01-05

Merge Ubuntu natty (1.6.12dfsg-2ubuntu3).

48. By Max Bowsher on 2010-07-01

* Merge from debian testing, 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 only Python
    in Lucid).
* Urgency medium, as it (probably) fixes some FTBFS.
* New upstream version.
  - Fixes some or all cases of inappropriate need for read access to the
    root of the repository. (Closes: #510883)
* Disable parallel mode for 'make check', which appears to have made
  some build daemons sad.
* svn-bisect: use pegs to support bisecting in deleted branches.
  Thanks Nikita Borodikhin. (Closes: #582344)
* patches/ruby-test-info: expand for more failures nobody can figure
  out. Sigh.
* Upgrade from source format 1.0 to 1.0.
* New upstream version. Rediff a patch or two.
  - Mergeinfo queries no longer require access to repository root.
    (Ref: #510883)
  - Ignores errors reading .svn/ in parent directories. (Closes: #570271)
* rules: Run 'check' target in parallel mode.

47. By Michael Diers on 2010-06-30

Fix changelog entry. Rebuild to allow for KWallet config fixes in karmic, jaunty, and hardy.

46. By Michael Diers on 2010-05-12

subversion (1.6.9dfsg-1ubuntu0svn2) lucid; urgency=low

Force a rebuild on Launchpad, previous attempt went perfectly wrong.