--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.install
+++ subversion-1.6.17dfsg/debian/libapache2-svn.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/apache2/modules/*.so		usr/lib/apache2/modules
+debian/dav_svn.conf                             etc/apache2/mods-available
+debian/dav_svn.load                             etc/apache2/mods-available
+debian/authz_svn.load                           etc/apache2/mods-available
--- subversion-1.6.17dfsg.orig/debian/copyright
+++ subversion-1.6.17dfsg/debian/copyright
@@ -0,0 +1,446 @@
+This package was put together by David Kimdon <dwhedon@debian.org>.
+Current maintainers are Peter Samuelson <peter@p12n.org>, Troy Heber
+<troyh@debian.org> and Guilherme de S. Pastore <gpastore@debian.org>.
+
+Source was downloaded from:
+http://subversion.tigris.org/downloads/subversion-1.4.2.tar.gz
+
+Several files from the "contrib" directory were removed as the
+copyright/license situation is not quite clear.
+
+Subversion is covered by the following license:
+
+This license applies to all portions of Subversion which are not
+externally-maintained libraries (e.g. apr/, apr-util/, and neon/).
+Such libraries have their own licenses; we recommend you read them, as
+their terms may differ from the terms below.
+
+   * Debian note: This Debian package does not include those
+     "externally-maintained libraries".
+
+This is version 1 of this license.  It is also available online at
+http://subversion.tigris.org/license-1.html.  If newer versions of
+this license are posted there (the same URL, but with the version
+number incremented: .../license-2.html, .../license-3.html, and so
+on), you may use a newer version instead, at your option.
+
+====================================================================
+Copyright (c) 2000-2004 CollabNet.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if
+any, must include the following acknowledgment: "This product includes
+software developed by CollabNet (http://www.Collab.Net/)."
+Alternately, this acknowledgment may appear in the software itself, if
+and wherever such third-party acknowledgments normally appear.
+
+4. The hosted project names must not be used to endorse or promote
+products derived from this software without prior written
+permission. For written permission, please contact info@collab.net.
+
+5. Products derived from this software may not use the "Tigris" name
+nor may "Tigris" appear in their names without prior written
+permission of CollabNet.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL COLLABNET OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================
+
+This software consists of voluntary contributions made by many
+individuals on behalf of CollabNet.
+
+Subversion also ships several scripts in the "contrib" directory which
+are under other licenses:
+
+Many files are licensed under the same terms as above:
+server-side/svnmirror-test.sh, server-side/svnmirror.sh,
+client-side/mucc.c, client-side/mucc-test.sh, client-side/wcgrep:
+
+  Copyright 2005 Philip Martin <philip@codematters.co.uk>
+  Copyright 2004 Ben Reser <ben@reser.org>
+
+Several files are licensed under other terms:
+
+client-side/asvn, client-side/psvn/psvn.el, client-side/svn-clean,
+client-side/svn_apply_autoprops.py,
+client-side/svn_export_empty_files.py, client-side/svncopy.pl.in,
+client-side/svnmerge.py, client-side/svnmerge_test.py,
+client-side/testsvncopy.pl.in, client-side/vc-svn.el:
+
+  Copyright (C) 2003-2004 Ross Mark
+  Copyright (C) 2002-2006 by Stefan Reichoer
+  Copyright (C) 2004, 2005, 2006 Simon Perreault
+  Copyright (C) 2005,2006 Blair Zajac <blair@orcaware.com>
+  Copyright (c) 2005 Sony Pictures Imageworks Inc.
+  Copyright (c) 2005, Giovanni Bajo
+  Copyright (c) 2004-2005, Awarix, Inc.
+  Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301 USA.
+
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+  WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  On Debian systems the GNU GPL v2 can be found in
+  /usr/share/common-licenses/GPL-2.
+
+contrib/client-side/svn-bisect:
+
+  Copyright (C) 2008  Robert Millan
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  On Debian systems the GNU GPL v3 can be found in
+  /usr/share/common-licenses/GPL-3.
+
+contrib/client-side/svn-viewdiff, contrib/client-side/svn-resolve,
+contrib/hook-scripts/enforcer:
+
+  Copyright (c) 2002,2005 Wilfredo Sanchez Vega <wsanchez@wsanchez.net>.
+  All rights reserved.
+
+  Permission to use, copy, modify, and distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL
+  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+  AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+contrib/client-side/svnmerge.sh:
+
+  Copyright (c) 2004-2005, Awarix, Inc.
+  All rights reserved.
+
+  Subject to the following obligations and disclaimer of warranty,
+  use and redistribution of this software, in source or object code
+  forms, with or without modifications are expressly permitted by
+  Awarix; provided, however, that:
+
+     (i)  Any and all reproductions of the source or object code
+          must include the copyright notice above and the following
+          disclaimer of warranties; and
+     (ii) No rights are granted, in any manner or form, to use
+          Awarix trademarks, including the mark "AWARIX"
+          on advertising, endorsements, or otherwise except as such
+          appears in the above copyright notice or in the software.
+
+  THIS SOFTWARE IS BEING PROVIDED BY AWARIX "AS IS", AND
+  TO THE MAXIMUM EXTENT PERMITTED BY LAW, AWARIX MAKES NO
+  REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING
+  THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED
+  WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+  OR NON-INFRINGEMENT.  AWARIX DOES NOT WARRANT, GUARANTEE,
+  OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS
+  OF THE USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY,
+  RELIABILITY OR OTHERWISE.  IN NO EVENT SHALL AWARIX BE
+  LIABLE FOR ANY DAMAGES RESULTING FROM OR ARISING OUT OF ANY USE
+  OF THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY DIRECT,
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE, OR CONSEQUENTIAL
+  DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF
+  USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+  THE USE OF THIS SOFTWARE, EVEN IF AWARIX IS ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+
+client-side/svn2cl:
+
+  Copyright (C) 2004, 2005, 2006 Arthur de Jong.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+  3. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior
+     written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+  IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+server-side/authz_svn_group.py:
+
+  Copyright 2005 Branko Cibej <brane@xbc.nu>
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  On Debian systems the Apache License can be found in
+  /usr/share/common-licenses/Apache-2.0.
+
+client-side/svn_load_dirs/*:
+
+  Copyright (c) 2002,2003,2004,2005,2006,2007,2009 Dolby.  All rights reserved.
+
+  Licensed under the Academic Free License version 3.0, as found at
+  http://www.opensource.org/licenses/academic.php:
+
+  Academic Free License ("AFL") v. 3.0
+
+  This Academic Free License (the "License") applies to any original
+  work of authorship (the "Original Work") whose owner (the "Licensor")
+  has placed the following licensing notice adjacent to the copyright
+  notice for the Original Work:
+
+      Licensed under the Academic Free License version 3.0
+
+   1) Grant of Copyright License. Licensor grants You a worldwide,
+      royalty-free, non-exclusive, sublicensable license, for the
+      duration of the copyright, to do the following:
+      a) to reproduce the Original Work in copies, either alone or as
+         part of a collective work;
+      b) to translate, adapt, alter, transform, modify, or arrange the
+         Original Work, thereby creating derivative works ("Derivative
+         Works") based upon the Original Work;
+      c) to distribute or communicate copies of the Original Work and
+         Derivative Works to the public, under any license of your
+         choice that does not contradict the terms and conditions,
+         including Licensor's reserved rights and remedies, in this
+         Academic Free License;
+      d) to perform the Original Work publicly; and
+      e) to display the Original Work publicly.
+
+   2) Grant of Patent License. Licensor grants You a worldwide,
+      royalty-free, non- exclusive, sublicensable license, under patent
+      claims owned or controlled by the Licensor that are embodied in
+      the Original Work as furnished by the Licensor, for the duration
+      of the patents, to make, use, sell, offer for sale, have made, and
+      import the Original Work and Derivative Works.
+
+   3) Grant of Source Code License. The term "Source Code" means the
+      preferred form of the Original Work for making modifications to it
+      and all available documentation describing how to modify the
+      Original Work. Licensor agrees to provide a machine-readable copy
+      of the Source Code of the Original Work along with each copy of
+      the Original Work that Licensor distributes. Licensor reserves the
+      right to satisfy this obligation by placing a machine-readable
+      copy of the Source Code in an information repository reasonably
+      calculated to permit inexpensive and convenient access by You for
+      as long as Licensor continues to distribute the Original Work.
+
+   4) Exclusions From License Grant. Neither the names of Licensor, nor
+      the names of any contributors to the Original Work, nor any of
+      their trademarks or service marks, may be used to endorse or
+      promote products derived from this Original Work without express
+      prior permission of the Licensor. Except as expressly stated
+      herein, nothing in this License grants any license to Licensor's
+      trademarks, copyrights, patents, trade secrets or any other
+      intellectual property. No patent license is granted to make, use,
+      sell, offer for sale, have made, or import embodiments of any
+      patent claims other than the licensed claims defined in Section
+      2. No license is granted to the trademarks of Licensor even if
+      such marks are included in the Original Work. Nothing in this
+      License shall be interpreted to prohibit Licensor from licensing
+      under terms different from this License any Original Work that
+      Licensor otherwise would have a right to license.
+
+   5) External Deployment. The term "External Deployment" means the use,
+      distribution, or communication of the Original Work or Derivative
+      Works in any way such that the Original Work or Derivative Works
+      may be used by anyone other than You, whether those works are
+      distributed or communicated to those persons or made available as
+      an application intended for use over a network. As an express
+      condition for the grants of license hereunder, You must treat any
+      External Deployment by You of the Original Work or a Derivative
+      Work as a distribution under section 1(c).
+
+   6) Attribution Rights. You must retain, in the Source Code of any
+      Derivative Works that You create, all copyright, patent, or
+      trademark notices from the Source Code of the Original Work, as
+      well as any notices of licensing and any descriptive text
+      identified therein as an "Attribution Notice." You must cause the
+      Source Code for any Derivative Works that You create to carry a
+      prominent Attribution Notice reasonably calculated to inform
+      recipients that You have modified the Original Work.
+
+   7) Warranty of Provenance and Disclaimer of Warranty. Licensor
+      warrants that the copyright in and to the Original Work and the
+      patent rights granted herein by Licensor are owned by the Licensor
+      or are sublicensed to You under the terms of this License with the
+      permission of the contributor(s) of those copyrights and patent
+      rights. Except as expressly stated in the immediately preceding
+      sentence, the Original Work is provided under this License on an
+      "AS IS" BASIS and WITHOUT WARRANTY, either express or implied,
+      including, without limitation, the warranties of non-infringement,
+      merchantability or fitness for a particular purpose. THE ENTIRE
+      RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.  This
+      DISCLAIMER OF WARRANTY constitutes an essential part of this
+      License. No license to the Original Work is granted by this
+      License except under this disclaimer.
+
+   8) Limitation of Liability. Under no circumstances and under no legal
+      theory, whether in tort (including negligence), contract, or
+      otherwise, shall the Licensor be liable to anyone for any
+      indirect, special, incidental, or consequential damages of any
+      character arising as a result of this License or the use of the
+      Original Work including, without limitation, damages for loss of
+      goodwill, work stoppage, computer failure or malfunction, or any
+      and all other commercial damages or losses. This limitation of
+      liability shall not apply to the extent applicable law prohibits
+      such limitation.
+
+   9) Acceptance and Termination. If, at any time, You expressly
+      assented to this License, that assent indicates your clear and
+      irrevocable acceptance of this License and all of its terms and
+      conditions. If You distribute or communicate copies of the
+      Original Work or a Derivative Work, You must make a reasonable
+      effort under the circumstances to obtain the express assent of
+      recipients to the terms of this License. This License conditions
+      your rights to undertake the activities listed in Section 1,
+      including your right to create Derivative Works based upon the
+      Original Work, and doing so without honoring these terms and
+      conditions is prohibited by copyright law and international
+      treaty. Nothing in this License is intended to affect copyright
+      exceptions and limitations (including "fair use" or "fair
+      dealing"). This License shall terminate immediately and You may no
+      longer exercise any of the rights granted to You by this License
+      upon your failure to honor the conditions in Section 1(c).
+
+  10) Termination for Patent Action. This License shall terminate
+      automatically and You may no longer exercise any of the rights
+      granted to You by this License as of the date You commence an
+      action, including a cross-claim or counterclaim, against Licensor
+      or any licensee alleging that the Original Work infringes a
+      patent. This termination provision shall not apply for an action
+      alleging patent infringement by combinations of the Original Work
+      with other software or hardware.
+
+  11) Jurisdiction, Venue and Governing Law. Any action or suit relating
+      to this License may be brought only in the courts of a
+      jurisdiction wherein the Licensor resides or in which Licensor
+      conducts its primary business, and under the laws of that
+      jurisdiction excluding its conflict-of-law provisions. The
+      application of the United Nations Convention on Contracts for the
+      International Sale of Goods is expressly excluded. Any use of the
+      Original Work outside the scope of this License or after its
+      termination shall be subject to the requirements and penalties of
+      copyright or patent law in the appropriate jurisdiction. This
+      section shall survive the termination of this License.
+
+  12) Attorneys' Fees. In any action to enforce the terms of this
+      License or seeking damages relating thereto, the prevailing party
+      shall be entitled to recover its costs and expenses, including,
+      without limitation, reasonable attorneys' fees and costs incurred
+      in connection with such action, including any appeal of such
+      action. This section shall survive the termination of this
+      License.
+
+  13) Miscellaneous. If any provision of this License is held to be
+      unenforceable, such provision shall be reformed only to the extent
+      necessary to make it enforceable.
+
+  14) Definition of "You" in This License. "You" throughout this
+      License, whether in upper or lower case, means an individual or a
+      legal entity exercising rights under, and complying with all of
+      the terms of, this License. For legal entities, "You" includes any
+      entity that controls, is controlled by, or is under common control
+      with you. For purposes of this definition, "control" means (i) the
+      power, direct or indirect, to cause the direction or management of
+      such entity, whether by contract or otherwise, or (ii) ownership
+      of fifty percent (50%) or more of the outstanding shares, or (iii)
+      beneficial ownership of such entity.
+
+  15) Right to Use. You may use the Original Work in all ways not
+      otherwise restricted or conditioned by this License or by law, and
+      Licensor promises not to interfere with or be responsible for such
+      uses by You.
+
+  16) Modification of This License. This License is Copyright © 2005
+      Lawrence Rosen. Permission is granted to copy, distribute, or
+      communicate this License without modification. Nothing in this
+      License permits You to modify this License as applied to the
+      Original Work or to Derivative Works. However, You may modify the
+      text of this License and copy, distribute or communicate your
+      modified version (the "Modified License") and apply it to other
+      original works of authorship subject to the following conditions:
+      (i) You may not indicate in any way that your Modified License is
+      the "Academic Free License" or "AFL" and you may not use those
+      names in the name of your Modified License; (ii) You must replace
+      the notice specified in the first paragraph above with the notice
+      "Licensed under <insert your license name here>" or with a notice
+      of your own that is not confusingly similar to the notice in this
+      License; and (iii) You may not claim that your original works are
+      open source software unless your Modified License has been
+      approved by Open Source Initiative (OSI) and You comply with its
+      license review and certification process.
--- subversion-1.6.17dfsg.orig/debian/subversion-tools.manpages
+++ subversion-1.6.17dfsg/debian/subversion-tools.manpages
@@ -0,0 +1,8 @@
+debian/man/svnwrap.1
+debian/man/svn-hot-backup.1
+debian/man/svn-fast-backup.1
+debian/man/svn-backup-dumps.1
+debian/man/svn_load_dirs.1
+debian/man/svn-bisect.1
+contrib/client-side/svn2cl/svn2cl.1
+BUILD/contrib/client-side/svn-clean.1
--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.lintian-overrides
+++ subversion-1.6.17dfsg/debian/libapache2-svn.lintian-overrides
@@ -0,0 +1,2 @@
+# this is config documentation, not "how to build the package"
+libapache2-svn: package-contains-upstream-install-documentation usr/share/doc/libapache2-svn/INSTALL.authz.gz
--- subversion-1.6.17dfsg.orig/debian/README.source
+++ subversion-1.6.17dfsg/debian/README.source
@@ -0,0 +1,4 @@
+This Debian package uses quilt(1) for patch management.
+Please see /usr/share/doc/quilt/README.source for more information.
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 18 Jun 2008 21:45:55 -0500
--- subversion-1.6.17dfsg.orig/debian/libsvn-ruby1.8.install
+++ subversion-1.6.17dfsg/debian/libsvn-ruby1.8.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/libsvn_swig_ruby*.so.*
+debian/tmp/usr/lib/ruby
--- subversion-1.6.17dfsg.orig/debian/subversion-tools.lintian-overrides
+++ subversion-1.6.17dfsg/debian/subversion-tools.lintian-overrides
@@ -0,0 +1,4 @@
+# the ruby script isn't really needed, it's more of an example file
+ruby-script-but-no-ruby-dep usr/share/subversion/hook-scripts/commit-email.rb
+# Python dependency is implied by python-subversion dependency
+python-script-but-no-python-dep
--- subversion-1.6.17dfsg.orig/debian/svn_1.5_releasenotes.html
+++ subversion-1.6.17dfsg/debian/svn_1.5_releasenotes.html
@@ -0,0 +1,1511 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<style type="text/css"> /* <![CDATA[ */
+  @import "branding/css/tigris.css";
+  @import "branding/css/inst.css";
+  /* ]]> */</style>
+<link rel="stylesheet" type="text/css" media="print"
+  href="branding/css/print.css"/>
+<script type="text/javascript" src="branding/scripts/tigris.js"></script>
+<title>Subversion 1.5 Release Notes</title>
+</head>
+
+<body>
+<div class="app">
+
+<h1 style="text-align: center">Subversion 1.5 Release Notes</h1>
+
+<div class="h2" id="news" title="news">
+<h2>What's New in Subversion 1.5</h2>
+
+<ul>
+  <li><a href="#merge-tracking"
+      >Merge tracking (foundational)</a></li>
+  <li><a href="#sparse-checkouts"
+      >Sparse checkouts (via new <tt>--depth</tt> option)</a></li>
+  <li><a href="#interactive-conflict-resolution"
+      >Interactive conflict resolution</a></li>
+  <li><a href="#changelists"
+      >Changelist support</a></li>
+  <li><a href="#externals"
+      >Relative URLs, peg revisions in <tt>svn:externals</tt></a></li>
+  <li><a href="#cyrus-sasl"
+      >Cyrus SASL support for ra_svn and <tt>svnserve</tt></a></li>
+  <li><a href="#fsfs-sharding"
+      >Improved support for large deployments on FSFS, via sharding</a></li>
+  <li><a href="#fsfs-isolate-immutable"
+      >Improved FSFS optimizability, via immutable file isolation</a></li>
+  <li><a href="#webdav-proxy"
+      >WebDAV transparent write-through proxy</a></li>
+  <li><a href="#copy-move-improvements"
+      >Improvements to <tt>copy</tt> and <tt>move</tt></a></li>
+  <li><a href="#cancellation-improvements"
+      >Speed improvements, cancellation response improvements</a></li>
+  <li><a href="#dav-modules"
+      >Easier to try experimental <tt>ra_serf</tt> DAV access module</a></li>
+  <li><a href="#apis"
+      >API changes, improvements, and much language bindings work</a></li>
+  <li><a href="#bug-fixes"
+      >More than 150 new bug fixes, enhancements</a></li>
+</ul>
+
+<p>Subversion 1.5 is a superset of all previous Subversion releases,
+and is considered the current "best" release.  Any feature or bugfix
+in 1.0.x through 1.4.x is also in 1.5, but 1.5 contains features and
+bugfixes not present in any earlier release.  The new features will
+eventually be documented in a 1.5 version of the free Subversion book,
+see <a href="http://svnbook.red-bean.com" >svnbook.red-bean.com</a>.</p>
+
+</div>  <!-- news -->
+
+<div class="h2" id="compatibility" title="compatibility">
+<h2>Compatibility Concerns</h2>
+
+<p>Older clients and servers interoperate transparently with 1.5
+servers and clients.  However, some of the new 1.5 features (e.g., <a
+href="#merge-tracking" >merge tracking</a>) may not be available
+unless both client and server are the latest version .  There are also
+cases (e.g., <a href="#sparse-checkouts">sparse checkouts</a>) where a
+new feature will work but will run less efficiently if the client is
+new and the server old.</p>
+
+<p>There is <strong>no need</strong> to dump and reload your
+repositories.  Subversion 1.5 can read repositories created by earlier
+versions.  To upgrade an existing installation, just install the
+newest libraries and binaries on top of the older ones.</p>
+
+<p>Subversion 1.5 maintains API/ABI compatibility with earlier
+releases, by only adding new functions, never removing old ones.  A
+program written to the 1.0, 1.1, 1.2, 1.3, or 1.4 API can both compile
+and run using 1.5 libraries.  However, a program written for 1.5
+cannot necessarily compile or run against older libraries.</p>
+
+<div class="h3" id="new-feature-compatibility-table"
+             title="new-feature-compatibility-table">
+<h3>New Feature Compatibility Table</h3>
+<table border="1">
+  <tr>
+    <th>New Feature</th>
+    <th>Minimum Client</th>
+    <th>Minimum Server</th>
+    <th>Minimum Repository</th>
+    <th>Notes</th></tr>
+  <tr>
+    <td><a href="#merge-tracking">Merge tracking</a></td>
+    <td>1.5</td>
+    <td>1.5</td>
+    <td>1.5</td>
+    <td></td></tr>
+  <tr>
+    <td><a href="#sparse-checkouts">Sparse checkouts</a></td>
+    <td>1.5</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td><a href="#interactive-conflict-resolution">Interactive conflict resolution</a></td>
+    <td>1.5</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td><a href="#changelists">Changelist support</a></td>
+    <td>1.5</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td><a href="#externals">Relative URLs, peg revisions in <tt>svn:externals</tt></a></td>
+    <td>1.5</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td><a href="#cyrus-sasl"> Cyrus SASL support for ra_svn and <tt>svnserve</tt></a></td>
+    <td>any<sup>*</sup>, 1.5</td>
+    <td>any<sup>*</sup>, 1.5</td>
+    <td>any</td>
+    <td><sup>*</sup>Limited, see <a href="#sasl-compatibility">SASL&nbsp;and&nbsp;<code>svn://</code>&nbsp;compatibility</a></td></tr>
+  <tr>
+    <td><a href="#fsfs-sharding"> Improved support for large deployments on FSFS, via sharding</a></td>
+    <td>any<sup>*</sup>, 1.5</td>
+    <td>1.5</td>
+    <td>1.5</td>
+    <td><sup>*</sup>1.5 required for <code>file://</code> compatibility</td></tr>
+  <tr>
+    <td><a href="#fsfs-isolate-immutable">Improved FSFS optimizability, via immutable file isolation</a></td>
+    <td>any<sup>*</sup>, 1.5</td>
+    <td>1.5</td>
+    <td>1.5</td>
+    <td><sup>*</sup>1.5 required for <code>file://</code> compatibility</td></tr>
+  <tr>
+    <td><a href="#webdav-proxy">WebDAV transparent write-through proxy</a></td>
+    <td>any</td>
+    <td>1.5<sup>*</sup></td>
+    <td>any</td>
+    <td><sup>*</sup>Apache 2.2 server also required</td></tr>
+  <tr>
+    <td><a href="#copy-move-improvements">Improvements to <tt>copy</tt> and <tt>move</tt></a></td>
+    <td>1.5</td>
+    <td>any<sup>*</sup>, 1.5</td>
+    <td>any</td>
+    <td><sup>*</sup>Limited, see <a href="#copy-move-improvements">Copy/move<tt>-</tt>related&nbsp;improvements</a></td></tr>
+  <tr>
+    <td><a href="#cancellation-improvements">Speed improvements, cancellation response improvements</a></td>
+    <td>1.5</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td><a href="#dav-modules">Easier to try experimental <tt>ra_serf</tt> DAV access module</a></td>
+    <td>1.5</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+</table>
+
+</div>  <!-- new-feature-compatibility-table -->
+
+<div class="h3" id="wc-and-repos-format-change"
+             title="wc-and-repos-format-change">
+<h3>Working Copy and Repository Format Changes</h3>
+
+<p>The working copy format has been upgraded.  This means that 1.4 and
+older Subversion clients will <em>not</em> be able to work with
+working copies produced by Subversion 1.5.  Working copies are <a
+href="#wc-upgrades" >upgraded automatically</a>.</p>
+
+<p>Similarly, the repository format has changed, meaning that 1.4 and
+older versions of Subversion tools that normally access a repository
+directly (e.g. <tt>svnserve</tt>, <tt>mod_dav_svn</tt>,
+<tt>svnadmin</tt>) won't be able to read a repository created by
+Subversion 1.5.  But, repositories are <a href="#repos-upgrades"
+><strong>not</strong> upgraded automatically</a>.</p>
+
+<div class="h4" id="wc-upgrades" title="wc-upgrades">
+<h4>Working Copy Upgrades</h4>
+
+<p><strong>WARNING:</strong> if a Subversion 1.5 client encounters a
+pre-1.5 working copy, it will <em>automatically</em> upgrade the
+working copy format as soon as it touches it, making it unreadable by
+older Subversion clients.  If you are using several versions of
+Subversion on your machine, be careful about which version you use in
+which working copy, to avoid accidentally upgrading a working copy.
+(But note that this "auto upgrade" behavior does <em>not</em> occur
+with the <a href="#repos-upgrades" >repositories</a>, only working
+copies.)</p>
+
+<p>If you accidentally upgrade a 1.4 working copy to 1.5, and wish to
+downgrade back to 1.4, use the <a
+href="http://svn.collab.net/repos/svn/trunk/tools/client-side/change-svn-wc-format.py"
+><tt>change-svn-wc-format.py</tt></a> script.  See <a
+href="http://subversion.tigris.org/faq.html#working-copy-format-change"
+>this FAQ entry</a> for details, and run the script with the
+<code>--help</code> option for usage instructions.</p>
+
+</div>  <!-- wc-upgrades -->
+
+<div class="h4" id="repos-upgrades" title="repos-upgrades">
+<h4>Repository Upgrades</h4>
+
+<p>The Subversion 1.5 server works with 1.4 and older repositories,
+and it will <em>not</em> upgrade such repositories to 1.5 unless
+specifically requested to via the
+<strong><code>svnadmin&nbsp;upgrade</code></strong> command.  This means
+that some of the new 1.5 features will not become available simply by
+upgrading your server: you will also have to upgrade your
+repositories.  (We decided not to auto-upgrade repositories because we
+didn't want 1.5 to silently make repositories unusable by
+1.4&nbsp;&mdash;&nbsp;that step should be a conscious decision on the
+part of the repository admin.)</p>
+
+<p>After running <strong><code>svnadmin&nbsp;upgrade</code></strong>,
+you may wish to also run the <a
+href="http://svn.collab.net/repos/svn/trunk/tools/server-side/svn-populate-node-origins-index.c"
+>svn-populate-node-origins-index</a> program on the repository.
+Subversion 1.5 maintains a node-origins index for each repository, and
+builds the index lazily as the information is needed.  But for old
+repositories with lots of revisions, it's better to create the index
+in one step, using the aforementioned tool, than to have live queries
+be slower until the index has built itself.  See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=3024" >issue
+#3024</a> for details.</p>
+
+</div>  <!-- repos-upgrades -->
+
+</div>  <!-- wc-and-repos-format-change -->
+
+<div class="h3" id="output-changes" title="output-changes">
+<h3>Command Line Output Changes</h3>
+
+<p>Although we try hard to keep output from the command line programs
+compatible between releases, new information sometimes has to be
+added.  This can break scripts that rely on the exact format of the
+output.  Unfortunately, we are not able to enumerate all of the output
+changes in 1.5, but one of them is that conflict markers in files now
+match the file's defined eol-style.</p>
+
+</div>  <!-- output-changes -->
+
+<div class="h3" id="sasl-compatibility" title="sasl-compatibility">
+<h3>SASL and <code>svn://</code> compatibility</h3>
+
+<p>All 1.x clients, with or without Cyrus SASL support, will be able to
+authenticate against all 1.x servers that do not have Cyrus SASL enabled.
+Note that the <tt>CRAM-MD5</tt> and <tt>ANONYMOUS</tt> mechanisms are
+built into Subversion, so you'll be able to use them even if the
+corresponding Cyrus SASL plugins are missing.</p>
+  
+<p>1.x clients without Cyrus SASL support will be able to authenticate
+against 1.5+ servers with SASL enabled, provided the server allows the
+<tt>CRAM-MD5</tt> and/or <tt>ANONYMOUS</tt> mechanisms.</p>
+  
+<p>1.5+ clients with Cyrus SASL support will be able to authenticate against
+1.5+ servers with SASL enabled, provided at least one of the mechanisms
+supported by the server is also supported by the client.</p>
+
+<p>See <a href="#cyrus-sasl" >this section</a> for more information on
+using Cyrus SASL with Subversion.</p>
+
+</div>  <!-- sasl-compatibility -->
+
+<div class="h3" id="revprops-compatibility" title="revprops-compatibility">
+<h3>Custom revprops may now need to be examined by <tt>pre-commit</tt>
+  hooks</h3>
+
+<p>Each revision in Subversion has a set of <q>revision properties</q>
+associated with it; in addition to the standard log message, author,
+and date, arbitrary user-defined properties can be set.  These
+properties are not themselves versioned, so there is no way to revert
+changes to them.  Because of this, you cannot modify revprops on a
+committed revision without setting up a <tt>pre-revprop-change</tt>
+hook on the server.  Before Subversion 1.5, only the three standard
+revprops could be set at commit time; administrators using hooks to
+control the contents of the three standard revprops needed to check
+during <tt>pre-commit</tt> and <tt>pre-revprop-change</tt>, but for
+custom revprops, only <tt>pre-revprop-change</tt> appeared
+relevant.</p>
+
+<p>Subversion 1.5 adds
+a <a href="#commit-revprops"><tt>--with-revprop</tt> option to <tt>svn
+commit</tt></a> which allows users to specify revprops for revisions
+as they commit them.  Thus, in Subversion 1.5, it is possible for
+revproperties to be set on revisions without
+any <tt>pre-revprop-change</tt>.  The <tt>pre-commit</tt> hook can
+examine the transaction's revision properties before it is committed
+(just like many servers already use <tt>pre-commit</tt> to check for
+properly formatted log messages, e.g.).</p>
+
+<p>This means that if you previously relied
+on <tt>pre-revprop-change</tt> to control the ability to write to
+revprops (as opposed to just keeping track of their history), you may
+want to add similar controls to <tt>pre-commit</tt>.</p>
+
+</div>  <!-- revprops-compatibility -->
+
+
+</div>  <!-- compatibility -->
+
+<div class="h2" id="new-features" title="new-features">
+<h2>New Features</h2>
+
+<div class="h3" id="merge-tracking" title="merge-tracking">
+<h3>Merge tracking (foundational) (<em>client and server</em>)</h3>
+
+<p><em>Merge tracking</em> means Subversion keeps track of what
+changes have been merged where.  This reduces the overhead involved in
+maintaining branches, and gives users a way to inquire what changes
+are merged&nbsp;&mdash;&nbsp;or are available to be
+merged&nbsp;&mdash;&nbsp;on different lines of development.</p>
+
+<p>The merge tracking support in Subversion 1.5 is "foundational": its
+basic functionality is implemented, but there are still parts of our
+<a href="http://subversion.tigris.org/merge-tracking/" >original
+spec</a> that remain to be done, and merging is sometimes too slow.
+There will be merge tracking improvements in Subversion 1.5.1 and
+afterwards.  In the meantime:</p>
+
+<ul>
+<li><p>Take a look at <a href="#mt-known-issues"
+    >the list of known issues</a></p></li>
+<li><p>Read <a
+    href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword"
+    >"The Final Word on Merge Tracking"</a> in the Subversion Book</p></li> 
+<li><p>Read <a
+    href="http://www.collab.net/community/subversion/articles/merge-info.html"
+    >"Understanding the internals of Subversion's merge tracking feature"</a>
+    by Paul Burba</p></li>
+</ul>
+
+<div class="h4" id="mt-overview" title="mt-overview">
+<h4>Overview</h4>
+
+<p>Subversion's merge tracking is designed to:</p>
+
+<ul>
+<li>Reduce the bookkeeping overhead for branch maintenance</li>
+<li>Avoid common cases of the "repeated merge" problem</li>
+<li>Allow for cherry-picking of changes</li>
+</ul>
+
+<p>Each changeset is identified by its revision number, and merged
+changesets are recorded in the new
+<strong><code>svn:mergeinfo</code></strong> property (known colloquially
+as "mergeinfo") set on the destination of the merge.  Subversion keeps
+mergeinfo up-to-date automatically, but there is also a way to <a
+href="#mt-record-only" >record/unrecord merges manually</a>, since
+there will always be cases where a human knows something that
+Subversion doesn't.</p>
+
+</div>  <!-- mt-overview -->
+
+<div class="h4" id="mt-ui" title="mt-ui">
+<h4>User interface</h4>
+
+<p>Merging changes from (say) trunk to a branch no longer requires
+that you specify the revision range.  Instead, each time you want to
+sync up with trunk, you can just do:</p>
+
+<pre>   $ cd BRANCH_WORKING_COPY
+   $ svn merge URL_TO_TRUNK</pre>
+
+<p>Subversion will figure out what changes from URL_TO_TRUNK have not
+yet been merged and pull in just those changes.  When it's time to
+merge the branch back to trunk, do this:</p>
+
+<pre>   $ cd TRUNK_WORKING_COPY
+   $ svn merge --reintegrate URL_TO_BRANCH</pre>
+
+<p>Below is a more formal description of all the
+merge-tracking-related interface changes.</p>
+
+<p>The <strong><code>svn&nbsp;merge</code></strong> command takes two new
+options: <strong><code>--record-only</code></strong> and
+<strong><code>--reintegrate</code></strong>.</p>
+
+<div id="mt-record-only" title="mt-record-only">
+<p>The --record-only option works with -r and does exactly what you
+think it does: it marks a revision as merged (or unmerged, if using
+the "-" revision number negation syntax), without actually changing
+anything besides the mergeinfo.  For example, this would be useful
+when someone has hand-edited a file in such a way as to effectively
+incorporate a change that was already made somewhere else.  Rather
+than have the original change be ported over in the next
+synchronization merge, thus risking textual conflicts wherever the two
+versions trivially differ, you can just record the change as already
+merged.  (See <a
+href="http://subversion.tigris.org/merge-tracking/requirements.html#manual-merge"
+>the merge-tracking requirements</a>, and <a
+href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.blockchanges"
+>Blocking Changes</a> in the Subversion book, for more details.)</p>
+</div>  <!-- mt-record-only -->
+
+<div id="mt-reintegrate" title="mt-reintegrate">
+<p>The --reintegrate option is used when merging a branch back to
+trunk; it checks for some common safeguard conditions and then does
+the merge in a fast and efficient way.  See <a
+href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync"
+>Keeping a branch in sync</a> in the Subversion book for more.</p>
+</div>  <!-- mt-reintegrate -->
+
+<p>The new <strong><code>svn&nbsp;mergeinfo</code></strong> command can
+show which changesets a directory has absorbed and which changesets
+it's still eligible to receive.  See <a
+href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.mergeinfo"
+>Mergeinfo and Previews</a> in the Subversion book for more information.</p>
+
+<p>The <strong><code>svn&nbsp;log</code></strong> and
+<strong><code>svn&nbsp;blame</code></strong> commands take a new
+<strong><code>-g</code></strong>
+(<strong><code>--use-merge-history</code></strong>) option, which tells
+them to take mergeinfo into account.  Without this option, they won't.</p>
+
+<p>The reason for the -g option is that it is sometimes useful to
+ignore merge history.  In blame output you sometimes want to see the
+person B who merged a change, though other times you want to see the
+person A who originally wrote the change that B later merged; use -g
+to get the latter information.  In log output, you sometimes want to
+see exactly the revisions that were committed on a given line of
+development, though other times you want to see, as part of the same
+output, the original changes that were later ported as merge
+revisions; again, -g includes the latter information (tagged with
+lines that say "<tt>Merged via: </tt>" followed by the revision number
+in which the merge took place).  See <a
+href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.logblame"
+>Merge-Sensitive Logs and Annotations</a> in the Subversion book for
+more details.</p>
+
+</div>  <!-- mt-ui -->
+
+<div class="h4" id="mt-compatibility" title="mt-compatibility">
+<h4>Merge tracking and compatibility</h4>
+
+<p>As described earlier, merge-tracking is not supported unless you <a
+href="#repos-upgrades" >upgrade the repository</a> as well as the
+server.</p>
+
+<p>If you were using the <a
+href="http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/"
+>svnmerge</a> wrapper program to do merging, and now want to switch to
+using Subversion 1.5's native merge-tracking, then you should use the
+<a
+href="http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py"
+>svnmerge-migrate-history.py</a> script to convert svnmerge's custom
+properties to the <tt>svn:mergeinfo</tt> properties that Subversion
+itself now uses.</p>
+
+</div>  <!-- mt-compatibility -->
+
+<div class="h4" id="mt-known-issues" title="mt-known-issues">
+<h4>Known Issues</h4>
+
+<p>There are still known issues with merge tracking in 1.5.0.  We're
+working on the most important ones first, which are:</p>
+
+<ul>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3128"
+    >issue #3128</a>: <code>merge --reintegrate</code> should handle
+    renames better</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=2897"
+    >issue #2897</a>: proper support for reflective merges</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3126"
+    >issue #3126</a>: better change-availability reporting
+    (<code>svn&nbsp;mergeinfo</code> shows too few or too many eligible
+    revisions)</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=2837"
+    >issue #2837</a>: allow merge tracking to be useful when performing
+    cyclic merging</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3056"
+    >issue #3056</a>: avoid repeat merge in an intelligent way</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=2898"
+    >issue #2898</a>: handle mergeinfo when deleting/adding children
+    you don't have access to</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3067"
+    >issue #3067</a>: subtrees that don't exist at the start or end of
+    a merge range shouldn't break the merge</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3157"
+    >issue #3157</a>: merging a change from a path's natural history
+    creates self-referential mergeinfo</li>
+<li><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3174"
+    >issue #3174</a>: merge algorithm chokes on subtrees needing
+    special attention that have been renamed</li>
+</ul>
+
+<p>(See also the <a
+href="http://subversion.tigris.org/issues/buglist.cgi?issue_status=UNCONFIRMED&amp;issue_status=NEW&amp;issue_status=STARTED&amp;issue_status=REOPENED&amp;keywords=merge-tracking&amp;keywords_type=anytokens"
+>list of merge-tracking-related open issues</a> and the <a
+href="http://subversion.tigris.org/issues/buglist.cgi?issue_status=UNCONFIRMED&amp;issue_status=NEW&amp;issue_status=STARTED&amp;issue_status=REOPENED&amp;short_desc=merg&amp;short_desc_type=substring"
+>list of all merge-related open issues</a>, though note that not all
+of merge-related issues are about merge-tracking and many predate it.)</p>
+
+<p><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3157"
+>Issue #3157</a> is particularly easy to run into, so here's a more
+detailed explanation of what the issue is and how to work around
+it:</p>
+
+<p>Merge tracking information currently can include the "natural
+history" of a path.  One situation where this happens is when creating
+a <tt>branch</tt> from <tt>trunk</tt> at a certain revision <tt>X</tt>
+and later merging all changes from <tt>branch</tt> back to
+<tt>trunk</tt>, without explicitly limiting the merge range and
+without using the <a href="#mt-reintegrate"
+><code>--reintegrate</code> option</a>.  Afterwards, the merge
+tracking information on <tt>trunk</tt> will list revisions before
+<tt>X</tt>.  This does no harm to future merge operations, but
+thereafter <code>svn log -g</code> on <tt>trunk</tt> will report these
+revisions from the "natural history", which is typically not expected.
+This is because <code>svn log -g</code> uses the merge tracking
+information from previous revisions (not only from HEAD).</p>
+
+<p>Note that this should not be a problem with release branches (also
+called "maintenance branches"), because one typically does not merge
+them back to trunk.  Instead, recommended practice is for new changes
+to enter on trunk and be ported outward to the branches that need the
+changes.  However, you could run into this problem with a feature
+branch, which would be merged back to trunk once, at the end of the
+branch's lifetime.</p>
+
+<p>One workaround is to correct the merge tracking information before
+committing the merged revision, by reverse merging the "natural
+history" information: <code>svn merge --record-only -rX:1</code>.
+Another solution is to avoid this situation entirely, by explicitly
+specifying merge ranges in the first place, e.g.: <tt>-rX:HEAD</tt>.
+See <a
+href="http://subversion.tigris.org/servlets/ReadMsg?listName=dev&amp;msgNo=139379"
+>this mail</a> for more information.</p>
+
+<p>When merging a feature branch, the best solution is to <a
+href="#mt-reintegrate" >use the <code>--reintegrate</code> option</a>;
+then this problem won't happen in the first place.</p>
+
+</div>  <!-- mt-known-issues -->
+
+<div class="h4" id="mt-further-reading" title="mt-further-reading">
+<h4>Further reading</h4>
+
+<p>For more on merge-tracking in Subversion 1.5, see:</p>
+
+<ul>
+<li><a href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html"
+    >Chapter 4: Branching and Merging</a> in the Subversion book
+</li>
+<li><a href="http://blog.red-bean.com/sussman/?p=92" >Subversion 1.5
+    merge-tracking in a nutshell</a> (blog post by Ben Collins-Sussman)
+</li>
+<li><a href="http://subversion.tigris.org/merge-tracking/" >The merge
+    tracking design documents</a>
+    (requirements, use cases, functional spec, design)
+</li>
+</ul>
+
+</div> <!-- mt-further-reading -->
+
+</div> <!-- merge-tracking -->
+
+<div class="h3" id="sparse-checkouts" title="sparse-checkouts">
+<h3>Sparse checkouts  (<em>client and server</em>)</h3>
+
+<p>Many users have very large trees of which they only want to
+checkout certain parts.  In previous versions of Subversion,
+<code>checkout -N</code> was not really up to this task.  Subversion
+1.5 introduces the <strong><code>--depth</code></strong> option to the
+<strong><code>checkout</code></strong>,
+<strong><code>switch</code></strong>, and
+<strong><code>update</code></strong> subcommands.  This option
+replaces <code>-N</code>, and allows users to construct working
+copies containing just what's needed, leaving out everything else.</p>
+
+<div class="h4" id="sc-depth" title="sc-depth">
+<h4>Depth overview</h4>
+<p>Each directory now understands the notion of <em>depth</em>, which has
+four possible values: <tt>empty</tt>, <tt>files</tt>, <tt>immediates</tt>,
+<tt>infinity</tt>.  The values are defined as follows:</p>
+
+<table border="1">
+<tr>
+  <td><tt>empty</tt></td>
+  <td>Updates will not pull in any files or subdirectories not already
+    present.</td>
+</tr>
+<tr>
+  <td><tt>files</tt></td>
+  <td>Updates will pull in any files not already present, but not
+    subdirectories.</td>
+</tr>
+<tr>
+  <td><tt>immediates</tt></td>
+  <td>Updates will pull in any files or subdirectories not already present;
+    the new subdirectories will have depth-empty.</td>
+</tr>
+<tr>
+  <td><tt>infinity</tt></td>
+  <td>Updates will pull in any files or subdirectories not already present;
+    the new subdirectories will have depth-infinity.  Equivalent to today's
+    default update behavior.</td>
+</tr>
+</table>
+
+<p>The <code>--depth</code> option sets depth values as it updates the working
+copy, tweaking new subdirectories' depth values as described above.</p>
+
+</div>  <!-- sc-depth -->
+
+<div class="h4" id="sc-ui" title="sc-ui">
+<h4>User Interface</h4>
+<p>Affected commands:</p>
+<ul>
+  <li><code>checkout</code></li>
+  <li><code>switch</code></li>
+  <li><code>update</code></li>
+  <li><code>status</code></li>
+  <li><code>info</code></li>
+</ul>
+   
+<p>The <code>-N</code> option becomes a synonym for <code>--depth=files</code>
+for these commands.  This changes the existing <code>-N</code> behavior for
+these commands, but in a trivial way (see below).</p>
+
+<p><code>checkout</code> without <code>--depth</code> or
+<code>-N</code> behaves the same as it does today.
+<code>switch</code> and <code>update</code> without
+<code>--depth</code> or <code>-N</code> behave the same way as today
+if and only if the working copy is fully depth-infinity.
+<code>switch</code> and <code>update</code> without
+<code>--depth</code> or <code>-N</code> will <em>not</em> change depth
+values (exception: a missing directory specified on the command line
+will be pulled in).</p>
+   
+<p>Thus, <code>checkout</code> is identical to <code>checkout
+--depth=infinity</code>, but <code>switch</code> and <code>update</code> are
+not the same as <code>switch --depth=infinity</code> and <code>update
+--depth=infinity</code>.  The former update entries according to existing depth
+values, while the latter pull in everything.</p>
+   
+<p>To get started, run <code>checkout</code> with
+<code>--depth=empty</code> or <code>--depth=files</code>.  If
+additional files or directories are desired, pull them in with
+<code>update</code> commands using appropriate <code>--depth</code>
+options.  The <code>svn status</code> command should list the ambient
+depths of directories, in addition to whatever other statuses are
+listed.  The <code>svn info</code> command also lists ambient depth,
+when invoked on a directory whose depth is not the default
+(depth-infinity)</p>
+
+<p><strong>Note:</strong> There is currently no <em>deselection</em>
+interface for sparse checkouts&nbsp;&mdash;&nbsp;that is, there is no
+command to unselect or "fold up" a subdirectory after you've brought
+it into a sparse working copy (although there are some fairly easy
+workarounds to achieve the same effect).  See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=2843" >issue
+#2843</a> for details.</p>
+
+</div>  <!-- sc-ui -->
+
+<div class="h4" id="sc-compat" title="sc-compat">
+<h4>Compatibility with older servers</h4>
+
+<p>The new <tt>--depth</tt> feature naturally requires the client to
+be 1.5+, and will work most efficiently if the server is also 1.5+.
+However, the client will still behave correctly if the server is 1.4.x
+or lower; things will just be less efficient.</p>
+
+<p>This is because older servers do not
+understand&nbsp;&mdash;&nbsp;and therefore
+ignore&nbsp;&mdash;&nbsp;what the client tells them about "depth".  So
+when a client requests a depth shallower than depth-infinity, older
+servers will send back more data than the client wants.  However, a
+1.5+ client will know it's talking to an older server and filter out
+this extra data.  Thus, operations may take a while, because the
+server sends a lot of data over the network that the client then
+ignores, but the final result on the client side will be the same.
+(Note that older servers understand a <tt>recurse</tt> flag in the
+network protocols, and 1.5+ clients send that flag based on the depth;
+this alleviates some of the extra network traffic penalty.)</p>
+
+</div>  <!-- sc-compat -->
+
+<div class="h4" id="sc-further-reading" title="sc-further-reading">
+<h4>Further reading</h4>
+
+<ul>
+<li>The <a
+    href="http://svnbook.red-bean.com/nightly/en/svn.advanced.sparsedirs.html"
+    >Sparse Directories</a> section in the Subversion book.
+</li>
+<li>The <a
+    href="http://svn.collab.net/repos/svn/trunk/notes/sparse-directories.txt" 
+    >design/implementation document</a> in the repository.</li>
+</ul>
+
+</div> <!-- sc-further-reading -->
+
+</div> <!-- sparse-checkouts -->
+
+<div class="h3" id="interactive-conflict-resolution"
+             title="interactive-conflict-resolution">
+<h3>Interactive Conflict Resolution (<em>client</em>)</h3>
+
+<p>Conflict resolution is now done interactively by the command-line
+client for the
+<code>update</code>/<code>switch</code>/<code>merge</code>
+subcommands, and the client library offers a callback function so
+other clients can do similarly.</p>
+
+<p>Here's an example using the command-line client:</p>
+
+<pre>
+   $ svn up
+   U    contrib/client-side/svnmerge/svnmerge_test.py
+   Conflict discovered in 'contrib/client-side/svnmerge/svnmerge.py'.
+   Select: (p) postpone, (df) diff-full, (e) edit,
+           (s) show all options: s
+     (p)  postpone    - mark the conflict to be resolved later
+     (df) diff-full   - show all changes made to merged file
+     (e)  edit        - change merged file in an editor
+     (r)  resolved    - accept merged version of file
+     (mf) mine-full   - accept my version of entire file (ignore their changes)
+     (tf) theirs-full - accept their version of entire file (lose my changes)
+     (l)  launch      - launch external tool to resolve conflict
+     (s)  show all    - show this list
+
+   Select: (p) postpone, (df) diff-full, (e) edit,
+           (s) show all options: tf
+   G    contrib/client-side/svnmerge/svnmerge.py
+   Updated to revision 25685.
+   $ 
+</pre>
+
+<p>This feature can be selectively disabled by using the --non-interactive
+option, or disabled permanently by setting '[miscellany] interactive-conflicts
+ = no' in your run-time config file.</p>
+
+<p>The API for interactive conflict resolution is exposed via a
+callback function and the following new data types:</p>
+
+<ul>
+  <li><code>svn_wc_conflict_resolver_func_t</code>, the callback API
+    itself</li>
+  <li><code>svn_wc_conflict_description_t</code>, a description of the
+    conflict passed to the callback</li>
+  <li><code>svn_wc_conflict_action_t</code>, the part of the conflict
+    description indicating what the merge was trying to do</li>
+  <li><code>svn_wc_conflict_reason_t</code>, the part of the conflict
+    description indicating the type of conflict</li>
+  <li><code>svn_wc_conflict_result_t</code>, returned by the callback
+    as the result of any conflict resolution attempt</li>
+  <li><code>svn_wc_conflict_choice_t</code>, an enum indicating what
+    course of action the user chose</li>
+</ul>
+
+<p>Clients provide their callback function to Subversion's libraries
+by setting it on the (new) <code>conflict_func</code> field of their
+<code>svn_client_ctx_t</code>, and may provide additional state to the
+callback via the corresponding <code>conflict_baton</code> field.</p>
+
+</div>  <!-- interactive-conflict-resolution -->
+
+<div class="h3" id="changelists" title="changelists"> <h3>Changelist
+support (<em>client</em>)</h3> <p>The Subversion client now contains
+the notion of a <em>changelist</em>: a group of files which are
+associated with a chosen name.  This becomes especially useful when
+working on several different set of files within the same working
+copy.  Instead of having to remember each file in each set, Subversion
+1.5 will allow you to associate a changelist with each set of files.
+Most commands which take a set of files as targets will now also
+accept the <strong><code>--changelist</code></strong> option, which
+filters those targets based upon the members of the changelist.
+Changelist membership can be edited using the new
+<strong><code>changelist</code></strong> subcommand.</p>
+
+<p>Changelists are handled entirely by the client.  They are never sent
+to the server, and aren't visible to other users of the same repository.
+Also, the <code>--changelist</code> option is never additive; if a file
+wouldn't have been included in the list of targets without
+<code>--changelist</code>, it will not be added to it, regardless of membership
+in the changelist.  Currently, a file may only be in one changelist at a
+time, and directories can not be members of a changelist.</p>
+
+<p>The <code>--changelist</code> option is supported by the following
+subcommands:</p>
+<ul>
+  <li><code>changelist</code></li>
+  <li><code>commit</code></li>
+  <li><code>diff</code> (only wc-wc and wc-repos cases)</li>
+  <li><code>info</code></li>
+  <li><code>propget</code></li>
+  <li><code>proplist</code></li>
+  <li><code>propset</code></li>
+  <li><code>propdel</code></li>
+  <li><code>revert</code></li>
+  <li><code>status</code></li>
+  <li><code>update</code></li>
+</ul>
+
+<div class="h4" id="cl-further-reading" title="cl-further-reading">
+<h4>Further reading</h4>
+
+<ul>
+<li>The <a
+    href="http://svnbook.red-bean.com/nightly/en/svn.advanced.changelists.html"
+    >Changelists</a> section in the Subversion book.
+</li>
+<li>The <a
+    href="http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt" 
+    >design/implementation document</a> in the repository.</li>
+</ul>
+
+</div>  <!-- cl-further-reading -->
+
+</div>  <!-- changelists -->
+
+<div class="h3" id="externals" title="externals">
+<h3>Relative URLs, peg revisions in <tt>svn:externals</tt>
+    (<em>client</em>)</h3>
+
+<p>Two additions to the <tt>svn:externals</tt> feature</p>
+
+<div class="h4" id="externals-peg-revs" title="externals-peg-revs">
+<h4>Peg revision syntax for URLs</h4>
+
+<p><em>Compatibility and the new syntax:</em> For compatibility
+reasons, the pre-1.5 svn:externals syntax continues to not understand
+peg revisions.  A new format has been introduced to allow peg
+revisions in URLs.</p>
+
+<p>The old format of</p>
+<pre>
+   foo             http://example.com/repos/zig
+   foo/bar -r 1234 http://example.com/repos/zag
+</pre>
+
+<p>does not support peg revisions, and the following externals will
+not work (unless there are directories named <tt>zig@HEAD</tt> and
+<tt>zag@HEAD</tt>):</p>
+
+<pre>
+   foo             http://example.com/repos/zig@HEAD
+   foo/bar -r 1234 http://example.com/repos/zag@HEAD
+</pre>
+
+<p>The new format moves the URL first followed by the directory the
+external is checked out or exported into; if there is an operative
+(-r) revision, it precedes the URL.  Here are four externals lines:</p>
+
+<pre>
+   http://example.com/repos/zig foo1
+   -r 1234 http://example.com/repos/zag foo/bar1
+   http://example.com/repos/zig@HEAD foo2
+   -r 1234 http://example.com/repos/zag@HEAD foo/bar2
+</pre>
+
+<p>In other words, both operative ("-r") and peg ("@") revisions are
+allowed, but neither is required.</p>
+
+</div>  <!-- externals-peg-revisions -->
+
+<div class="h4" id="externals-relative-urls" title="externals-relative-urls">
+<h4>Support for relative URLs</h4>
+
+<p>Prior to Subversion 1.5, the URLs in an <tt>svn:externals</tt>
+specification must be absolute.  Now they can be relative.  Four
+different relative externals specifications are supported.  (In the
+following examples, assume we have two repositories: one at
+<tt>http://example.com/svn/repos-1</tt> and another at
+<tt>http://example.com/svn/repos-2</tt>.  We have a checkout of
+<tt>http://example.com/svn/repos-1/project1/trunk</tt> and the
+<tt>svn:externals</tt> property is set on <tt>trunk</tt>.)</p>
+
+<dl><dt><strong>../</strong></dt>
+<dd><p>Relative to the directory with the <tt>svn:externals</tt>
+property.  These URLs always begin with the string <tt>../</tt>, for
+example:</p>
+<pre>
+   ../../project2/trunk common/project2/trunk
+</pre>
+
+<p>This will extract
+<tt>http://example.com/svn/repos-1/project2/trunk</tt> into
+<tt>common/project2/trunk</tt>.  The external's URL is relative to the
+URL of the directory with the <tt>svn:externals</tt> property, not the
+directory where the external is written to disk.</p></dd>
+
+<dt><strong>^/</strong></dt>
+
+<dd><p>Relative to the repository root.</p>
+
+<pre>
+   ^/project2/trunk common/project2/trunk
+</pre>
+
+<p>This will extract
+<tt>http://example.com/svn/repos-1/project2/trunk</tt> into
+<tt>common/project2/trunk</tt>.</p>
+
+<p>You can also refer to other repositories easily using repository
+root relative URLs:</p>
+
+<pre>
+   ^/../repos-2/foo/trunk common/foo/trunk
+</pre>
+
+<p>This will extract <tt>http://example.com/svn/repos-2/foo/trunk</tt>
+into <tt>common/foo/trunk</tt>.</p>
+</dd>
+
+<dt><strong>//</strong></dt>
+
+<dd><p>Relative to the scheme.  This copies the scheme of the checkout
+or export URL into the URL in <tt>svn:externals</tt>.  It is useful
+when the same hostname must the accessed with different schemes
+depending upon network location; i.e. clients in the intranet use
+<tt>http://</tt> while external clients use <tt>svn+ssh://</tt>.</p>
+
+<pre>
+   //example.com/svn/repos-1/project2/trunk common/project2/trunk
+</pre>
+
+<p>This will extract
+<tt>http://example.com/svn/repos-1/project2/trunk</tt> into
+<tt>common/project2/trunk</tt>.  If the working copy was checked out
+from <tt>svn+ssh://example.com/svn/repos-1/project1/trunk</tt> then
+this URL would be
+<tt>svn+ssh://example.com/svn/repos-1/project1/trunk</tt>.</p>
+</dd>
+
+<dt><strong>/</strong></dt>
+
+<dd><p>Server root relative URLs.  This copies the scheme and hostname
+from the checkout or export URL into the <tt>svn:externals</tt>
+URL.</p>
+
+<pre>
+   /svn/repos-1/project2/trunk common/project2/trunk
+</pre>
+
+<p>This will extract
+<tt>http://example.com/svn/repos-1/project2/trunk</tt> into
+<tt>common/project2/trunk</tt>.  If the working copy was checked out
+from <tt>svn+ssh://example.com/svn/repos-1/project1/trunk</tt> then
+this URL would be
+<tt>svn+ssh://example.com/svn/repos-1/project1/trunk</tt>.</p>
+</dd>
+
+</dl>
+
+<p>Relative URLs are still supported in the old <tt>svn:externals</tt>
+format (that does not support peg revisions).</p>
+
+<p>When Subversion sees an <tt>svn:externals</tt> without an absolute
+URL, it takes the first argument as a relative URL and the second as
+the target directory.</p>
+
+</div>  <!-- externals-relative-urls -->
+
+<div class="h4" id="externals-further-reading"
+             title="externals-further-reading">
+<h4>Further reading</h4>
+
+<p>See The <a
+href="http://svnbook.red-bean.com/nightly/en/svn.advanced.externals.html"
+>svn:externals</a> section of the Subversion Book.</p>
+
+</div>  <!-- externals-further-reading -->
+
+</div>  <!-- externals -->
+
+<div class="h3" id="cyrus-sasl" title="cyrus-sasl">
+<h3>Cyrus SASL support for ra_svn and <tt>svnserve</tt> (<em>client
+and server</em>)</h3>
+
+<p>From <a
+href="http://en.wikipedia.org/wiki/Simple_Authentication_and_Security_Layer">
+Wikipedia</a>: "SASL is a framework for authentication and data security in
+Internet protocols.  It decouples authentication mechanisms from application
+protocols, in theory allowing any authentication mechanism supported by SASL to
+be used in any application protocol that uses SASL."</p>
+  
+<p>In practice, the server sends a list of authentication mechanisms that it
+supports.  The client then selects one of these mechanisms based on what the
+client supports, and informs the server of its decision.  After that, a
+number of messages are exchanged until either authentication succeeds or an
+error occurs.  In the latter case, the client is allowed to restart
+authentication.</p>
+  
+<p>The <tt>svn://</tt> protocol has always supported this type of negotiation.
+However, only the <tt>CRAM-MD5</tt> and <tt>ANONYMOUS</tt> mechanisms were
+implemented.  <a href="http://asg.web.cmu.edu/sasl/">Cyrus SASL</a> supports
+all these, and, in addition, provides a host of other mechanisms such as
+<tt>DIGEST-MD5</tt>, OTP (One-Time Passwords), GSSAPI (used for Kerberos
+authentication), NTLM (NT LAN Manager), SRP (Secure Remote Password), and
+others.  The exact list of available mechanisms depends on how SASL was
+compiled, as many of them either have external dependencies, or are not
+built by default.  Also, because each mechanism is actually a shared library
+that is dynamically loaded at runtime, many distributions package these
+mechanisms separately from the core library.</p>
+
+<p>Please see the <a href="#sasl-compatibility">compatibility
+section</a> for information regarding using a 1.5 SASL-enabled server
+with pre-1.5 clients.  More information about Subversion's SASL
+support can be found in <a
+href="http://svn.collab.net/repos/svn/trunk/notes/sasl.txt"
+>sasl.txt</a>.</p>
+
+</div> <!-- cyrus-sasl -->
+
+<div class="h3" id="fsfs-sharding" title="fsfs-sharding">
+<h3>Improved support for large deployments on FSFS, via sharding
+    (<em>server</em>)</h3>
+
+<p>The FSFS filesystem backend stores each revision in its own file, and prior
+to Subversion 1.5, all of these files were stored in a common directory in
+the repository.  Now, <em>newly created</em> FSFS repositories will use a 
+two-level directory tree with up to (by default) 1000 files per directory.
+These repositories will only be compatible with other Subversion 1.5 clients,
+but of course, Subversion 1.5 will be able to continue using repositories
+employing the older scheme without any problem.</p>
+
+<p>The primary reason for the change is to allow the revision count to
+grow beyond the filesystem's (efficient) directory entry limit.  While
+modern filesystems can support millions of entries per directory, they
+become slower and common administrative tools (e.g. directory
+listings, backups) become unwieldy or fail completely.</p>
+
+<p>For more information about the technical underpinnings of FSFS sharding, 
+see this <a href="http://www.farside.org.uk/200704/tree_structured_fsfs">blog
+entry</a>.
+<!-- ### Reshard script is not quite finished and currently 
+     ### aborts if you try to run it.
+ <a
+ href="http://svn.collab.net/repos/svn/trunk/tools/server-side/fsfs-reshard.py"
+ >Migration script</a> provided.
+-->
+</p>
+
+<p>The shard size can by adjusted by editing the
+"<code>layout&nbsp;sharded</code>" line in "db/format" after
+<code>svnadmin&nbsp;create</code> but before populating the
+repository.</p>
+
+</div>  <!-- fsfs-sharding -->
+
+<div class="h3" id="fsfs-isolate-immutable" title="fsfs-isolate-immutable">
+<h3>Improved FSFS optimizability, via immutable file isolation
+    (<em>server</em>)</h3>
+
+<p>The FSFS repositories never change a revision after it is written
+to the disk.  Although this should allow the operating system to cache
+these files forever, certain filesystems (e.g. NFS) prohibit such
+caching by default.  Now the FSFS repository layout has been changed
+such that the immutable files are confined to the subdirectories
+"db/revs" and "db/txn-protorevs".  This allows these directories to be
+on a mount point where caching is enabled (on Linux look at the
+"nocto" option to nfs(5)).</p>
+
+<p>Since commit transactions are now built up in "db/txn-protorevs"
+instead of "db/transactions", the latter directory no longer needs to
+be on the same mount point.  If the repository is stored on a slower
+filesystem (e.g. NFS), then commit performance can be improved by
+moving the transactions directory to local disk (using a symbolic
+link).  If you are using multiple svn servers behind a network load
+scaler, you must configure the load scaler to direct to the same
+server for the duration of the transaction.  This is typically called
+"client affinity".</p>
+
+</div>  <!-- fsfs-isolate-immutable -->
+
+<div class="h3" id="webdav-proxy" title="webdav-proxy">
+<h3>WebDAV transparent write-through proxy (<em>server</em>)</h3>
+
+<p>Subversion 1.4 <a
+href="http://subversion.tigris.org/svn_1.4_releasenotes.html#svnsync">
+introduced <tt>svnsync</tt></a>&nbsp;&mdash;&nbsp;a tool which
+provided the ability to replicate repository history from one
+repository to another.  Though useful, <tt>svnsync</tt> could only
+pull revision history from a repository, not push additional commits
+back to the master.  Subversion 1.5 adds WebDAV proxy support to
+<tt>mod_dav_svn</tt>, effectively allowing bidirectional revision
+history replication between master servers and slave servers using
+<tt>mod_dav_svn</tt>.</p>
+
+<p>All clients interact with a slave server, but the slave transparently
+passes all of the write-oriented activites to the master (rewriting the
+content as necessary).  The slaves are essentially read-only, but they
+do have a complete copy of the repository locally.  This serves to
+alleviate read traffic from the master server which may be desirable
+in certain circumstances.</p>
+
+<p>This model has several advantages to using a straight HTTP DAV-aware
+caching proxy, in that each slave can respond to all read-only requests
+without ever having to relay them to the master backend.</p>
+
+<div class="h4" id="webdav-proxy-requirements"
+    title="webdav-proxy-requirements">
+<h4>Requirements</h4>
+<ul>
+  <li>Subversion 1.5 or newer.</li>
+  <li>Apache HTTP Server 2.2.0 or higher with mod_proxy enabled.
+    (Several fixes to mod_proxy were committed for this patch that were not
+    backported to the 2.0 branch of httpd.)</li>
+</ul>
+
+</div>  <!-- webdav-proxy-requirements -->
+
+<div class="h4" id="webdav-proxy-example" title="webdav-proxy-example">
+<h4>Example configuration</h4>
+
+<p>Participants:</p>
+<ul>
+  <li>Slave &rarr; <tt>slave.example.com</tt>  (there can be many!)</li>
+  <li>Master &rarr; <tt>master.example.com</tt> (there can only be one!)</li>
+  <li>A WebDAV client (<tt>ra_neon</tt>, <tt>ra_serf</tt>, other WebDAV
+    clients)</li>
+</ul>
+
+<p>Each client does:</p>
+<pre><code>
+    % svn co http://slave.example.com/repos/slave/
+    ...
+    % svn ci
+    % ...etc...
+</code></pre>
+<p>(The client can perform all operations as normal.)</p>
+
+<p>Each slave has:</p>
+<pre><code>
+    &lt;Location /repos/slave&gt;
+      DAV svn
+      SVNPath /my/local/copy/of/repos
+      SVNMasterURI http://master.example.com/repos/master/
+    &lt;/Location&gt;
+</code></pre>
+
+<p>The master MUST have a post-commit hook that updates all of the slaves.  An
+example that does this using <code>svnadmin dump</code>/<code>svnadmin
+load</code> and ssh is provided below.  <tt>svnsync</tt> can probably do the
+same thing.</p>
+
+<p>Additionally, if locks are permitted on the master repository, lock
+databases need to kept in sync via post-lock and post-unlock hooks on
+the master pushing the lock state to the slaves.  (Username
+preservation is left as an exercise to the reader.  Translation: <a
+href="hacking.html#patches">patches to these notes are most
+welcome</a>.)  If the lock database is not propogated, users will not
+be able to accurately determine whether a lock is
+held&nbsp;&mdash;&nbsp;but locking will still work.</p>
+
+<p>A sample synchronization script may look like this:</p>
+<pre><code>
+   #!/bin/sh
+   REPOS="$1"
+   REV="$2"
+   SLAVE_HOST=slave.example.com
+   SLAVE_PATH=/my/local/copy/of/repos
+
+   # Ensure svnadmin is in $PATH on both this machine and the remote server!
+   svnadmin dump --incremental -r$2 $1 &gt; /tmp/$2.dump
+   scp /tmp/$2.dump $SLAVE_HOST:$SLAVE_PATH
+   ssh $SLAVE_HOST "svnadmin load $SLAVE_PATH &lt; $SLAVE_PATH/$2.dump"
+   ssh $SLAVE_HOST "rm $SLAVE_PATH/$2.dump"
+   rm /tmp/$2.dump
+</code></pre>
+
+</div>  <!-- webdav-proxy-example -->
+
+<div class="h4" id="webdav-proxy-further-reading"
+             title="webdav-proxy-further-reading">
+<h4>Further reading</h4>
+
+<p>Additional information about WebDAV proxy support is available <a
+href="http://svn.collab.net/repos/svn/trunk/notes/webdav-proxy">in the
+repository</a>.</p>
+
+</div>  <!-- webdav-proxy-further-reading -->
+
+</div>  <!-- webdav-proxy -->
+
+</div>  <!-- new-features -->
+
+
+<div class="h2" id="enhancements" title="enhancements">
+<h2>Enhancements and Bugfixes</h2>
+
+<div class="h3" id="copy-move-improvements" title="copy-move-improvements">
+<h3>Copy/move-related improvements (<em>client and server</em>)</h3>
+
+<p>The abilities and behavior of <code>copy</code> and
+<code>move</code> operations are significantly improved in 1.5+.</p>
+
+<div class="h4" id="leverage-copyfrom" title="leverage-copyfrom">
+<h4>Improved copy-handling during updates (<em>client and server</em>)</h4>
+
+<p>A common problem in older versions of Subversion was the way in
+which <code>svn update</code> handled incoming copies and moves.</p>
+
+<p>Consider this scenario: Harry runs <code>svn move foo bar; svn
+commit</code>, and meanwhile Sally makes local changes to 'foo', and
+then runs <code>svn update</code>.  In earlier versions of Subversion,
+the server would send down a completely new file 'bar', and unversion
+the file 'foo' (if it had no uncommitted changes, Subversion would
+remove it entirely.)  From Sally's point of view, her changes seem to
+be lost; the newly added 'bar' file has the older content, and the
+file 'foo' has been taken out of version control.</p>
+
+<p>In Subversion 1.5, the client and server both attempt to be smarter
+about this.  The server doesn't send a whole new file during the
+update, but rather instructions to copy something that likely already
+exists in the working copy.  So Sally's 'foo' file is copied to 'bar'
+(with local edits intact!).</p>
+
+<p>In theory, this is the best-case scenario.  There are a few
+caveats: this "proper copying" of existing working-copy resources only
+works on files, not (yet) on directories.  Also, if an incoming
+move-operation deletes 'foo' before it attempts to copy it to 'bar',
+then the copy will fail, and the client reverts to the old behavior of
+fetching a pristine copy of the file from the repository.  We hope to
+address this in svn 1.6.</p>
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=503" >issue
+#503</a> for more.</p>
+
+</div> <!-- leverage-copyfrom -->
+
+<div class="h4" id="copy-peg-revs" title="copy-peg-revs">
+<h4>Peg revisions (<em>client</em>)</h4>
+
+<p>Copy and move operations now accept sources with peg ("@")
+revisions.</p>
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=2546" >issue
+#2546</a> for more.</p>
+
+</div>  <!-- copy-peg-revs -->
+
+<div class="h4" id="multi-op-copy-move" title="multi-op-copy-move">
+<h4>Multiple working copy copy/move operations (<em>client</em>)</h4>
+
+<p>Clients may now perform chained copy/move operations locally on a
+single object in a working copy:</p>
+
+<pre>
+   svn mv path1 path2
+   svn mv path2 path3
+</pre>
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=756" >issue
+#756</a> for more.</p>
+
+</div>  <!-- multi-op-copy-move -->
+
+<div class="h4" id="multi-src-copy" title="multi-src-copy">
+<h4>Improved handling multiple copy/move sources (<em>client</em>)</h4>
+
+<p>Clients now accept multiple sources for copy and move operations, with 
+the ability to copy/move each of the sources to the specified directory.
+This mirrors the behavior of standard command-line copy and move tools,
+such as <code>cp</code> and <code>mv</code>.  For example:</p>
+
+<pre>
+   svn mkdir new_subdir
+   svn mv foo.txt bar.txt baz.txt new_subdir
+</pre>
+
+<p>In practice, this means users can take advantage of shell globbing
+when doing a local copy or move:</p>
+
+<pre>
+   svn cp *.c dir
+</pre>
+
+<p>Multiple source copy/move also works for all previously defined
+copy/move working copy and repository combinations.</p>
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=747" >issue
+#747</a> for more.</p>
+
+</div>  <!-- multi-src-copy -->
+
+<div class="h4" id="cp-takes-base" title="cp-takes-base">
+<h4>Copy takes -rBASE (<em>client</em>)</h4>
+
+<p>Copy now understands the special revision "BASE" in a working copy
+(as in: "<tt>-rBASE</tt>").</p>
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=1643" >issue
+#1643</a> for more.</p>
+
+</div>  <!-- cp-takes-base -->
+
+<div class="h4" id="cp-mv-intermediate-dirs" title="cp-mv-intermediate-dirs">
+<h4>Creation of intermediate directories with copy/move
+    (<em>client and server</em>)</h4>
+
+<p>See the section on the new <a href="#intermediate-directories"
+>--parents option</a> for more about this.</p>
+
+</div>  <!-- cp-mv-intermediate-dirs -->
+
+</div>  <!-- copy-move-improvements -->
+
+<div class="h3" id="cancellation-improvements"
+     title="cancellation-improvements">
+<h3>Cancellation improvements (<em>client</em>)</h3>
+
+<p>Clients operations are now significantly more responsive to
+cancellation (e.g. via <tt>control-c</tt>).  In pre-1.5 releases,
+after directing an operation to stop, one sometimes had to wait for
+some time (e.g. while I/O occurred) before the operation would
+actually stop.</p>
+
+</div>  <!-- cancellation-improvements -->
+
+<div class="h3" id="cmdline" title="cmdline">
+<h3>Command-line client improvements (<em>client</em>)</h3>
+
+<p>There are far too many enhancements and new options to the
+command-line client to list them all here.  Aside from all the ones
+mentioned already in these release notes, below are a few more that we
+consider important, but please see the 1.5.0 section in the <a
+href="http://svn.collab.net/repos/svn/trunk/CHANGES">CHANGES</a> file
+for a complete list.</p>
+
+<div class="h4" id="resolve" title="resolve">
+<h4>New "resolve" subcommand replaces "resolved"</h4>
+
+<p>A new <strong><tt>resolve</tt></strong> subcommand replaces the
+"<tt>resolved</tt>" subcommand (the latter is deprecated, but still
+present for compatibility).  The new subcommand takes a
+<strong><tt>--accept=orig|mine|repo</tt></strong> option to select
+which version of a file to retain (which means Subversion now supports
+batch-style conflict resolution).</p>
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=2784" >issue
+#2784</a> for more.</p>
+
+</div>  <!-- resolve -->
+
+<div class="h4" id="intermediate-directories"
+             title="intermediate-directories">
+<h4>Create intermediate directories if asked</h4>
+
+<p>Add, mkdir, copy, and move take a new
+<strong><tt>--parents</tt></strong> option, which makes intermediate
+directories as necessary to create the destination path.</p>
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=1776" >issue
+#1776</a> for more</p>
+
+</div>  <!-- intermediate-directories -->
+
+<div class="h4" id="keep-local" title="keep-local">
+<h4>New --keep-local option retains path after delete.</h4>
+
+<p>Delete (remove) now takes a
+<strong><code>--keep-local</code></strong> option to retain its
+targets locally, so paths will not be removed even if unmodified.</p>
+
+</div>  <!-- keep-local -->
+
+<div class="h4" id="commit-revprops" title="commit-revprops">
+<h4>Commit now takes a --with-revprop option.</h4>
+
+Commit now takes a <strong><tt>--with-revprop</tt></strong> option
+allowing one to set revision properties
+
+<p>See <a
+href="http://subversion.tigris.org/issues/show_bug.cgi?id=1976" >issue
+#1976</a> for more.</p>
+
+</div>  <!-- commit-revprops -->
+
+</div>  <!-- cmdline -->
+
+<div class="h3" id="dav-modules" title="dav-modules">
+<h3>Easier to try out experimental <tt>ra_serf</tt> DAV access module
+(<em>client</em>)</h3>
+
+<p>Subversion 1.4 introduced the experimental <tt>ra_serf</tt>
+repository access module for accessing HTTP[S] DAV Subversion servers.
+This uses the <a href="http://code.google.com/p/serf/">serf</a>
+library instead of the Neon library which the original DAV support
+uses.  serf supports pipelined requests which may lead to better
+performance.  However, Subversion 1.4 required you to choose which
+module to use for accessing DAV servers at build time, which made it
+difficult to find out which module performs better for your usage
+patterns.</p>
+
+<p>Subversion 1.5 allows you to build both modules at the same time;
+you can choose which library to use on a global or host-by-host basis
+by setting the <tt>http-library</tt> variable in your run-time server
+configuration file (<tt>~/.subversion/servers</tt>).  In recognition
+of the fact that both libraries are DAV clients, we have
+renamed <tt>ra_dav</tt> to <tt>ra_neon</tt>.</p>
+
+</div>  <!-- dav-modules -->
+
+<div class="h3" id="apis" title="apis">
+<h3>API changes, improvements and language bindings
+    (<em>client and server</em>)</h3>
+
+<p>There are too many new and revised APIs in Subversion 1.5.0 to even
+begin to list them all here.  See the <a
+href="http://svn.collab.net/svn-doxygen/" >Subversion API
+Documentation</a> page for general API information.  If you develop a
+3rd-party client application that uses Subversion APIs, you should
+probably look at the header files for the interfaces you use and see
+what's changed.</p>
+
+<p>One general change is that most APIs that formerly took a
+<tt>recurse</tt> parameter have been upgraded to accept a
+<tt>depth</tt> parameter instead, to enable the new <a
+href="#sparse-checkouts">sparse checkouts</a> feature.</p>
+
+<p>Language bindings have mostly been updated for the new APIs, though
+some may lag more than others.</p>
+
+</div>  <!-- apis -->
+
+<div class="h3" id="bug-fixes" title="bug-fixes">
+<h3>Bug fixes (<em>client and server</em>)</h3>
+
+<p>A great many bugs have been fixed.  See the 1.5.0 section in the <a
+href="http://svn.collab.net/repos/svn/trunk/CHANGES">CHANGES</a> file
+for details.</p>
+
+</div>  <!-- bug-fixes -->
+
+</div>  <!-- enhancements -->
+
+<div class="h2" id="svn-1.3-deprecation" title="svn-1.3-deprecation">
+<h2>Subversion 1.3.x series no longer supported</h2>
+
+<p>The Subversion 1.3.x line is no longer supported.  This doesn't
+mean that your 1.3 installation is doomed; if it works well and is all
+you need, that's fine.  "No longer supported" just means we've stopped
+accepting bug reports against 1.3.x versions, and will not make any
+more 1.3.x bugfix releases, except perhaps for absolutely critical
+security or data-loss bugs.</p>
+
+</div>  <!-- svn-1.3-deprecation -->
+
+<div class="h2" id="deps" title="deps">
+<h2>Subversion Dependencies Distribution: Binary Compatibility Issues</h2>
+
+<div class="h3" id="deps-background" title="deps-background">
+<h3>Background</h3>
+
+<p>APR 0.9.x and 1.x are binary-incompatible.  This means if you are
+already using Subversion with APR 0.9.x, and then upgrade your libapr
+to 1.X <em>without rebuilding Subversion</em>, things will break.
+Things will also break if your Subversion server libraries are linked
+to one version of APR but your Apache HTTPD server is linked to a
+different version.</p>
+
+<p>For a long time, Subversion's main source distribution included APR
+0.9.x, which was the latest available at the time, along with a few
+other things (e.g., Neon, zlib) that weren't yet widespread on
+installation systems.</p>
+
+</div> <!-- deps-background -->
+
+<div class="h3" id="deps-now" title="deps-now">
+<h3>Subversion 1.5.0 Dependencies Distribution</h3>
+
+<p>Today, these dependencies are no longer exotic, so our source
+distribution contains just Subversion itself.  Those building
+Subversion are expected to have the necessary libraries already
+installed, or to be able to fetch them easily.  But for convenience,
+we still offer a "deps" distribution: it doesn't contain Subversion,
+it just has source code for those third-party libraries.</p>
+
+<p>Until Subversion 1.5.0, the deps distribution contained APR 0.9.x,
+but as of 1.5.0, we're finally upgrading it to APR 1.x.  This is
+because by now there are very few systems that will have binary
+compatibility issues, and of those, few are likely to build using the
+"deps" dist.</p>
+
+<p>If you already have a Subversion installation using APR 0.9.x, it's
+still possible to move to APR 1.x safely (although you are not
+required to, unless you use the deps dist).  Just be sure to recompile
+Subversion, and Apache httpd if necessary, after upgrading APR.</p>
+
+<p>Note that it's perfectly safe to use APR 1.x from the beginning.
+In fact, we recommend it.  If you're building Subversion for the first
+time, there's no compatibility issue to worry about, so just grab the
+latest version of APR (or use our deps dist).</p>
+
+</div> <!-- deps-now -->
+
+</div>  <!-- deps -->
+
+</div>  <!-- app -->
+</body>
+</html>
--- subversion-1.6.17dfsg.orig/debian/watch
+++ subversion-1.6.17dfsg/debian/watch
@@ -0,0 +1,5 @@
+# 'man uscan' for the format and usage of this file
+version=3
+opts=dversionmangle=s/\.dfsg\d+$// \
+  http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74 \
+  http://subversion.tigris.org/downloads/subversion-(\d+.\d+.\d+).tar.gz
--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.prerm
+++ subversion-1.6.17dfsg/debian/libapache2-svn.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+case "$1" in
+    remove)
+        a2dismod authz_svn dav_svn
+        ;;
+esac
+
+#DEBHELPER#
--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.dirs
+++ subversion-1.6.17dfsg/debian/libapache2-svn.dirs
@@ -0,0 +1 @@
+usr/share/doc/libapache2-svn
--- subversion-1.6.17dfsg.orig/debian/libsvn1.symbols
+++ subversion-1.6.17dfsg/debian/libsvn1.symbols
@@ -0,0 +1,1154 @@
+libsvn_client-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_client_add2@Base 1.4
+ svn_client_add3@Base 1.4
+ svn_client_add4@Base 1.5
+ svn_client_add@Base 1.4
+ svn_client_add_to_changelist@Base 1.5
+ svn_client_args_to_target_array@Base 1.6
+ svn_client_blame2@Base 1.4
+ svn_client_blame3@Base 1.4
+ svn_client_blame4@Base 1.5
+ svn_client_blame@Base 1.4
+ svn_client_cat2@Base 1.4
+ svn_client_cat@Base 1.4
+ svn_client_checkout2@Base 1.4
+ svn_client_checkout3@Base 1.5
+ svn_client_checkout@Base 1.4
+ svn_client_cleanup@Base 1.4
+ svn_client_commit2@Base 1.4
+ svn_client_commit3@Base 1.4
+ svn_client_commit4@Base 1.5
+ svn_client_commit@Base 1.4
+ svn_client_commit_item2_dup@Base 1.4
+ svn_client_commit_item3_create@Base 1.6
+ svn_client_commit_item3_dup@Base 1.5
+ svn_client_commit_item_create@Base 1.5
+ svn_client_copy2@Base 1.4
+ svn_client_copy3@Base 1.4
+ svn_client_copy4@Base 1.5
+ svn_client_copy5@Base 1.6
+ svn_client_copy@Base 1.4
+ svn_client_create_context@Base 1.4
+ svn_client_delete2@Base 1.4
+ svn_client_delete3@Base 1.5
+ svn_client_delete@Base 1.4
+ svn_client_diff2@Base 1.4
+ svn_client_diff3@Base 1.4
+ svn_client_diff4@Base 1.5
+ svn_client_diff@Base 1.4
+ svn_client_diff_peg2@Base 1.4
+ svn_client_diff_peg3@Base 1.4
+ svn_client_diff_peg4@Base 1.5
+ svn_client_diff_peg@Base 1.4
+ svn_client_diff_summarize2@Base 1.5
+ svn_client_diff_summarize@Base 1.4
+ svn_client_diff_summarize_dup@Base 1.4
+ svn_client_diff_summarize_peg2@Base 1.5
+ svn_client_diff_summarize_peg@Base 1.4
+ svn_client_export2@Base 1.4
+ svn_client_export3@Base 1.4
+ svn_client_export4@Base 1.5
+ svn_client_export@Base 1.4
+ svn_client_get_changelists@Base 1.5
+ svn_client_get_simple_prompt_provider@Base 1.4
+ svn_client_get_simple_provider@Base 1.4
+ svn_client_get_ssl_client_cert_file_provider@Base 1.4
+ svn_client_get_ssl_client_cert_prompt_provider@Base 1.4
+ svn_client_get_ssl_client_cert_pw_file_provider@Base 1.4
+ svn_client_get_ssl_client_cert_pw_prompt_provider@Base 1.4
+ svn_client_get_ssl_server_trust_file_provider@Base 1.4
+ svn_client_get_ssl_server_trust_prompt_provider@Base 1.4
+ svn_client_get_username_prompt_provider@Base 1.4
+ svn_client_get_username_provider@Base 1.4
+ svn_client_import2@Base 1.4
+ svn_client_import3@Base 1.5
+ svn_client_import@Base 1.4
+ svn_client_info2@Base 1.5
+ svn_client_info@Base 1.4
+ svn_client_list2@Base 1.5
+ svn_client_list@Base 1.4
+ svn_client_lock@Base 1.4
+ svn_client_log2@Base 1.4
+ svn_client_log3@Base 1.4
+ svn_client_log4@Base 1.5
+ svn_client_log5@Base 1.6
+ svn_client_log@Base 1.4
+ svn_client_ls2@Base 1.4
+ svn_client_ls3@Base 1.4
+ svn_client_ls@Base 1.4
+ svn_client_merge2@Base 1.4
+ svn_client_merge3@Base 1.5
+ svn_client_merge@Base 1.4
+ svn_client_merge_peg2@Base 1.4
+ svn_client_merge_peg3@Base 1.5
+ svn_client_merge_peg@Base 1.4
+ svn_client_merge_reintegrate@Base 1.5
+ svn_client_mergeinfo_get_merged@Base 1.5
+ svn_client_mergeinfo_log_eligible@Base 1.5
+ svn_client_mergeinfo_log_merged@Base 1.5
+ svn_client_mkdir2@Base 1.4
+ svn_client_mkdir3@Base 1.5
+ svn_client_mkdir@Base 1.4
+ svn_client_move2@Base 1.4
+ svn_client_move3@Base 1.4
+ svn_client_move4@Base 1.4
+ svn_client_move5@Base 1.5
+ svn_client_move@Base 1.4
+ svn_client_open_ra_session@Base 1.4
+ svn_client_propget2@Base 1.4
+ svn_client_propget3@Base 1.5
+ svn_client_propget@Base 1.4
+ svn_client_proplist2@Base 1.4
+ svn_client_proplist3@Base 1.5
+ svn_client_proplist@Base 1.4
+ svn_client_proplist_item_dup@Base 1.4
+ svn_client_propset2@Base 1.4
+ svn_client_propset3@Base 1.5
+ svn_client_propset@Base 1.4
+ svn_client_relocate@Base 1.4
+ svn_client_remove_from_changelists@Base 1.5
+ svn_client_resolve@Base 1.5
+ svn_client_resolved@Base 1.4
+ svn_client_revert2@Base 1.5
+ svn_client_revert@Base 1.4
+ svn_client_revprop_get@Base 1.4
+ svn_client_revprop_list@Base 1.4
+ svn_client_revprop_set2@Base 1.6
+ svn_client_revprop_set@Base 1.4
+ svn_client_root_url_from_path@Base 1.5
+ svn_client_status2@Base 1.4
+ svn_client_status3@Base 1.5
+ svn_client_status4@Base 1.6
+ svn_client_status@Base 1.4
+ svn_client_suggest_merge_sources@Base 1.5
+ svn_client_switch2@Base 1.5
+ svn_client_switch@Base 1.4
+ svn_client_unlock@Base 1.4
+ svn_client_update2@Base 1.4
+ svn_client_update3@Base 1.5
+ svn_client_update@Base 1.4
+ svn_client_url_from_path@Base 1.4
+ svn_client_uuid_from_path@Base 1.4
+ svn_client_uuid_from_url@Base 1.4
+ svn_client_version@Base 1.4
+ svn_info_dup@Base 1.4
+libsvn_delta-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_compat_wrap_file_rev_handler@Base 1.5
+ svn_delta_default_editor@Base 1.4
+ svn_delta_depth_filter_editor@Base 1.5
+ svn_delta_get_cancellation_editor@Base 1.4
+ svn_delta_noop_window_handler@Base 1.4
+ svn_delta_path_driver@Base 1.4
+ svn_delta_version@Base 1.4
+ svn_txdelta@Base 1.4
+ svn_txdelta_apply@Base 1.4
+ svn_txdelta_apply_instructions@Base 1.4
+ svn_txdelta_compose_windows@Base 1.4
+ svn_txdelta_md5_digest@Base 1.4
+ svn_txdelta_next_window@Base 1.4
+ svn_txdelta_parse_svndiff@Base 1.4
+ svn_txdelta_read_svndiff_window@Base 1.4
+ svn_txdelta_run@Base 1.6
+ svn_txdelta_send_stream@Base 1.4
+ svn_txdelta_send_string@Base 1.4
+ svn_txdelta_send_txstream@Base 1.4
+ svn_txdelta_skip_svndiff_window@Base 1.4
+ svn_txdelta_stream_create@Base 1.4
+ svn_txdelta_target_push@Base 1.4
+ svn_txdelta_to_svndiff2@Base 1.4
+ svn_txdelta_to_svndiff@Base 1.4
+ svn_txdelta_window_dup@Base 1.4
+libsvn_diff-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_diff_contains_conflicts@Base 1.4
+ svn_diff_contains_diffs@Base 1.4
+ svn_diff_diff3@Base 1.4
+ svn_diff_diff4@Base 1.4
+ svn_diff_diff@Base 1.4
+ svn_diff_file_diff3@Base 1.4
+ svn_diff_file_diff3_2@Base 1.4
+ svn_diff_file_diff4@Base 1.4
+ svn_diff_file_diff4_2@Base 1.4
+ svn_diff_file_diff@Base 1.4
+ svn_diff_file_diff_2@Base 1.4
+ svn_diff_file_options_create@Base 1.4
+ svn_diff_file_options_parse@Base 1.4
+ svn_diff_file_output_merge2@Base 1.6
+ svn_diff_file_output_merge@Base 1.4
+ svn_diff_file_output_unified2@Base 1.4
+ svn_diff_file_output_unified3@Base 1.5
+ svn_diff_file_output_unified@Base 1.4
+ svn_diff_mem_string_diff3@Base 1.5
+ svn_diff_mem_string_diff4@Base 1.5
+ svn_diff_mem_string_diff@Base 1.5
+ svn_diff_mem_string_output_merge2@Base 1.6
+ svn_diff_mem_string_output_merge@Base 1.5
+ svn_diff_mem_string_output_unified@Base 1.5
+ svn_diff_output@Base 1.4
+ svn_diff_version@Base 1.4
+libsvn_fs-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_fs_abort_txn@Base 1.4
+ svn_fs_access_add_lock_token2@Base 1.6
+ svn_fs_access_add_lock_token@Base 1.4
+ svn_fs_access_get_username@Base 1.4
+ svn_fs_apply_text@Base 1.4
+ svn_fs_apply_textdelta@Base 1.4
+ svn_fs_begin_txn2@Base 1.4
+ svn_fs_begin_txn@Base 1.4
+ svn_fs_berkeley_logfiles@Base 1.4
+ svn_fs_berkeley_path@Base 1.4
+ svn_fs_berkeley_recover@Base 1.4
+ svn_fs_change_node_prop@Base 1.4
+ svn_fs_change_rev_prop@Base 1.4
+ svn_fs_change_txn_prop@Base 1.4
+ svn_fs_change_txn_props@Base 1.5
+ svn_fs_check_path@Base 1.4
+ svn_fs_check_related@Base 1.4
+ svn_fs_close_root@Base 1.4
+ svn_fs_closest_copy@Base 1.4
+ svn_fs_commit_txn@Base 1.4
+ svn_fs_compare_ids@Base 1.4
+ svn_fs_contents_changed@Base 1.4
+ svn_fs_copied_from@Base 1.4
+ svn_fs_copy@Base 1.4
+ svn_fs_create@Base 1.4
+ svn_fs_create_access@Base 1.4
+ svn_fs_create_berkeley@Base 1.4
+ svn_fs_delete@Base 1.4
+ svn_fs_delete_berkeley@Base 1.4
+ svn_fs_delete_fs@Base 1.4
+ svn_fs_deltify_revision@Base 1.4
+ svn_fs_dir_entries@Base 1.4
+ svn_fs_file_checksum@Base 1.6
+ svn_fs_file_contents@Base 1.4
+ svn_fs_file_length@Base 1.4
+ svn_fs_file_md5_checksum@Base 1.4
+ svn_fs_generate_lock_token@Base 1.4
+ svn_fs_get_access@Base 1.4
+ svn_fs_get_file_delta_stream@Base 1.4
+ svn_fs_get_lock@Base 1.4
+ svn_fs_get_locks@Base 1.4
+ svn_fs_get_mergeinfo@Base 1.5
+ svn_fs_get_uuid@Base 1.4
+ svn_fs_history_location@Base 1.4
+ svn_fs_history_prev@Base 1.4
+ svn_fs_hotcopy@Base 1.4
+ svn_fs_hotcopy_berkeley@Base 1.4
+ svn_fs_initialize@Base 1.4
+ svn_fs_is_dir@Base 1.4
+ svn_fs_is_file@Base 1.4
+ svn_fs_is_revision_root@Base 1.4
+ svn_fs_is_txn_root@Base 1.4
+ svn_fs_list_transactions@Base 1.4
+ svn_fs_lock@Base 1.4
+ svn_fs_make_dir@Base 1.4
+ svn_fs_make_file@Base 1.4
+ svn_fs_merge@Base 1.4
+ svn_fs_new@Base 1.4
+ svn_fs_node_created_path@Base 1.4
+ svn_fs_node_created_rev@Base 1.4
+ svn_fs_node_history@Base 1.4
+ svn_fs_node_id@Base 1.4
+ svn_fs_node_origin_rev@Base 1.5
+ svn_fs_node_prop@Base 1.4
+ svn_fs_node_proplist@Base 1.4
+ svn_fs_open@Base 1.4
+ svn_fs_open_berkeley@Base 1.4
+ svn_fs_open_txn@Base 1.4
+ svn_fs_pack@Base 1.6
+ svn_fs_parse_id@Base 1.4
+ svn_fs_path@Base 1.4
+ svn_fs_path_change2_create@Base 1.6
+ svn_fs_paths_changed2@Base 1.6
+ svn_fs_paths_changed@Base 1.4
+ svn_fs_print_modules@Base 1.4
+ svn_fs_props_changed@Base 1.4
+ svn_fs_purge_txn@Base 1.4
+ svn_fs_recover@Base 1.5
+ svn_fs_revision_link@Base 1.4
+ svn_fs_revision_prop@Base 1.4
+ svn_fs_revision_proplist@Base 1.4
+ svn_fs_revision_root@Base 1.4
+ svn_fs_revision_root_revision@Base 1.4
+ svn_fs_root_fs@Base 1.4
+ svn_fs_set_access@Base 1.4
+ svn_fs_set_berkeley_errcall@Base 1.4
+ svn_fs_set_uuid@Base 1.4
+ svn_fs_set_warning_func@Base 1.4
+ svn_fs_txn_base_revision@Base 1.4
+ svn_fs_txn_name@Base 1.4
+ svn_fs_txn_prop@Base 1.4
+ svn_fs_txn_proplist@Base 1.4
+ svn_fs_txn_root@Base 1.4
+ svn_fs_txn_root_base_revision@Base 1.5
+ svn_fs_txn_root_name@Base 1.4
+ svn_fs_type@Base 1.4
+ svn_fs_unlock@Base 1.4
+ svn_fs_unparse_id@Base 1.4
+ svn_fs_upgrade@Base 1.5
+ svn_fs_version@Base 1.4
+ svn_fs_youngest_rev@Base 1.4
+libsvn_ra-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_ra_change_rev_prop@Base 1.4
+ svn_ra_check_path@Base 1.4
+ svn_ra_create_callbacks@Base 1.4
+ svn_ra_do_diff2@Base 1.4
+ svn_ra_do_diff3@Base 1.5
+ svn_ra_do_diff@Base 1.4
+ svn_ra_do_status2@Base 1.5
+ svn_ra_do_status@Base 1.4
+ svn_ra_do_switch2@Base 1.5
+ svn_ra_do_switch@Base 1.4
+ svn_ra_do_update2@Base 1.5
+ svn_ra_do_update@Base 1.4
+ svn_ra_get_commit_editor2@Base 1.4
+ svn_ra_get_commit_editor3@Base 1.5
+ svn_ra_get_commit_editor@Base 1.4
+ svn_ra_get_dated_revision@Base 1.4
+ svn_ra_get_deleted_rev@Base 1.6
+ svn_ra_get_dir2@Base 1.4
+ svn_ra_get_dir@Base 1.4
+ svn_ra_get_file@Base 1.4
+ svn_ra_get_file_revs2@Base 1.5
+ svn_ra_get_file_revs@Base 1.4
+ svn_ra_get_latest_revnum@Base 1.4
+ svn_ra_get_location_segments@Base 1.5
+ svn_ra_get_locations@Base 1.4
+ svn_ra_get_lock@Base 1.4
+ svn_ra_get_locks@Base 1.4
+ svn_ra_get_log2@Base 1.5
+ svn_ra_get_log@Base 1.4
+ svn_ra_get_mergeinfo@Base 1.5
+ svn_ra_get_ra_library@Base 1.4
+ svn_ra_get_repos_root2@Base 1.5
+ svn_ra_get_repos_root@Base 1.4
+ svn_ra_get_session_url@Base 1.5
+ svn_ra_get_uuid2@Base 1.5
+ svn_ra_get_uuid@Base 1.4
+ svn_ra_has_capability@Base 1.5
+ svn_ra_init_ra_libs@Base 1.4
+ svn_ra_initialize@Base 1.4
+ svn_ra_lock@Base 1.4
+ svn_ra_open2@Base 1.4
+ svn_ra_open3@Base 1.5
+ svn_ra_open@Base 1.4
+ svn_ra_print_modules@Base 1.4
+ svn_ra_print_ra_libraries@Base 1.4
+ svn_ra_reparent@Base 1.4
+ svn_ra_replay@Base 1.4
+ svn_ra_replay_range@Base 1.5
+ svn_ra_rev_prop@Base 1.4
+ svn_ra_rev_proplist@Base 1.4
+ svn_ra_stat@Base 1.4
+ svn_ra_unlock@Base 1.4
+ svn_ra_version@Base 1.4
+libsvn_ra_svn-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_ra_svn_conn_remote_host@Base 1.6
+ svn_ra_svn_cram_server@Base 1.4
+ svn_ra_svn_create_conn@Base 1.4
+ svn_ra_svn_drive_editor2@Base 1.4
+ svn_ra_svn_drive_editor@Base 1.4
+ svn_ra_svn_end_list@Base 1.4
+ svn_ra_svn_flush@Base 1.4
+ svn_ra_svn_get_editor@Base 1.4
+ svn_ra_svn_handle_commands2@Base 1.6
+ svn_ra_svn_handle_commands@Base 1.4
+ svn_ra_svn_has_capability@Base 1.4
+ svn_ra_svn_init@Base 1.4
+ svn_ra_svn_parse_proplist@Base 1.5
+ svn_ra_svn_parse_tuple@Base 1.4
+ svn_ra_svn_read_cmd_response@Base 1.4
+ svn_ra_svn_read_item@Base 1.4
+ svn_ra_svn_read_tuple@Base 1.4
+ svn_ra_svn_set_capabilities@Base 1.4
+ svn_ra_svn_skip_leading_garbage@Base 1.4
+ svn_ra_svn_start_list@Base 1.4
+ svn_ra_svn_version@Base 1.4
+ svn_ra_svn_write_cmd@Base 1.4
+ svn_ra_svn_write_cmd_failure@Base 1.4
+ svn_ra_svn_write_cmd_response@Base 1.4
+ svn_ra_svn_write_cstring@Base 1.4
+ svn_ra_svn_write_number@Base 1.4
+ svn_ra_svn_write_proplist@Base 1.5
+ svn_ra_svn_write_string@Base 1.4
+ svn_ra_svn_write_tuple@Base 1.4
+ svn_ra_svn_write_word@Base 1.4
+libsvn_repos-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_repos_abort_report@Base 1.4
+ svn_repos_authz_check_access@Base 1.4
+ svn_repos_authz_read@Base 1.4
+ svn_repos_begin_report2@Base 1.5
+ svn_repos_begin_report@Base 1.4
+ svn_repos_check_revision_access@Base 1.5
+ svn_repos_conf_dir@Base 1.4
+ svn_repos_create@Base 1.4
+ svn_repos_dated_revision@Base 1.4
+ svn_repos_db_env@Base 1.4
+ svn_repos_db_lockfile@Base 1.4
+ svn_repos_db_logfiles@Base 1.4
+ svn_repos_db_logs_lockfile@Base 1.4
+ svn_repos_delete@Base 1.4
+ svn_repos_delete_path@Base 1.4
+ svn_repos_deleted_rev@Base 1.5
+ svn_repos_dir_delta2@Base 1.5
+ svn_repos_dir_delta@Base 1.4
+ svn_repos_dump_fs2@Base 1.4
+ svn_repos_dump_fs@Base 1.4
+ svn_repos_find_root_path@Base 1.4
+ svn_repos_finish_report@Base 1.4
+ svn_repos_fs@Base 1.4
+ svn_repos_fs_begin_txn_for_commit2@Base 1.5
+ svn_repos_fs_begin_txn_for_commit@Base 1.4
+ svn_repos_fs_begin_txn_for_update@Base 1.4
+ svn_repos_fs_change_node_prop@Base 1.4
+ svn_repos_fs_change_rev_prop2@Base 1.4
+ svn_repos_fs_change_rev_prop3@Base 1.5
+ svn_repos_fs_change_rev_prop@Base 1.4
+ svn_repos_fs_change_txn_prop@Base 1.4
+ svn_repos_fs_change_txn_props@Base 1.5
+ svn_repos_fs_commit_txn@Base 1.4
+ svn_repos_fs_get_locks@Base 1.4
+ svn_repos_fs_get_mergeinfo@Base 1.5
+ svn_repos_fs_lock@Base 1.4
+ svn_repos_fs_pack@Base 1.6
+ svn_repos_fs_revision_prop@Base 1.4
+ svn_repos_fs_revision_proplist@Base 1.4
+ svn_repos_fs_unlock@Base 1.4
+ svn_repos_get_commit_editor2@Base 1.4
+ svn_repos_get_commit_editor3@Base 1.4
+ svn_repos_get_commit_editor4@Base 1.4
+ svn_repos_get_commit_editor5@Base 1.5
+ svn_repos_get_commit_editor@Base 1.4
+ svn_repos_get_committed_info@Base 1.4
+ svn_repos_get_file_revs2@Base 1.5
+ svn_repos_get_file_revs@Base 1.4
+ svn_repos_get_fs_build_parser2@Base 1.4
+ svn_repos_get_fs_build_parser@Base 1.4
+ svn_repos_get_logs2@Base 1.4
+ svn_repos_get_logs3@Base 1.4
+ svn_repos_get_logs4@Base 1.5
+ svn_repos_get_logs@Base 1.4
+ svn_repos_has_capability@Base 1.5
+ svn_repos_history2@Base 1.4
+ svn_repos_history@Base 1.4
+ svn_repos_hook_dir@Base 1.4
+ svn_repos_hotcopy@Base 1.4
+ svn_repos_link_path2@Base 1.4
+ svn_repos_link_path3@Base 1.5
+ svn_repos_link_path@Base 1.4
+ svn_repos_load_fs2@Base 1.4
+ svn_repos_load_fs@Base 1.4
+ svn_repos_lock_dir@Base 1.4
+ svn_repos_node_editor@Base 1.4
+ svn_repos_node_from_baton@Base 1.4
+ svn_repos_node_location_segments@Base 1.5
+ svn_repos_open@Base 1.4
+ svn_repos_parse_dumpstream2@Base 1.4
+ svn_repos_parse_dumpstream@Base 1.4
+ svn_repos_path@Base 1.4
+ svn_repos_post_commit_hook@Base 1.4
+ svn_repos_post_lock_hook@Base 1.4
+ svn_repos_post_revprop_change_hook@Base 1.4
+ svn_repos_post_unlock_hook@Base 1.4
+ svn_repos_pre_commit_hook@Base 1.4
+ svn_repos_pre_lock_hook@Base 1.4
+ svn_repos_pre_revprop_change_hook@Base 1.4
+ svn_repos_pre_unlock_hook@Base 1.4
+ svn_repos_recover2@Base 1.4
+ svn_repos_recover3@Base 1.5
+ svn_repos_recover@Base 1.4
+ svn_repos_remember_client_capabilities@Base 1.5
+ svn_repos_replay2@Base 1.4
+ svn_repos_replay@Base 1.4
+ svn_repos_set_path2@Base 1.4
+ svn_repos_set_path3@Base 1.5
+ svn_repos_set_path@Base 1.4
+ svn_repos_start_commit_hook@Base 1.4
+ svn_repos_stat@Base 1.4
+ svn_repos_svnserve_conf@Base 1.4
+ svn_repos_trace_node_locations@Base 1.4
+ svn_repos_upgrade@Base 1.5
+ svn_repos_verify_fs@Base 1.5
+ svn_repos_version@Base 1.4
+libsvn_subr-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_auth_first_credentials@Base 1.4
+ svn_auth_get_parameter@Base 1.4
+ svn_auth_get_platform_specific_client_providers@Base 1.6
+ svn_auth_get_platform_specific_provider@Base 1.6
+ svn_auth_get_simple_prompt_provider@Base 1.4
+ svn_auth_get_simple_provider2@Base 1.6
+ svn_auth_get_simple_provider@Base 1.4
+ svn_auth_get_ssl_client_cert_file_provider@Base 1.4
+ svn_auth_get_ssl_client_cert_prompt_provider@Base 1.4
+ svn_auth_get_ssl_client_cert_pw_file_provider2@Base 1.6
+ svn_auth_get_ssl_client_cert_pw_file_provider@Base 1.4
+ svn_auth_get_ssl_client_cert_pw_prompt_provider@Base 1.4
+ svn_auth_get_ssl_server_trust_file_provider@Base 1.4
+ svn_auth_get_ssl_server_trust_prompt_provider@Base 1.4
+ svn_auth_get_username_prompt_provider@Base 1.4
+ svn_auth_get_username_provider@Base 1.4
+ svn_auth_next_credentials@Base 1.4
+ svn_auth_open@Base 1.4
+ svn_auth_save_credentials@Base 1.4
+ svn_auth_set_parameter@Base 1.4
+ svn_auth_ssl_server_cert_info_dup@Base 1.4
+ svn_base64_decode@Base 1.4
+ svn_base64_decode_string@Base 1.4
+ svn_base64_encode@Base 1.4
+ svn_base64_encode_string2@Base 1.6
+ svn_base64_encode_string@Base 1.4
+ svn_base64_from_md5@Base 1.4
+ svn_categorize_props@Base 1.4
+ svn_checksum@Base 1.6
+ svn_checksum_clear@Base 1.6
+ svn_checksum_create@Base 1.6
+ svn_checksum_ctx_create@Base 1.6
+ svn_checksum_dup@Base 1.6
+ svn_checksum_empty_checksum@Base 1.6
+ svn_checksum_final@Base 1.6
+ svn_checksum_match@Base 1.6
+ svn_checksum_parse_hex@Base 1.6
+ svn_checksum_size@Base 1.6
+ svn_checksum_to_cstring@Base 1.6
+ svn_checksum_to_cstring_display@Base 1.6
+ svn_checksum_update@Base 1.6
+ svn_cmdline_auth_plaintext_passphrase_prompt@Base 1.6
+ svn_cmdline_auth_plaintext_prompt@Base 1.6
+ svn_cmdline_auth_simple_prompt@Base 1.4
+ svn_cmdline_auth_ssl_client_cert_prompt@Base 1.4
+ svn_cmdline_auth_ssl_client_cert_pw_prompt@Base 1.4
+ svn_cmdline_auth_ssl_server_trust_prompt@Base 1.4
+ svn_cmdline_auth_username_prompt@Base 1.4
+ svn_cmdline_create_auth_baton@Base 1.6
+ svn_cmdline_cstring_from_utf8@Base 1.4
+ svn_cmdline_cstring_from_utf8_fuzzy@Base 1.4
+ svn_cmdline_cstring_to_utf8@Base 1.4
+ svn_cmdline_fflush@Base 1.4
+ svn_cmdline_fprintf@Base 1.4
+ svn_cmdline_fputs@Base 1.4
+ svn_cmdline_handle_exit_error@Base 1.4
+ svn_cmdline_init@Base 1.4
+ svn_cmdline_output_encoding@Base 1.4
+ svn_cmdline_path_local_style_from_utf8@Base 1.4
+ svn_cmdline_printf@Base 1.4
+ svn_cmdline_prompt_user2@Base 1.5
+ svn_cmdline_prompt_user@Base 1.4
+ svn_cmdline_setup_auth_baton@Base 1.4
+ svn_commit_info_dup@Base 1.4
+ svn_compat_log_revprops_clear@Base 1.5
+ svn_compat_log_revprops_in@Base 1.5
+ svn_compat_log_revprops_out@Base 1.5
+ svn_compat_wrap_commit_callback@Base 1.4
+ svn_compat_wrap_log_receiver@Base 1.5
+ svn_config_ensure@Base 1.4
+ svn_config_enumerate2@Base 1.4
+ svn_config_enumerate@Base 1.4
+ svn_config_enumerate_sections2@Base 1.4
+ svn_config_enumerate_sections@Base 1.4
+ svn_config_find_group@Base 1.4
+ svn_config_get@Base 1.4
+ svn_config_get_bool@Base 1.4
+ svn_config_get_config@Base 1.4
+ svn_config_get_server_setting@Base 1.4
+ svn_config_get_server_setting_bool@Base 1.6
+ svn_config_get_server_setting_int@Base 1.4
+ svn_config_get_user_config_path@Base 1.6
+ svn_config_get_yes_no_ask@Base 1.6
+ svn_config_has_section@Base 1.4
+ svn_config_merge@Base 1.4
+ svn_config_read@Base 1.4
+ svn_config_read_auth_data@Base 1.4
+ svn_config_set@Base 1.4
+ svn_config_set_bool@Base 1.4
+ svn_config_write_auth_data@Base 1.4
+ svn_create_commit_info@Base 1.4
+ svn_cstring_casecmp@Base 1.5
+ svn_cstring_count_newlines@Base 1.4
+ svn_cstring_join@Base 1.4
+ svn_cstring_match_glob_list@Base 1.4
+ svn_cstring_split@Base 1.4
+ svn_cstring_split_append@Base 1.4
+ svn_ctype_casecmp@Base 1.5
+ svn_ctype_table@Base 1.4
+ svn_ctype_table_internal@Base 1.5
+ svn_depth_from_word@Base 1.5
+ svn_depth_to_word@Base 1.5
+ svn_dirent_canonicalize@Base 1.6
+ svn_dirent_dirname@Base 1.6
+ svn_dirent_dup@Base 1.4
+ svn_dirent_get_absolute@Base 1.6
+ svn_dirent_get_longest_ancestor@Base 1.6
+ svn_dirent_internal_style@Base 1.6
+ svn_dirent_is_absolute@Base 1.6
+ svn_dirent_is_ancestor@Base 1.6
+ svn_dirent_is_canonical@Base 1.6
+ svn_dirent_is_child@Base 1.6
+ svn_dirent_is_root@Base 1.5
+ svn_dirent_join@Base 1.6
+ svn_dirent_join_many@Base 1.6
+ svn_dirent_local_style@Base 1.6
+ svn_dso_initialize2@Base 1.6
+ svn_dso_initialize@Base 1.4
+ svn_dso_load@Base 1.4
+ svn_err_best_message@Base 1.4
+ svn_error__locate@Base 1.0
+ svn_error_abort_on_malfunction@Base 1.6
+ svn_error_clear@Base 1.4
+ svn_error_compose@Base 1.4
+ svn_error_compose_create@Base 1.6
+ svn_error_create@Base 1.4
+ svn_error_createf@Base 1.4
+ svn_error_dup@Base 1.4
+ svn_error_quick_wrap@Base 1.4
+ svn_error_raise_on_malfunction@Base 1.6
+ svn_error_root_cause@Base 1.5
+ svn_error_set_malfunction_handler@Base 1.6
+ svn_error_wrap_apr@Base 1.4
+ svn_handle_error2@Base 1.4
+ svn_handle_error@Base 1.4
+ svn_handle_warning2@Base 1.4
+ svn_handle_warning@Base 1.4
+ svn_hash_diff@Base 1.4
+ svn_hash_from_cstring_keys@Base 1.5
+ svn_hash_keys@Base 1.5
+ svn_hash_read2@Base 1.4
+ svn_hash_read@Base 1.4
+ svn_hash_read_incremental@Base 1.4
+ svn_hash_write2@Base 1.4
+ svn_hash_write@Base 1.4
+ svn_hash_write_incremental@Base 1.4
+ svn_inheritance_from_word@Base 1.5
+ svn_inheritance_to_word@Base 1.5
+ svn_io_append_file@Base 1.4
+ svn_io_check_path@Base 1.4
+ svn_io_check_resolved_path@Base 1.4
+ svn_io_check_special_path@Base 1.4
+ svn_io_copy_dir_recursively@Base 1.4
+ svn_io_copy_file@Base 1.4
+ svn_io_copy_link@Base 1.4
+ svn_io_copy_perms@Base 1.6
+ svn_io_create_unique_link@Base 1.4
+ svn_io_detect_mimetype2@Base 1.5
+ svn_io_detect_mimetype@Base 1.4
+ svn_io_dir_empty@Base 1.4
+ svn_io_dir_file_copy@Base 1.4
+ svn_io_dir_make@Base 1.4
+ svn_io_dir_make_hidden@Base 1.4
+ svn_io_dir_make_sgid@Base 1.4
+ svn_io_dir_open@Base 1.4
+ svn_io_dir_read@Base 1.4
+ svn_io_dir_remove_nonrecursive@Base 1.4
+ svn_io_dir_walk@Base 1.4
+ svn_io_file_affected_time@Base 1.4
+ svn_io_file_checksum2@Base 1.6
+ svn_io_file_checksum@Base 1.4
+ svn_io_file_close@Base 1.4
+ svn_io_file_create@Base 1.4
+ svn_io_file_flush_to_disk@Base 1.4
+ svn_io_file_getc@Base 1.4
+ svn_io_file_info_get@Base 1.4
+ svn_io_file_lock2@Base 1.4
+ svn_io_file_lock@Base 1.4
+ svn_io_file_move@Base 1.4
+ svn_io_file_open@Base 1.4
+ svn_io_file_read@Base 1.4
+ svn_io_file_read_full@Base 1.4
+ svn_io_file_rename@Base 1.4
+ svn_io_file_seek@Base 1.4
+ svn_io_file_trunc@Base 1.6
+ svn_io_file_write@Base 1.4
+ svn_io_file_write_full@Base 1.4
+ svn_io_files_contents_same_p@Base 1.4
+ svn_io_filesizes_different_p@Base 1.4
+ svn_io_get_dir_filenames@Base 1.4
+ svn_io_get_dirents2@Base 1.4
+ svn_io_get_dirents@Base 1.4
+ svn_io_is_file_executable@Base 1.4
+ svn_io_make_dir_recursively@Base 1.4
+ svn_io_open_unique_file2@Base 1.4
+ svn_io_open_unique_file3@Base 1.6
+ svn_io_open_unique_file@Base 1.4
+ svn_io_open_uniquely_named@Base 1.6
+ svn_io_parse_mimetypes_file@Base 1.5
+ svn_io_read_length_line@Base 1.4
+ svn_io_read_link@Base 1.4
+ svn_io_read_version_file@Base 1.4
+ svn_io_remove_dir2@Base 1.5
+ svn_io_remove_dir@Base 1.4
+ svn_io_remove_file@Base 1.4
+ svn_io_run_cmd@Base 1.4
+ svn_io_run_diff2@Base 1.6
+ svn_io_run_diff3@Base 1.4
+ svn_io_run_diff3_2@Base 1.4
+ svn_io_run_diff3_3@Base 1.6
+ svn_io_run_diff@Base 1.4
+ svn_io_set_file_affected_time@Base 1.4
+ svn_io_set_file_executable@Base 1.4
+ svn_io_set_file_read_only@Base 1.4
+ svn_io_set_file_read_write@Base 1.4
+ svn_io_set_file_read_write_carefully@Base 1.4
+ svn_io_sleep_for_timestamps@Base 1.6
+ svn_io_start_cmd@Base 1.4
+ svn_io_stat@Base 1.4
+ svn_io_temp_dir@Base 1.4
+ svn_io_wait_for_cmd@Base 1.4
+ svn_io_write_unique@Base 1.6
+ svn_io_write_version_file@Base 1.4
+ svn_iter__break@Base 1.5
+ svn_iter_apr_array@Base 1.5
+ svn_iter_apr_hash@Base 1.5
+ svn_location_segment_dup@Base 1.5
+ svn_lock_create@Base 1.4
+ svn_lock_dup@Base 1.4
+ svn_log_changed_path2_create@Base 1.6
+ svn_log_changed_path2_dup@Base 1.6
+ svn_log_changed_path_dup@Base 1.4
+ svn_log_entry_create@Base 1.5
+ svn_log_entry_dup@Base 1.6
+ svn_md5_digest_to_cstring@Base 1.4
+ svn_md5_digest_to_cstring_display@Base 1.4
+ svn_md5_digests_match@Base 1.4
+ svn_md5_empty_string_digest@Base 1.4
+ svn_merge_range_contains_rev@Base 1.5
+ svn_merge_range_dup@Base 1.5
+ svn_mergeinfo_catalog_dup@Base 1.6
+ svn_mergeinfo_diff@Base 1.5
+ svn_mergeinfo_dup@Base 1.5
+ svn_mergeinfo_inheritable@Base 1.5
+ svn_mergeinfo_intersect@Base 1.5
+ svn_mergeinfo_merge@Base 1.5
+ svn_mergeinfo_parse@Base 1.5
+ svn_mergeinfo_remove@Base 1.5
+ svn_mergeinfo_sort@Base 1.5
+ svn_mergeinfo_to_string@Base 1.5
+ svn_mime_type_is_binary@Base 1.4
+ svn_mime_type_validate@Base 1.4
+ svn_nls_init@Base 1.4
+ svn_node_kind_from_word@Base 1.6
+ svn_node_kind_to_word@Base 1.6
+ svn_opt_args_to_target_array2@Base 1.4
+ svn_opt_args_to_target_array3@Base 1.5
+ svn_opt_args_to_target_array@Base 1.4
+ svn_opt_format_option@Base 1.4
+ svn_opt_get_canonical_subcommand2@Base 1.4
+ svn_opt_get_canonical_subcommand@Base 1.4
+ svn_opt_get_option_from_code2@Base 1.4
+ svn_opt_get_option_from_code@Base 1.4
+ svn_opt_parse_all_args@Base 1.4
+ svn_opt_parse_num_args@Base 1.4
+ svn_opt_parse_path@Base 1.4
+ svn_opt_parse_revision@Base 1.4
+ svn_opt_parse_revision_to_range@Base 1.5
+ svn_opt_parse_revprop@Base 1.6
+ svn_opt_print_generic_help2@Base 1.4
+ svn_opt_print_generic_help@Base 1.4
+ svn_opt_print_help2@Base 1.4
+ svn_opt_print_help3@Base 1.5
+ svn_opt_print_help@Base 1.4
+ svn_opt_push_implicit_dot_target@Base 1.4
+ svn_opt_resolve_revisions@Base 1.5
+ svn_opt_subcommand_help2@Base 1.4
+ svn_opt_subcommand_help3@Base 1.5
+ svn_opt_subcommand_help@Base 1.4
+ svn_opt_subcommand_takes_option2@Base 1.4
+ svn_opt_subcommand_takes_option3@Base 1.5
+ svn_opt_subcommand_takes_option@Base 1.4
+ svn_parse_date@Base 1.4
+ svn_path_add_component@Base 1.4
+ svn_path_basename@Base 1.4
+ svn_path_canonicalize@Base 1.4
+ svn_path_check_valid@Base 1.4
+ svn_path_compare_paths@Base 1.4
+ svn_path_component_count@Base 1.4
+ svn_path_compose@Base 1.5
+ svn_path_condense_targets@Base 1.4
+ svn_path_cstring_from_utf8@Base 1.4
+ svn_path_cstring_to_utf8@Base 1.4
+ svn_path_decompose@Base 1.4
+ svn_path_dirname@Base 1.4
+ svn_path_get_absolute@Base 1.4
+ svn_path_get_longest_ancestor@Base 1.4
+ svn_path_internal_style@Base 1.4
+ svn_path_is_ancestor@Base 1.4
+ svn_path_is_backpath_present@Base 1.4
+ svn_path_is_canonical@Base 1.5
+ svn_path_is_child@Base 1.4
+ svn_path_is_dotpath_present@Base 1.6
+ svn_path_is_empty@Base 1.4
+ svn_path_is_single_path_component@Base 1.4
+ svn_path_is_uri_safe@Base 1.4
+ svn_path_is_url@Base 1.4
+ svn_path_join@Base 1.4
+ svn_path_join_many@Base 1.4
+ svn_path_local_style@Base 1.4
+ svn_path_remove_component@Base 1.4
+ svn_path_remove_components@Base 1.4
+ svn_path_remove_redundancies@Base 1.4
+ svn_path_split@Base 1.4
+ svn_path_split_if_file@Base 1.4
+ svn_path_splitext@Base 1.5
+ svn_path_uri_autoescape@Base 1.4
+ svn_path_uri_decode@Base 1.4
+ svn_path_uri_encode@Base 1.4
+ svn_path_uri_from_iri@Base 1.4
+ svn_path_url_add_component2@Base 1.6
+ svn_path_url_add_component@Base 1.4
+ svn_pool_create_ex@Base 1.4
+ svn_pool_create_ex_debug@Base 1.4
+ svn_prop_array_dup@Base 1.4
+ svn_prop_diffs@Base 1.4
+ svn_prop_dup@Base 1.4
+ svn_prop_has_svn_prop@Base 1.5
+ svn_prop_hash_dup@Base 1.6
+ svn_prop_hash_to_array@Base 1.5
+ svn_prop_is_boolean@Base 1.5
+ svn_prop_is_svn_prop@Base 1.4
+ svn_prop_name_is_valid@Base 1.5
+ svn_prop_needs_translation@Base 1.4
+ svn_property_kind@Base 1.4
+ svn_quoprint_decode@Base 1.4
+ svn_quoprint_decode_string@Base 1.4
+ svn_quoprint_encode@Base 1.4
+ svn_quoprint_encode_string@Base 1.4
+ svn_rangelist_diff@Base 1.5
+ svn_rangelist_dup@Base 1.5
+ svn_rangelist_inheritable@Base 1.5
+ svn_rangelist_intersect@Base 1.5
+ svn_rangelist_merge@Base 1.5
+ svn_rangelist_remove@Base 1.5
+ svn_rangelist_reverse@Base 1.5
+ svn_rangelist_to_string@Base 1.5
+ svn_revnum_parse@Base 1.5
+ svn_sleep_for_timestamps@Base 1.4
+# FIXME: rapidsvn needs svn_sort__hash, but shouldn't.  #607544
+ svn_sort__hash@Base 1.0
+ svn_sort_compare_items_as_paths@Base 1.4
+ svn_sort_compare_items_lexically@Base 1.4
+ svn_sort_compare_paths@Base 1.4
+ svn_sort_compare_ranges@Base 1.5
+ svn_sort_compare_revisions@Base 1.4
+ svn_stream_checksummed2@Base 1.6
+ svn_stream_checksummed@Base 1.4
+ svn_stream_close@Base 1.4
+ svn_stream_compressed@Base 1.4
+ svn_stream_contents_same@Base 1.4
+ svn_stream_copy2@Base 1.5
+ svn_stream_copy3@Base 1.6
+ svn_stream_copy@Base 1.4
+ svn_stream_create@Base 1.4
+ svn_stream_disown@Base 1.4
+ svn_stream_empty@Base 1.4
+ svn_stream_for_stdout@Base 1.4
+ svn_stream_from_aprfile2@Base 1.4
+ svn_stream_from_aprfile@Base 1.4
+ svn_stream_from_string@Base 1.6
+ svn_stream_from_stringbuf@Base 1.4
+ svn_stream_open_readonly@Base 1.6
+ svn_stream_open_unique@Base 1.6
+ svn_stream_open_writable@Base 1.6
+ svn_stream_printf@Base 1.4
+ svn_stream_printf_from_utf8@Base 1.4
+ svn_stream_read@Base 1.4
+ svn_stream_readline@Base 1.4
+ svn_stream_set_baton@Base 1.4
+ svn_stream_set_close@Base 1.4
+ svn_stream_set_read@Base 1.4
+ svn_stream_set_write@Base 1.4
+ svn_stream_write@Base 1.4
+ svn_strerror@Base 1.4
+ svn_string_compare@Base 1.4
+ svn_string_compare_stringbuf@Base 1.4
+ svn_string_create@Base 1.4
+ svn_string_create_from_buf@Base 1.4
+ svn_string_createf@Base 1.4
+ svn_string_createv@Base 1.4
+ svn_string_dup@Base 1.4
+ svn_string_find_char_backward@Base 1.4
+ svn_string_first_non_whitespace@Base 1.4
+ svn_string_from_stream@Base 1.6
+ svn_string_isempty@Base 1.4
+ svn_string_ncreate@Base 1.4
+ svn_stringbuf_appendbytes@Base 1.4
+ svn_stringbuf_appendcstr@Base 1.4
+ svn_stringbuf_appendstr@Base 1.4
+ svn_stringbuf_chop@Base 1.4
+ svn_stringbuf_compare@Base 1.4
+ svn_stringbuf_create@Base 1.4
+ svn_stringbuf_create_ensure@Base 1.6
+ svn_stringbuf_create_from_string@Base 1.4
+ svn_stringbuf_createf@Base 1.4
+ svn_stringbuf_createv@Base 1.4
+ svn_stringbuf_dup@Base 1.4
+ svn_stringbuf_ensure@Base 1.4
+ svn_stringbuf_fillchar@Base 1.4
+ svn_stringbuf_find_char_backward@Base 1.4
+ svn_stringbuf_first_non_whitespace@Base 1.4
+ svn_stringbuf_from_aprfile@Base 1.4
+ svn_stringbuf_from_file2@Base 1.5
+ svn_stringbuf_from_file@Base 1.4
+ svn_stringbuf_isempty@Base 1.4
+ svn_stringbuf_ncreate@Base 1.4
+ svn_stringbuf_set@Base 1.4
+ svn_stringbuf_setempty@Base 1.4
+ svn_stringbuf_strip_whitespace@Base 1.4
+ svn_subr_version@Base 1.4
+ svn_subst_build_keywords2@Base 1.4
+ svn_subst_build_keywords@Base 1.4
+ svn_subst_copy_and_translate2@Base 1.4
+ svn_subst_copy_and_translate3@Base 1.4
+ svn_subst_copy_and_translate@Base 1.4
+ svn_subst_create_specialfile@Base 1.6
+ svn_subst_detranslate_string@Base 1.4
+ svn_subst_eol_style_from_value@Base 1.4
+ svn_subst_keywords_differ2@Base 1.4
+ svn_subst_keywords_differ@Base 1.4
+ svn_subst_read_specialfile@Base 1.6
+ svn_subst_stream_detranslated@Base 1.4
+ svn_subst_stream_from_specialfile@Base 1.5
+ svn_subst_stream_translated@Base 1.4
+ svn_subst_stream_translated_to_normal_form@Base 1.5
+ svn_subst_translate_cstring2@Base 1.4
+ svn_subst_translate_cstring@Base 1.4
+ svn_subst_translate_stream2@Base 1.4
+ svn_subst_translate_stream3@Base 1.4
+ svn_subst_translate_stream@Base 1.4
+ svn_subst_translate_string@Base 1.4
+ svn_subst_translate_to_normal_form@Base 1.4
+ svn_subst_translation_required@Base 1.4
+ svn_time_from_cstring@Base 1.4
+ svn_time_to_cstring@Base 1.4
+ svn_time_to_human_cstring@Base 1.4
+ svn_uri_canonicalize@Base 1.6
+ svn_uri_dirname@Base 1.6
+ svn_uri_get_longest_ancestor@Base 1.6
+ svn_uri_internal_style@Base 1.6
+ svn_uri_is_absolute@Base 1.6
+ svn_uri_is_ancestor@Base 1.6
+ svn_uri_is_canonical@Base 1.6
+ svn_uri_is_child@Base 1.6
+ svn_uri_is_root@Base 1.6
+ svn_uri_local_style@Base 1.6
+ svn_user_get_homedir@Base 1.4
+ svn_user_get_name@Base 1.4
+ svn_utf_cstring_from_utf8@Base 1.4
+ svn_utf_cstring_from_utf8_ex2@Base 1.4
+ svn_utf_cstring_from_utf8_ex@Base 1.4
+ svn_utf_cstring_from_utf8_fuzzy@Base 1.4
+ svn_utf_cstring_from_utf8_string@Base 1.4
+ svn_utf_cstring_from_utf8_stringbuf@Base 1.4
+ svn_utf_cstring_to_utf8@Base 1.4
+ svn_utf_cstring_to_utf8_ex2@Base 1.4
+ svn_utf_cstring_to_utf8_ex@Base 1.4
+ svn_utf_initialize@Base 1.4
+ svn_utf_string_from_utf8@Base 1.4
+ svn_utf_string_to_utf8@Base 1.4
+ svn_utf_stringbuf_from_utf8@Base 1.4
+ svn_utf_stringbuf_to_utf8@Base 1.4
+ svn_uuid_generate@Base 1.4
+ svn_ver_check_list@Base 1.4
+ svn_ver_compatible@Base 1.4
+ svn_ver_equal@Base 1.4
+ svn_xml_ap_to_hash@Base 1.4
+ svn_xml_escape_attr_cstring@Base 1.4
+ svn_xml_escape_attr_string@Base 1.4
+ svn_xml_escape_attr_stringbuf@Base 1.4
+ svn_xml_escape_cdata_cstring@Base 1.4
+ svn_xml_escape_cdata_string@Base 1.4
+ svn_xml_escape_cdata_stringbuf@Base 1.4
+ svn_xml_free_parser@Base 1.4
+ svn_xml_fuzzy_escape@Base 1.4
+ svn_xml_get_attr_value@Base 1.4
+ svn_xml_hash_atts_overlaying@Base 1.4
+ svn_xml_hash_atts_preserving@Base 1.4
+ svn_xml_is_xml_safe@Base 1.4
+ svn_xml_make_att_hash@Base 1.4
+ svn_xml_make_close_tag@Base 1.4
+ svn_xml_make_header@Base 1.4
+ svn_xml_make_open_tag@Base 1.4
+ svn_xml_make_open_tag_hash@Base 1.4
+ svn_xml_make_open_tag_v@Base 1.4
+ svn_xml_make_parser@Base 1.4
+ svn_xml_parse@Base 1.4
+ svn_xml_signal_bailout@Base 1.4
+libsvn_wc-1.so.1 libsvn1 #MINVER#
+| libsvn-private
+* Build-Depends-Package: libsvn-dev
+ (regex)__ 0 1
+ svn_wc_add2@Base 1.4
+ svn_wc_add3@Base 1.6
+ svn_wc_add@Base 1.4
+ svn_wc_add_lock@Base 1.4
+ svn_wc_add_repos_file2@Base 1.4
+ svn_wc_add_repos_file3@Base 1.6
+ svn_wc_add_repos_file@Base 1.4
+ svn_wc_adm_access_path@Base 1.4
+ svn_wc_adm_access_pool@Base 1.4
+ svn_wc_adm_close2@Base 1.6
+ svn_wc_adm_close@Base 1.4
+ svn_wc_adm_locked@Base 1.4
+ svn_wc_adm_open2@Base 1.4
+ svn_wc_adm_open3@Base 1.4
+ svn_wc_adm_open@Base 1.4
+ svn_wc_adm_open_anchor@Base 1.4
+ svn_wc_adm_probe_open2@Base 1.4
+ svn_wc_adm_probe_open3@Base 1.4
+ svn_wc_adm_probe_open@Base 1.4
+ svn_wc_adm_probe_retrieve@Base 1.4
+ svn_wc_adm_probe_try2@Base 1.4
+ svn_wc_adm_probe_try3@Base 1.4
+ svn_wc_adm_probe_try@Base 1.4
+ svn_wc_adm_retrieve@Base 1.4
+ svn_wc_canonicalize_svn_prop@Base 1.5
+ svn_wc_check_wc@Base 1.4
+ svn_wc_cleanup2@Base 1.4
+ svn_wc_cleanup@Base 1.4
+ svn_wc_committed_queue_create@Base 1.5
+ svn_wc_conflict_description_create_prop@Base 1.6
+ svn_wc_conflict_description_create_text@Base 1.6
+ svn_wc_conflict_description_create_tree@Base 1.6
+ svn_wc_conflict_version_create@Base 1.6
+ svn_wc_conflict_version_dup@Base 1.6
+ svn_wc_conflicted_p2@Base 1.6
+ svn_wc_conflicted_p@Base 1.4
+ svn_wc_copy2@Base 1.4
+ svn_wc_copy@Base 1.4
+ svn_wc_crawl_revisions2@Base 1.4
+ svn_wc_crawl_revisions3@Base 1.5
+ svn_wc_crawl_revisions4@Base 1.6
+ svn_wc_crawl_revisions@Base 1.4
+ svn_wc_create_conflict_result@Base 1.5
+ svn_wc_create_notify@Base 1.4
+ svn_wc_create_notify_url@Base 1.6
+ svn_wc_create_tmp_file2@Base 1.4
+ svn_wc_create_tmp_file@Base 1.4
+ svn_wc_crop_tree@Base 1.6
+ svn_wc_delete2@Base 1.4
+ svn_wc_delete3@Base 1.5
+ svn_wc_delete@Base 1.4
+ svn_wc_diff2@Base 1.4
+ svn_wc_diff3@Base 1.4
+ svn_wc_diff4@Base 1.5
+ svn_wc_diff5@Base 1.6
+ svn_wc_diff@Base 1.4
+ svn_wc_dup_notify@Base 1.4
+ svn_wc_dup_status2@Base 1.4
+ svn_wc_dup_status@Base 1.4
+ svn_wc_edited_externals@Base 1.4
+ svn_wc_ensure_adm2@Base 1.4
+ svn_wc_ensure_adm3@Base 1.5
+ svn_wc_ensure_adm@Base 1.4
+ svn_wc_entries_read@Base 1.4
+ svn_wc_entry@Base 1.4
+ svn_wc_entry_dup@Base 1.4
+ svn_wc_external_item2_dup@Base 1.5
+ svn_wc_external_item_create@Base 1.5
+ svn_wc_external_item_dup@Base 1.4
+ svn_wc_get_actual_target@Base 1.4
+ svn_wc_get_adm_dir@Base 1.4
+ svn_wc_get_ancestry@Base 1.4
+ svn_wc_get_default_ignores@Base 1.4
+ svn_wc_get_diff_editor2@Base 1.4
+ svn_wc_get_diff_editor3@Base 1.4
+ svn_wc_get_diff_editor4@Base 1.5
+ svn_wc_get_diff_editor5@Base 1.6
+ svn_wc_get_diff_editor@Base 1.4
+ svn_wc_get_ignores@Base 1.4
+ svn_wc_get_pristine_contents@Base 1.6
+ svn_wc_get_pristine_copy_path@Base 1.4
+ svn_wc_get_prop_diffs@Base 1.4
+ svn_wc_get_status_editor2@Base 1.4
+ svn_wc_get_status_editor3@Base 1.5
+ svn_wc_get_status_editor4@Base 1.6
+ svn_wc_get_status_editor@Base 1.4
+ svn_wc_get_switch_editor2@Base 1.4
+ svn_wc_get_switch_editor3@Base 1.5
+ svn_wc_get_switch_editor@Base 1.4
+ svn_wc_get_update_editor2@Base 1.4
+ svn_wc_get_update_editor3@Base 1.5
+ svn_wc_get_update_editor@Base 1.4
+ svn_wc_has_binary_prop@Base 1.4
+ svn_wc_init_traversal_info@Base 1.4
+ svn_wc_is_adm_dir@Base 1.4
+ svn_wc_is_entry_prop@Base 1.4
+ svn_wc_is_normal_prop@Base 1.4
+ svn_wc_is_wc_prop@Base 1.4
+ svn_wc_is_wc_root@Base 1.4
+ svn_wc_locked@Base 1.4
+ svn_wc_mark_missing_deleted@Base 1.4
+ svn_wc_match_ignore_list@Base 1.5
+ svn_wc_maybe_set_repos_root@Base 1.4
+ svn_wc_merge2@Base 1.4
+ svn_wc_merge3@Base 1.5
+ svn_wc_merge@Base 1.4
+ svn_wc_merge_prop_diffs@Base 1.4
+ svn_wc_merge_props2@Base 1.5
+ svn_wc_merge_props@Base 1.4
+ svn_wc_parse_externals_description2@Base 1.4
+ svn_wc_parse_externals_description3@Base 1.5
+ svn_wc_parse_externals_description@Base 1.4
+ svn_wc_process_committed2@Base 1.4
+ svn_wc_process_committed3@Base 1.4
+ svn_wc_process_committed4@Base 1.5
+ svn_wc_process_committed@Base 1.4
+ svn_wc_process_committed_queue@Base 1.5
+ svn_wc_prop_get@Base 1.4
+ svn_wc_prop_list@Base 1.4
+ svn_wc_prop_set2@Base 1.4
+ svn_wc_prop_set3@Base 1.6
+ svn_wc_prop_set@Base 1.4
+ svn_wc_props_modified_p@Base 1.4
+ svn_wc_queue_committed2@Base 1.6
+ svn_wc_queue_committed@Base 1.5
+ svn_wc_relocate2@Base 1.4
+ svn_wc_relocate3@Base 1.5
+ svn_wc_relocate@Base 1.4
+ svn_wc_remove_from_revision_control@Base 1.4
+ svn_wc_remove_lock@Base 1.4
+ svn_wc_resolved_conflict2@Base 1.4
+ svn_wc_resolved_conflict3@Base 1.5
+ svn_wc_resolved_conflict4@Base 1.6
+ svn_wc_resolved_conflict@Base 1.4
+ svn_wc_revert2@Base 1.4
+ svn_wc_revert3@Base 1.5
+ svn_wc_revert@Base 1.4
+ svn_wc_revision_status@Base 1.4
+ svn_wc_set_adm_dir@Base 1.4
+ svn_wc_set_changelist@Base 1.5
+ svn_wc_status2@Base 1.4
+ svn_wc_status@Base 1.4
+ svn_wc_status_set_repos_locks@Base 1.4
+ svn_wc_text_modified_p@Base 1.4
+ svn_wc_translated_file2@Base 1.4
+ svn_wc_translated_file@Base 1.4
+ svn_wc_translated_stream@Base 1.5
+ svn_wc_transmit_prop_deltas@Base 1.4
+ svn_wc_transmit_text_deltas2@Base 1.4
+ svn_wc_transmit_text_deltas@Base 1.4
+ svn_wc_traversed_depths@Base 1.5
+ svn_wc_version@Base 1.4
+ svn_wc_walk_entries2@Base 1.4
+ svn_wc_walk_entries3@Base 1.5
+ svn_wc_walk_entries@Base 1.4
--- subversion-1.6.17dfsg.orig/debian/libsvn1.lintian-overrides
+++ subversion-1.6.17dfsg/debian/libsvn1.lintian-overrides
@@ -0,0 +1,20 @@
+# These aren't really for external use; arguably should move to a subdir.
+shlib-missing-in-control-file libsvn_fs_util-1 *
+shlib-missing-in-control-file libsvn_fs_fs-1 *
+shlib-missing-in-control-file libsvn_ra_serf-1 *
+shlib-missing-in-control-file libsvn_ra_neon-1 *
+shlib-missing-in-control-file libsvn_ra_local-1 *
+shlib-missing-in-control-file libsvn_fs_base-1 *
+shlib-missing-in-control-file libsvn_auth_kwallet-1 *
+shlib-missing-in-control-file libsvn_auth_gnome_keyring-1 *
+# Intentional, so people don't try to use private symbols.
+symbols-declares-dependency-on-other-package libsvn-private
+# Harmless, fixed in dh compat level 8
+symbols-declared-but-not-shlib libsvn_ra_serf-1 1
+symbols-declared-but-not-shlib libsvn_fs_base-1 1
+symbols-declared-but-not-shlib libsvn_auth_gnome_keyring-1 1
+symbols-declared-but-not-shlib libsvn_fs_util-1 1
+symbols-declared-but-not-shlib libsvn_auth_kwallet-1 1
+symbols-declared-but-not-shlib libsvn_ra_neon-1 1
+symbols-declared-but-not-shlib libsvn_fs_fs-1 1
+symbols-declared-but-not-shlib libsvn_ra_local-1 1
--- subversion-1.6.17dfsg.orig/debian/python-subversion.lintian-overrides
+++ subversion-1.6.17dfsg/debian/python-subversion.lintian-overrides
@@ -0,0 +1,2 @@
+# nobody but us will ever link to this, so we don't ship a shlibs file
+no-shlibs-control-file usr/lib/*/libsvn_swig_py2.*-1.so.*
--- subversion-1.6.17dfsg.orig/debian/libsvn-java.install
+++ subversion-1.6.17dfsg/debian/libsvn-java.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/libsvnjavahl*.so*		usr/lib/jni
+debian/tmp/usr/share/java			usr/share
--- subversion-1.6.17dfsg.orig/debian/control
+++ subversion-1.6.17dfsg/debian/control
@@ -0,0 +1,165 @@
+Source: subversion
+Section: vcs
+Priority: optional
+Maintainer: Peter Samuelson <peter@p12n.org>
+Uploaders: Troy Heber <troyh@debian.org>,
+           Guilherme de S. Pastore <gpastore@debian.org>
+Build-Depends: debhelper, libneon27-gnutls-dev, zlib1g-dev,
+               libapr1-dev, libaprutil1-dev, libdb5.1-dev,
+               libsasl2-dev, apache2-threaded-dev,
+               libsqlite3-dev (>= 3.4), libgnome-keyring-dev, libdbus-1-dev, kdelibs5-dev,
+               quilt, doxygen, autotools-dev, autoconf, libtool, swig,
+               python-all-dev, python-support,
+               perl, libperl-dev, ruby1.8, ruby1.8-dev,
+               gcj-jdk (>= 4:4.4) [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386],
+               junit [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386]
+Build-Conflicts: libsvn-dev (<< 1.6)
+XS-Python-Version: >= 2.4, << 3.0
+Homepage: http://subversion.apache.org/
+Vcs-Svn: svn://svn.debian.org/pkg-subversion/src/1.6.x/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-subversion/src/1.6.x/
+Standards-Version: 3.9.3
+
+Package: subversion
+Architecture: any
+Depends: libsvn1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: subversion-tools, db5.1-util, patch
+Description: Advanced version control system
+ Subversion, also known as svn, is a version control system much like
+ the Concurrent Versions System (CVS).  Version control systems allow
+ many individuals (who may be distributed geographically) to
+ collaborate on a set of files (typically source code).  Subversion has
+ all the major features of CVS, plus certain new features that CVS
+ users often wish they had.
+ .
+ This package includes the Subversion client (svn), tools to create a
+ Subversion repository (svnadmin) and to make a repository available
+ over a network (svnserve).
+
+Package: libsvn1
+Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Shared libraries used by Subversion
+ This package includes shared libraries to manipulate Subversion (svn)
+ repositories and working copies.  See the 'subversion' package for
+ more information.
+
+Package: libsvn-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libsvn1 (= ${binary:Version}), libapr1-dev, libaprutil1-dev,
+         ${misc:Depends}
+Suggests: libsvn-doc, zlib1g-dev, libneon27-gnutls-dev
+Description: Development files for Subversion libraries
+ This package contains the symlinks, headers, and object files needed
+ to compile and link programs which use libsvn1, the Subversion
+ libraries.  This package is needed only in order to compile software
+ that uses libsvn1.
+
+Package: libsvn-doc
+Suggests: libsvn-dev
+Section: doc
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}
+Description: Developer documentation for libsvn
+ This package contains development (API) documentation for libsvn1, the
+ Subversion libraries.  See the 'libsvn1' package for more information.
+
+Package: libapache2-svn
+Section: httpd
+Architecture: any
+Depends: apache2.2-common, ${shlibs:Depends}, ${misc:Depends}
+Suggests: db5.1-util
+Description: Subversion server modules for Apache
+ This package provides the mod_dav_svn and mod_authz_svn modules for
+ the Apache 2.2 web server.  These modules provide Subversion's WebDAV
+ server backend, to serve repositories over the http and https
+ protocols.  See the 'subversion' package for more information.
+
+Package: python-subversion
+Section: python
+Architecture: any
+Pre-Depends: multiarch-support
+Depends: subversion, ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for Subversion
+ This is a set of Python interfaces to libsvn, the Subversion
+ libraries.  It is useful if you want to, for example, write a Python
+ script that manipulates a Subversion repository or working copy.  See
+ the 'subversion' package for more information.
+
+Package: subversion-tools
+Priority: extra
+Architecture: all
+Depends: subversion (>= 1.5), ${misc:Depends}
+Recommends: python-subversion (>= 1.5), libsvn-perl (>= 1.5),
+            libconfig-inifiles-perl, liburi-perl,
+            exim4 | mail-transport-agent, xsltproc, rsync
+Suggests: libsvn-ruby1.8
+Description: Assorted tools related to Subversion
+ This package includes miscellaneous tools for use with Subversion
+ clients and servers:
+  * svn-backup-dumps: Incremental dumpfile-based backup script
+  * svn-bisect: Bisect revisions to find a regression
+  * svn-clean: Remove unversioned files from a working copy
+  * svn-fast-backup: rsync-based backup script for FSFS repositories
+  * svn-hot-backup: Backup script, primarily for BDB repositories
+  * svn_apply_autoprops: Apply property settings from
+    .subversion/config file to an existing repository
+  * svn_load_dirs: Sophisticated replacement for 'svn import'
+  * svn2cl: Generate GNU-style changelog from repository history
+  * svnmerge: Maintain merge history between two related branches
+    (mostly obsolete as of Subversion 1.5)
+  * svnwrap: Set umask to 002 before calling svn or svnserve
+  * several example hook scripts: commit-access-control, commit-email,
+    log-police, mailer, svnperms, verify-po
+ .
+ NOTE that some of these scripts are unsupported by upstream, and may
+ change radically or disappear in future releases.  The Recommended
+ packages are each required by at least one of these scripts.
+
+Package: libsvn-java
+Section: java
+Architecture: any
+Depends: libsvn1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Java bindings for Subversion
+ This is a set of Java classes which provide the functionality of
+ libsvn, the Subversion libraries.  It is useful if you want to, for
+ example, write a Java class that manipulates a Subversion repository
+ or working copy.  See the 'subversion' package for more information.
+
+Package: libsvn-perl
+Section: perl
+Architecture: any
+Pre-Depends: multiarch-support
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Perl bindings for Subversion
+ This is a set of Perl interfaces to libsvn, the Subversion libraries.
+ It is useful if you want to, for example, write a Perl script that
+ manipulates a Subversion repository or working copy.  See the
+ 'subversion' package for more information.
+
+Package: libsvn-ruby1.8
+Section: ruby
+Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
+Depends: ruby1.8, ${shlibs:Depends}, ${misc:Depends}
+Description: Ruby bindings for Subversion
+ This is a set of Ruby interfaces to libsvn, the Subversion libraries.
+ It is useful if you want to, for example, write a Ruby script that
+ manipulates a Subversion repository or working copy.  See the
+ 'subversion' package for more information.
+
+Package: libsvn-ruby
+Section: ruby
+Architecture: all
+Depends: libsvn-ruby1.8, ${misc:Depends}
+Description: Ruby bindings for Subversion (dummy package)
+ This is a dummy package to install the Subversion library bindings for
+ the default version of Ruby.
--- subversion-1.6.17dfsg.orig/debian/changelog
+++ subversion-1.6.17dfsg/debian/changelog
@@ -0,0 +1,2222 @@
+subversion (1.6.17dfsg-4+deb7u3) wheezy-security; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Add CVE-2013-1968.patch patch.
+    CVE-2013-1968: Subversion FSFS repositories can be corrupted by newline
+    characters in filenames. (Closes: #711033)
+  * Add CVE-2013-2112.patch patch.
+    CVE-2013-2112: Fix remotely triggerable DoS vulnerability. (Closes: #711033)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 05 Jun 2013 23:12:33 +0200
+
+subversion (1.6.17dfsg-4+deb7u2) wheezy; urgency=low
+
+  * Non-maintainer upload.
+  * Include following security fixes (Closes: #704940):
+    - CVE-2013-1845: Remotely triggered memory exhaustion in mod_dav_svn
+    - CVE-2013-1846: Remotely triggered crash in mod_dav_svn
+    - CVE-2013-1847: Remotely triggered crash in mod_dav_svn
+    - CVE-2013-1849: Remotely triggered crash in mod_dav_svn
+  * Convert SVN_STREAM_CHUNK_SIZE to an integer in svn/core.py
+    (Closes: #683188).
+
+ -- Thomas Preud'homme <robotux@debian.org>  Tue, 16 Apr 2013 14:36:14 +0200
+
+subversion (1.6.17dfsg-4+deb7u1) wheezy; urgency=low
+
+  * Non-maintainer upload.
+  * No-change rebuild against swig 2.0.7 (closes: #683188)
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 22 Mar 2013 16:29:41 +0100
+
+subversion (1.6.17dfsg-4) unstable; urgency=medium
+
+  * Ack NMU, thanks Ondrej.  Urgency medium because the NMU fixes RC bugs.
+    - Revert libsvn-java split.  Instead, disable multiarch for libsvn-java.
+      If anyone _needs_ multiarch for Java libraries, which I doubt, we
+      should come up with a way to produce deterministic jar files.
+    - Reintroduce specific db dependencies, so a random binNMU can't
+      change the DB version without warning.
+  * Disable serf support for now, as this release won't properly work with
+    serf 1.0.
+  * patches/g++47: New patch to build with g++ 4.7.
+  * Policy 3.9.3 (no changes).
+  * Move ruby files to /usr/lib/ruby/vendor_ruby per ruby policy.
+
+ -- Peter Samuelson <peter@p12n.org>  Sun, 03 Jun 2012 17:54:15 -0500
+
+subversion (1.6.17dfsg-3.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Disable test-suite which was broken by apr 1.4.6 update (Closes: #669494)
+  * Also rescue on Errno::EINVAL (Closes: #624810, #629952)
+  * Split libsvn-java to libsvn-java and libsvn-jni (Closes: #670034)
+  * Depend on generic libdb-dev and db-util (Closes: #621460)
+  * Install java files prior to dh_install -i call
+  * Declare proper relationships between -jni and -java packages
+
+ -- Ondřej Surý <ondrej@debian.org>  Tue, 29 May 2012 15:49:32 +0200
+
+subversion (1.6.17dfsg-3) unstable; urgency=medium
+
+  * libapache2.preinst: Fix upgrade case from before 1.6.17dfsg-2.
+  * libapache2.prerm: 'a2dismod' modules in reverse dependency order.
+  * patches/apache_module_dependency: New patch to allow mod_authz_svn to
+    load before mod_dav_svn and still use its functions.
+    All these together, Closes: #642250.
+  * Remove a bit more autofoo in 'clean' target.
+
+ -- Peter Samuelson <peter@p12n.org>  Sat, 19 Nov 2011 18:56:28 -0600
+
+subversion (1.6.17dfsg-2) unstable; urgency=low
+
+  * Standards-Version: 3.9.2.  Also, multiarch.
+  * Move to debhelper level 7.
+  * patches/perl-warning: New patch to suppress a bogus Perl undef warning.
+    (Closes: #422699)
+  * patches/swig2-compat: New patch from upstream to build with swig 2.x.
+    (Closes: #634049)
+  * patches/perl-compiler-flags: New patch from upstream to address an
+    issue brought to light by Perl 5.14.  (Closes: #628507)
+  * patches/sasl-mem-handling: New patch from upstream to fix a crash with
+    svn:// URLs and SASL authentication.  (Closes: #631765)
+  * patches/svn2cl-upstream: Use --non-interactive in svn2cl to avoid
+    hanging on, e.g., password prompts.  (Closes: #443860)
+  * patches/python-exception-syntax: New patch: Fix a couple instances of
+    literal string exceptions in Python, which don't work in 2.6+.
+    (Closes: #585358)
+  * Remove some preinst/postinst magic that hasn't been needed in years.
+  * Split authz_svn.load away from dav_svn.load, since most users do not
+    need both.  New installs will enable only dav_svn by default.
+  * Restart apache in libapache2-svn postinst.  (Closes: #610236, #628990)
+  * Improve symbols file with (regex)__ catchall for private symbols not
+    otherwise accounted for.  (Closes: #607544)  I'm also including a
+    workaround for rapidsvn, to be removed when 0.14 is released.
+  * Add ${misc:Depends} everywhere.  Drop libsvn-java dependency on a jre.
+    Thanks, Lintian.
+  * Remove the extra copy of jquery supplied by doxygen, from libsvn-doc.
+    Doesn't seem to even be used.  Thanks, Lintian.
+  * patches/po: New patch from Laurent Bigonville to fix minor issues in
+    fr.po and ja.po.  (Closes: #607381)
+  * Move to dh_lintian, and fix up the overrides a bit.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 15 Sep 2011 12:02:03 -0500
+
+subversion (1.6.17dfsg-1) unstable; urgency=high
+
+  * New upstream version.  Includes security fixes:
+    - CVE-2011-1752: Remotely triggered crash in mod_dav_svn
+    - CVE-2011-1783: Remotely triggered memory exhaustion in mod_dav_svn
+    - CVE-2011-1921: Content leak of certain files marked unreadable
+  * svn-bisect: Support $SVN environment variable, requested by Daniel
+    Shahaf upstream.
+  * Update Lintian overrides to account for python through 2.9,
+    in case that ever comes to be.
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 01 Jun 2011 17:07:33 -0500
+
+subversion (1.6.16dfsg-1) unstable; urgency=high
+
+  * New upstream version.
+    - Fixes CVE-2011-0715: Remotely crash mod_dav_svn anonymously via a
+      lock token.
+  * patches/change-range: New patch to support -cA-B syntax on command line.
+  * Stop using svn-make-config.c; we can do the same just by running svn
+    itself in a controlled home directory.  Delete debian/tools/.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 03 Mar 2011 10:55:42 -0600
+
+subversion (1.6.12dfsg-4) unstable; urgency=high
+
+  * patches/loosen-sqlite-version-check: New patch: Relax the SQLite
+    version check, to match the Debian sqlite3 packaging.
+    (Closes: #608925)
+  * patches/cve-2010-4539: New patch for CVE-2010-4539, fixing a remotely
+    triggered crash in mod_dav_svn involving use of the SVNParentPath
+    feature.  (Closes: #608989)
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 05 Jan 2011 10:43:01 -0600
+
+subversion (1.6.12dfsg-3) unstable; urgency=medium
+
+  * Apply two patches from upstream 1.6.15:
+    - patches/server-memleak: New patch: fix some server-side memory
+      leaks, including CVE-2010-4644.
+    - patches/no-wc1.7-check: New patch: Stop checking for being inside a
+      1.7 working copy.  The value is too low and the performance penalty
+      too high.
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 22 Dec 2010 20:38:17 -0600
+
+subversion (1.6.12dfsg-2) unstable; urgency=medium
+
+  * patches/cve-2010-3315: New patch for CVE-2010-3315, whereby, in rare
+    configurations, mod_dav_svn could give too much access to authorized
+    users.
+  * control: Update Vcs-* fields, Homepage, Policy to 3.9.1 (no changes),
+    tweak python version declaration (Closes: #587853).
+
+ -- Peter Samuelson <peter@p12n.org>  Fri, 01 Oct 2010 12:11:10 -0500
+
+subversion (1.6.12dfsg-1) unstable; urgency=medium
+
+  * 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.
+
+ -- Peter Samuelson <peter@p12n.org>  Mon, 21 Jun 2010 11:53:14 -0500
+
+subversion (1.6.11dfsg-1) unstable; urgency=low
+
+  * 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.
+
+ -- Peter Samuelson <peter@p12n.org>  Mon, 19 Apr 2010 23:22:07 -0500
+
+subversion (1.6.9dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+    - patches/16x-po, patches/ruby-test-core: remove, applied upstream.
+  * patches/java-build: Update for gcj 4.4.  Update the build dependency
+    too, as this version of the patch will not work on gcj 4.3.
+    Thanks to Nobuhiro Iwamatsu.  (Closes: #561516)
+  * patches/build-fixes: Fix parallelism in 'doc-api' target.  Again.
+    (Closes: #537297)
+  * patches/ruby-test-info: Disable the two failing ruby tests that
+    nobody can reproduce except on the buildds.  (Closes: #545372)
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 27 Jan 2010 01:57:47 -0600
+
+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.
+
+ -- Peter Samuelson <peter@p12n.org>  Sun, 22 Nov 2009 17:53:45 -0600
+
+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
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 22 Oct 2009 11:32:13 -0500
+
+subversion (1.6.5dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+    - Resolves symlinks in ~/.subversion. (Closes: #541202)
+  * patches/ssh-no-controlmaster: Replace with the much simpler approach
+    upstream demonstrates with 'ssh -q'.
+  * patches/no-dbus-spam: New patch to shut up the gnome-keyring library
+    when it can't initialize.  (Closes: #542403)
+  * patches/ruby-test-tree-conflicts: New patch from upstream trunk, to
+    fix two ruby test failures.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 20 Aug 2009 12:16:39 -0500
+
+subversion (1.6.4dfsg-1) unstable; urgency=high
+
+  * New upstream security release.
+    - Fix CVE-2009-2411, heap overflows in svndiff stream parsing.
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 05 Aug 2009 20:12:07 -0500
+
+subversion (1.6.3dfsg-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #531366)
+  * Upload to unstable (Closes: #532648)
+  * Update package sections corresponding to recent ftpmaster work.
+  * Re-enable libsvn_ra_serf, now that serf 0.3.0-0.2 is available.
+  * Add symbols file for libsvn1, for finer-grained dependencies.
+
+ -- Peter Samuelson <peter@p12n.org>  Tue, 14 Jul 2009 23:51:24 -0500
+
+subversion (1.6.1dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 09 Apr 2009 17:30:40 -0500
+
+subversion (1.6.0dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+    - patches/{commit-email2,out-of-tree-build-fixes,svn2cl-upstream,
+               ssh-no-sigkill}: deleted, applied or obsoleted upstream.
+      Other patches rediffed.
+    - patches/build-fixes: New patch, mostly for out-of-tree build stuff.
+    - Fixes typo in fr.po.  (Closes: #503266)
+    - Fixes WC out-of-sync issue.  (Closes: #500665)
+  * Build-depends: libsqlite3-dev, libgnome-keyring-dev, libdbus-1-dev.
+    We _should_ give equal opportunity to KDE 4 KWallet support,
+    but in terms of dependencies, that is a much heavier burden.
+    - Disable 'auth-test' test.  It assumes the gnome-keyring service
+      is available at test time - not likely, on a build daemon.
+  * Remove serf backend support for now, as it requires 0.3.0.
+  * Move to db4.7, tracking apr-util.  (Closes: #526222)
+
+ -- Peter Samuelson <peter@p12n.org>  Fri, 27 Mar 2009 15:54:25 -0500
+
+subversion (1.5.6dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * patches/commit-email2: New patch to fix mail header formatting in
+    commit-email.pl hook.  (Closes: #508301)
+  * Tweak 'site-packages' location for python 2.6, taken from the Ubuntu
+    patch uploaded by Matthias Klose.
+  * Build-Depends is back again to libdb4.6-dev.
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 25 Feb 2009 20:23:51 -0600
+
+subversion (1.5.5dfsg1-1) experimental; urgency=low
+
+  * New upstream release.
+  * New script svn-bisect, thanks Robert Millan. (Closes: #505100)
+  * DAV proxy fixed for certain commit subcommands.  (Closes: #511212)
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 07 Jan 2009 23:24:53 -0600
+
+subversion (1.5.4dfsg1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 23 Oct 2008 19:35:57 -0500
+
+subversion (1.5.3dfsg1-1) experimental; urgency=low
+
+  * New upstream release.
+    - patches/perl-test-syntax-error: removed, applied upstream
+    - Fixes infinite loop in a 'svn mv' corner case (Closes: #497953)
+    - bash completion updates (Closes: #499888)
+
+ -- Peter Samuelson <peter@p12n.org>  Fri, 10 Oct 2008 13:27:24 -0500
+
+subversion (1.5.1dfsg1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes some major corner cases in merge tracking.
+    - Fixes several crash bugs and regressions from 1.4 -> 1.5.
+    - patches/ruby-test-wc-normalize-compared-value: Remove, applied upstream.
+  * Symlink libsvn_ra_dav-1.so.1 -> libsvn_ra_neon-1.so.1 to avoid
+    breaking old packages that mistakenly linked to ra_dav.  This was not
+    and is not supported, but at least one package did it.  (Closes: #490423)
+  * Add a NEWS entry for 1.5.x in general.
+  * debian/watch: Add dversionmangle setting, thanks to lintian.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 24 Jul 2008 15:48:17 -0500
+
+subversion (1.5.0dfsg1-4) unstable; urgency=medium
+
+  * Work around bug where 'make javahl' is not -j-safe.
+
+ -- Peter Samuelson <peter@p12n.org>  Mon, 07 Jul 2008 01:37:38 -0500
+
+subversion (1.5.0dfsg1-3) unstable; urgency=medium
+
+  * Bump shlibs file to libsvn1 (>= 1.5.0).  (Closes: #488949)
+  * Fix typo in Build-Conflicts (libsvn-dev, not libsvn1-dev).
+  * Fix svnwrap(1) manpage inetd.conf example.  (Closes: #462313)
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 02 Jul 2008 08:23:31 -0500
+
+subversion (1.5.0dfsg1-2) unstable; urgency=low
+
+  * Reenable Java support.
+  * patches/java-build: New patch to hack around incompatibilities between
+    Sun javah and gcj javah.
+  * Remove the last remnants of libsvn-javahl from the source package.
+  * Include upstream release notes file svn_1.5_releasenotes.html.
+  * Add svn-populate-node-origins-index (used in upgrading a repository
+    to 1.5) and svnmucc (useful client tool) to the subversion package.
+    (Closes: #408487)
+
+ -- Peter Samuelson <peter@p12n.org>  Mon, 30 Jun 2008 00:22:28 -0500
+
+subversion (1.5.0dfsg1-1) experimental; urgency=low
+
+  * New upstream release
+    - Fixes many bugs including:
+      - Translation errors (Closes: #404982, #451514)
+      - Now exports externals from a working copy.  (Closes: #448864)
+      - Newer psvn.el provided.  (Closes: #393651, #441994)
+      - 'svn export' handles externals now.  (Closes: #448864)
+      - Perl module destructor doesn't crash.  (Closes: #401340)
+      - 'svn merge' gets less confused on tree conflicts.  (Closes: #366530)
+    - Update debian/contrib-license-audit, README.Debian-tarball
+    - Remove obsolete patches: jelmer-python-bindings, kaffe,
+      kaffe-javah, limit-zlib-link, neon27, python-memleak,
+      ruby-newswig, ruby-test-ra-race, svn-clean-manpage,
+      svn_load_dirs, swig-warning-124, testsuite-dont-use-os-popen3
+  * rules: Run autogen-swig for each python version.
+    (Not strictly needed, but it is the simplest approach.)
+  * Switch from dpatch to quilt.
+  * Policy 3.8.0:
+    - copyright: Delete copy of common-licenses/Apache-2.0
+    - control: Add Homepage field;
+      Wrap Uploaders field, which was > 80 columns
+    - rules: Support DEB_BUILD_OPTIONS=parallel=n;
+      Require DEB_BUILD_OPTIONS to be space-separated
+    - README.source: New file explaining quilt
+  * control: Add XS-Python-Version header, to suppress a warning
+  * control: Build-Conflicts: libsvn1-dev (<< 1.5); libtool can cause
+    trouble with installed .so files that don't contain needed symbols.
+  * control: New Build-Depends: libserf-0-0-dev, libsasl2-dev.
+  * control: Simplify Depends/Recommends to assume etch or newer.  (Keep
+    some old Conflicts/Replaces/Provides.)  Delete the libsvn-javahl etch
+    transition package.
+  * control: libsvn-java: I believe it needs java5 now, not just java2.
+    Hence gij | java5-runtime-headless.
+  * patches/perl-test-syntax-error: New patch borrowed from upstream, to
+    fix a perl5.10 issue in one of the tests.
+  * patches/ruby-test-wc-normalize-compared-value: New patch borrowed from
+    upstream, to fix a ruby test failure.
+  * patches/svn2cl: Split into svn2cl-upstream and svn2cl-debian.
+    Update svn2cl-upstream to 0.10 from upstream trunk.
+  * patches/apr-abi: Small adjustment to reduce libtool warnings.
+  * patches/out-of-tree-build-fixes: New patch: fix a few issues with
+    building outside the source tree.
+  * rules: Disable Java for the first upload to experimental, as I'm still
+    working on fixing that.
+
+ -- Peter Samuelson <peter@p12n.org>  Fri, 20 Jun 2008 21:53:29 -0500
+
+subversion (1.4.6dfsg1-5) UNRELEASED; urgency=low
+
+  * Downgrade libsvn-dev "Depends: libneon27-gnutls-dev" to Suggests and
+    add zlib1g-dev.  These are for static linking.  (Closes: #482512)
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 29 May 2008 20:29:41 -0500
+
+subversion (1.4.6dfsg1-4) unstable; urgency=low
+
+  * Disable java on alpha and hppa, as requested by Matthias Klose.
+    (Closes: #477908)
+  * Switch from neon27 to neon27-gnutls.  (Closes: #478142)
+  * patches/testsuite-dont-use-os-popen3: New patch (from upstream):
+    use popen2.Popen3 instead of os.popen3.  (Closes: #479079)
+  * patches/svn-clean-ignore: New feature patch, a mechanism to specify
+    files which, though unversioned, 'svn-clean' should not remove.
+    Suggested by Jonathan Hall.
+  * Add another -j1 to debian/rules, to fix a parallel build problem.
+  * patches/ssh-no-controlmaster: New patch to avoid a bad interaction
+    with OpenSSH connection sharing.  (Closes: #413102)
+
+ -- Peter Samuelson <peter@p12n.org>  Sat, 03 May 2008 00:35:18 -0500
+
+subversion (1.4.6dfsg1-3) unstable; urgency=low
+
+  * patches/neon27: update for neon 0.28.  (Closes: #476117)
+  * Build for all supported python versions.  Loosely based on an Ubuntu
+    patch by Matthias Klose.  (Closes: #446636)
+
+ -- Peter Samuelson <peter@p12n.org>  Mon, 14 Apr 2008 11:08:22 -0500
+
+subversion (1.4.6dfsg1-2) unstable; urgency=low
+
+  * subversion.NEWS: Add a note about the db4.6 upgrade.  (Closes: #465432)
+  * rules: use dh_link rather than hand-rolled symlink management.
+    Closes: #465609 in the process.
+  * rules: Define DEB_HOST_ARCH and friends before using them, to fix
+    FTBFSes on the non-java architectures.
+
+ -- Peter Samuelson <peter@p12n.org>  Sat, 08 Mar 2008 14:27:22 -0600
+
+subversion (1.4.6dfsg1-1) unstable; urgency=low
+
+  * New upstream version.
+    - Don't use Chinese colons in zh_CN l10n file.  (Closes: #397729)
+  * Build with db 4.6, to match apr-util.
+  * patches/svn-clean-manpage: New patch, fix a small typo.  (Closes: #441827)
+  * patches/neon27: New patch from upstream trunk to support neon 0.27.
+    - control: build-depend on libneon27-dev.
+    - rules: no longer --disable-neon-version-check.
+  * patches/ruby-newswig: Support swig 1.3.33.  (Closes: #453166)
+  * patches/python-memleak: New patch to fix a serious memory leak in the
+    Python bindings.  Thanks to Jelmer Vernooij.  (Closes: #428755)
+  * control: Policy 3.7.3.
+  * control: spell 'Source-Version' as 'binary:Version' for political
+    correctness.  (Or for clarity.)
+  * control: add appropriate Vcs-Svn and Vcs-Browser fields.
+  * control: subversion-tools Recommends: rsync.  (Closes: #459023)
+  * patches/svn2cl: update svn2cl to 0.9 (from upstream trunk).
+  * patches/commit-email: use original 'sendmail' commit-email.pl mode,
+    rather than the direct SMTP feature.  (Closes: #447824)
+  * rules: do not run 'dh_testroot' or 'make extraclean' in clean rule.
+  * rules: rewrite DEB_BUILD_OPTIONS support; remove 'notest' synonym, as
+    the world seems to be standardizing on 'nocheck'.
+  * rules: remove 'DEB_BUILD_OPTIONS=-j[N]' support, add support for the
+    new 'dpkg-buildpackage -j[N]' feature.
+  * rules: add an option to disable ruby bindings.  Though it turns out
+    we don't need it ... yet.
+
+ -- Peter Samuelson <peter@p12n.org>  Mon, 11 Feb 2008 23:49:02 -0600
+
+subversion (1.4.4dfsg1-1) unstable; urgency=low
+
+  * New upstream version.
+    - Fixes rare case of data loss / repository corruption.  (Closes: #419348)
+    - Fixes minor security inconsistency regarding restricted paths being
+      copied to unrestricted paths, CVE-2007-2448.  (Closes: #428194)
+  * Fix note in README.Debian about how to download vc-svn.el.
+    Thanks to Michael Richters.  (Closes: #416582)
+  * rules: configure --disable-neon-version-check, to allow use of neon 0.26.3.
+  * rules: replace $(PWD) with $(CURDIR) to appease lintian.
+    Our use of PWD was safe, this is just a cleanup.
+  * rules: ship a shlibs file only for libsvn1; nobody should ever link to
+    the libraries in other packages.  (Thanks again to lintian.)
+    - lintian-overrides: inform lintian that it's ok not to have shlibs
+      files in the swig-based packages
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 07 Jun 2007 00:57:11 -0500
+
+subversion (1.4.3dfsg1-1) experimental; urgency=low
+
+  [ Peter Samuelson ]
+  * New upstream version.
+    - patches/neon26 removed; applied upstream
+  * rules: Small cleanups, thanks to Patrick Desnoyers.
+  * patches/jelmer-python-bindings: Remove some python2.4isms (should help
+    with porting to sarge and elsewhere).  Thanks to Romain Francoise, and
+    upstream.
+  
+ -- Peter Samuelson <peter@p12n.org>  Thu, 25 Jan 2007 18:30:04 -0600
+
+subversion (1.4.2dfsg1-2) unstable; urgency=medium
+
+  [ Peter Samuelson ]
+  * rules: fix 'dontberoot' target not to run when it shouldn't.
+    (Closes: #396435)
+  * Add subversion-tools Conflicts: kdesdk-scripts (<= 4:3.5.5-1).
+    I'm told that their next release will remove the 'svn-clean' script, 
+    which is quite similar to the one in subversion-tools.  (See: #397874)
+  * Add manpages for svn-clean, svn-hot-backup, svn-fast-backup, and
+    svn-backup-dumps.  Troy Heber helped write the last three.
+  * Ship svnmerge.README in subversion-tools.
+
+ -- Peter Samuelson <peter@p12n.org>  Fri, 10 Nov 2006 08:45:01 -0600
+
+subversion (1.4.2dfsg1-1) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * New upstream release.
+    - No longer ships IETF draft spec.  (Closes: #393414)
+    - patches/svnsync-manpage, parts of patches/neon26, patches/svnshell:
+      Obsolete, removed.
+    - Re-roll upstream tarball to remove some unlicensed files from the
+      "contrib" directory.  Update debian/copyright regarding other files
+      in "contrib".  (Closes: #394395)
+  * patches/neon26: update for 1.4.2, add neon 0.26.2 to the whitelist.
+  * Improve libapache2-svn installation experience:
+    - Use a2enmod/a2dismod instead of hand-hacking.
+    - dav_svn.conf: Comment everything out.  (Many will want to use
+      sites-available/* rather than dav_svn.conf anyway.)  Fix some of
+      the text and add more.  (Closes: #392805)
+  * libsvn-java: Remove alternative Depends: java1-runtime.
+    It does in fact require JRE 1.2 (java2-runtime).
+  * Build with neon26 instead of neon25.
+  * Ship some example code from upstream in the various devel packages.
+    - patches/examples-compile-instructions: New patch, some small doc fixes.
+  * Ship a lot more scripts in subversion-tools, including svnmerge
+    (Closes: #293528), svn2cl (Closes: #350133).
+    - List these scripts in the Description.  (Closes: #357506)
+    - Downgrade most Depends to Recommends, augment Recommends and Suggests
+      to match the scripts.
+  * rules: Add explicit check and informative error message for trying to
+    build as root.  (Closes: #396435)
+  * libapache2-svn Description: it's Apache 2.2, not 2.0.  (Closes: #397113)
+  * patches/ruby-test-ra-race: replace my fix by upstream's better one,
+    should _really_ fix m68k build this time.  (Closes: #397173)
+  * patches/jelmer-python-bindings: New patch: backport python binding
+    improvements by Jelmer Vernooij from trunk.  This is needed for
+    certain advanced python-based tools.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu,  9 Nov 2006 00:07:42 -0600
+
+subversion (1.4.0-5) unstable; urgency=medium
+
+  [ Peter Samuelson ]
+  * rules: Set HOME to a dummy value to prevent a build failure if the
+    real HOME is mode -x.  Plus a few minor cleanups.
+  * rules: Link -ldb explicitly (rather than implicitly via -laprutil-1).
+    This is required for libdb symbol versioning to propagate.
+    Thanks to Pitr Jansen for help tracking this down.
+  * patches/svnshell: Fix insufficient argument checking in 'setrev'
+    command.  (Closes: #392004)
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 11 Oct 2006 03:30:03 -0500
+
+subversion (1.4.0-4) unstable; urgency=medium
+
+  [ Peter Samuelson ]
+  * patches/apr-abi: switch to a simpler test that actually DTRT on 64-bit
+    platforms.  (Closes: #391744)
+
+ -- Peter Samuelson <peter@p12n.org>  Sun,  8 Oct 2006 09:26:04 -0500
+
+subversion (1.4.0-3) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * patches/ruby-test-ra-race: New patch for another testsuite race
+    discovered on m68k.
+  * patches/ruby-typemap-digest: New patch to fix a m68k failure, quite
+    possibly the same failure we've seen sporadically on other arches
+    in the past.  Thanks to Roman Zippel.  (Closes: #387996)
+  * rules: sed *.la to change internal *.la references to -l form.
+    (Closes: #388733)
+  * control,rules: Reinstate libsvn-javahl as a dummy package, for
+    sarge upgrades.  (Closes: #387901)
+  * control,rules: Disable Java on hurd-i386, requested by Cyril Brulebois.
+  * Build with apache 2.2 / apr1 / aprutil1 again, now that apache 2.2 is
+    going into unstable.
+    - aprutil1 always links to libdb4.4 nowadays.  (Closes: #387396)
+  * libapache2-svn.postinst: Do not enable the dav_fs module: not needed
+    for a Subversion server.
+
+  [ Troy Heber ]
+  * debian/control clean up of Maintainer and Uploaders fields to reflect the
+    current team.
+
+ -- Troy Heber <troyh@debian.org>  Tue,  3 Oct 2006 07:45:31 -0600
+
+subversion (1.4.0-2) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * Run tests in 'build' target, not 'binary' target.  This prevents a
+    build failure if 'binary' is run as root (not fakeroot).
+  * patches/svnsync-manpage: trivial typo fix from upstream.
+  * Delete README.db4.4: the upgrade procedure it describes is now fully
+    automatic.
+  
+ -- Peter Samuelson <peter@p12n.org>  Sun, 10 Sep 2006 05:05:47 -0500
+
+subversion (1.4.0-1) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * New upstream version - well, not really new, it's rc5 rebranded.
+  * Revert libsvn1/apache2.2 change, since apache 2.2 is not yet in
+    unstable.  libsvn1 is libsvn0 again, for now.
+  * patches/no-extra-libs: detect apr0/apr1 correctly, and use
+    pkg-config for neon.
+  * patches/neon26: new patch to build cleanly with neon 0.26.1.
+    Though we won't actually use it until #386652 is fixed.
+  * Document BDB 4.4 upgrade better; also, move the NEWS entry from
+    'libsvn0' to 'subversion' where it is more likely to actually be
+    read.
+  * patches/no-extra-libs-2: Tweak to remove more unnecessary linking.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu,  7 Sep 2006 21:03:06 -0500
+
+subversion (1.4.0~rc5-1) experimental; urgency=low
+
+  * New upstream version.
+    - patches/ruby-txtdelta-apply-instructions: remove (obsolete).
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 24 Aug 2006 05:31:24 -0500
+
+subversion (1.4.0~rc4-2) experimental; urgency=low
+
+  [ Peter Samuelson ]
+  * Reenable apache support; build-depend on apache2-threaded-dev 2.2,
+    now that it's in experimental.
+  * Build-Depends: remove bison, relax python version again (as python
+    handling is now done by python-support).
+  * patches/ruby-txtdelta-apply-instructions: new patch from upstream,
+    fixes the test failure on amd64.
+  * Compile against libdb4.4, which should fix the famous "wedged
+    repository" issue.
+    - Build-Depends: libaprutil1-dev (>= 1.2.7+dfsg-1)
+    - Update rules, control, README.db4.4
+    - Add note to libsvn1.NEWS - please read it!
+
+ -- Peter Samuelson <peter@p12n.org>  Fri, 18 Aug 2006 13:06:49 -0500
+
+subversion (1.4.0~rc4-1) experimental; urgency=low
+
+  * There is a known issue with amd64 and the SvnDeltaTest in the ruby
+    testsuite. 
+
+  [ Peter Samuelson ]
+  * New upstream release.
+    - commit-email.pl has option not to send diffs.  (Closes: #217133)
+    - Help text clarified for options like --file.  (Closes: #233099)
+    - Rediff patches.  Delete patches already included upstream:
+      apache-crash-fix, bash_completion, lc_ctype, perl-test-clean,
+      svn_load_dirs-symlinks, swig-1.3.28.
+    - Add Build-Depends: zlib1g-dev.
+  * Bump subversion-tools dependencies on the other packages to >= 1.4.
+  * Support ENABLE_APACHE macro, to disable 'libapache2-svn'.
+    Disable apache until apache 2.2 makes its way into experimental.
+  * Switch to libapr1, which entails an ABI change to libsvn.
+    - libsvn0 -> libsvn1
+    - libsvn0-dev -> libsvn-dev
+    - patches/apr-abi: New patch: change the libsvn_* SONAMEs.
+      (This type of change should be upstream-driven, but upstream has
+      declined to do it.)
+    - patches/fix-bdb-version-detection: New patch: tweak BDB version
+      detection not to rely on an apr-util misfeature (#387105).
+  * Rename libsvn-javahl to libsvn-java, to comply (in spirit) with the
+    Java Policy.  (Closes: #377119)
+  * Rename libsvn-core-perl to libsvn-perl, because it provides several
+    modules in the SVN:: namespace, not just SVN::Core.
+  * patches/limit-zlib-link: New patch from upstream to prevent
+    unnecessary -lz linkage in client binaries.
+  * Update copyright file again.
+  * Switch to python-support.
+  * subversion-tools: downgrade rcs and exim4 to Recommends.
+  * Add NEWS entry to libsvn1, explaining compatibility issues - please
+    read it, folks!
+
+  [ Troy Heber ]
+  * tweaked rpath patch HUNK 2, so it would apply cleanly.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 10 Aug 2006 20:43:19 -0500
+
+subversion (1.3.2-6) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * Add libsvn0 Conflicts: subversion (<< 1.3) to prevent chaos from
+    linking to both neon24 and neon25.
+  * Add libsvn0 Conflicts: python2.3-subversion (<< 1.2.3dfsg1-1)
+    because of the libsvn_swig_py move.  (Closes: #385146)
+  * Link with Berkeley DB 4.4.  (Closes: #385589, #383880 again)
+    - patches/bdb-44: new patch cobbled together from upstream trunk
+  * patches/ruby-test-svnserve-race: update from our 'sleep 3' hack to
+    what I hope is a proper fix.  Thanks to Kobayashi Noritada, Wouter
+    Verhelst and Roman Zippel.  (Closes: #378837)
+  * Switch to python-support.
+
+ -- Peter Samuelson <peter@p12n.org>  Sat,  2 Sep 2006 05:04:09 -0500
+
+subversion (1.3.2-5) unstable; urgency=medium
+
+  [ Peter Samuelson ]
+  * python-subversion.{prerm,postinst}: use pyversions, fix stupid bug
+    (Closes: #379278) in prerm.  Tighten python build-dep to ensure
+    availability of pyversions.
+  * patches/ruby-test-svnserve-race: increase 'sleep 1' hack to 'sleep 3'
+    for now.  Not a proper fix, but should build on m68k.
+  * control: downgrade subversion Depends: patch to Suggests.  You can do
+    a lot with subversion without a 'patch' program.
+
+ -- Troy Heber <troyh@debian.org>  Mon, 24 Jul 2006 14:01:49 -0600
+
+subversion (1.3.2-4) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * control, rules, patches/*: switch from cdbs-simple-patchsys to dpatch.
+    Remove .patch suffixes, change build-depends.
+  * rules: separate the *-arch and *-indep targets properly.
+  * copyright: updates, mention licenses for the bits in the tarball which we
+    don't use.
+  * Support new python policy, building for version 'current'.
+    Thanks to Max Bowsher.  (Closes: #373387)
+  * Improve package descriptions.  (Closes: #375469)
+  * Add java2-runtime alternative to libsvn-javahl JVM dependency.
+    (Closes: #377529)
+  * Add libsvn0 Conflicts: libsvn-core-perl (<< 1.2.3dfsg1-1) to force a
+    necessary upgrade.  (Closes: #376565)
+
+  [ Guilherme de S. Pastore ]
+  * control: updated e-mail address.
+
+ -- Troy Heber <troyh@debian.org>  Mon, 17 Jul 2006 08:39:20 -0600
+
+subversion (1.3.2-3) unstable; urgency=low
+
+  [ Troy Heber]
+  * Adding arm to list of javahl disabled architectures
+
+ -- Troy Heber <troyh@debian.org>  Wed, 14 Jun 2006 14:26:44 -0600
+
+subversion (1.3.2-2) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * control, rules: switch from kaffe to java-gcj-compat-dev.  Thanks to
+    Bastian Blank.  Also reenable libsvn-javahl, for now, on all
+    architectures except m68k, mips, mipsel.  (Closes: #370228)
+  * ruby-test-svnserve-race.patch: new kludge to avoid a race condition in
+    the ruby testsuite on really slow machines.
+
+ -- Peter Samuelson <peter@p12n.org>  Mon, 12 Jun 2006 18:50:08 -0500
+
+subversion (1.3.2-1) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * New upstream release.
+    - Remove patches applied upstream: apache-crash-fix.patch,
+      svn_load_dirs-symlinks.patch, swig-1.3.28.patch
+  * debian/watch: new file for use by 'uscan' from devscripts.
+  * Standards version 3.7.2.  (No changes.)
+  * control: upgrade Build-Conflicts to libsvn0 (<< 1.3).
+    This is that old workaround for #291641.
+  * rules: rework testsuite invocation:
+    - Add 'check' series of targets, and 'check-help' to remind one
+      of what they are
+    - Conditionalise javahl tests on ENABLE_JAVAHL
+    - Reorder the checks to put the core tests at the end; they are by far
+      the most time-consuming, and rarely fail anyway
+    - Only 'cat tests.log' if the core tests fail: the other testsuites
+      don't use that file anyway
+
+ -- Peter Samuelson <peter@p12n.org>  Thu,  1 Jun 2006 04:10:19 -0500
+
+subversion (1.3.1-3) unstable; urgency=medium
+
+  [ Peter Samuelson ]
+  * Tighten dependency between subversion and libsvn0, to reduce user
+    confusion.  It is almost always the library version that matters, as
+    far as bugs and features are concerned.  (Closes: #359315)
+  * Disable java bindings on hppa and ia64, since kaffe is broken on
+    those architectures.  It's been broken on ia64 for a long time, and it
+    looks as though hppa may remain broken for awhile too (see #364819).
+  * ssh-no-sigkill.patch: new patch to SIGTERM (instead of SIGKILL) the
+    tunnel agent, which is usually ssh.  We can do this now that #313371
+    is fixed.  (Closes: #335528)
+  * rules: add -V'libsvn0 (>= 1.3.0)' to dh_makeshlibs to loosen the
+    shlibs file a bit.  Upstream guarantees that the library ABI won't be
+    augmented during any single x.y.* cycle.
+  * svnwrap.sh, man/svnwrap.1: new script for subversion-tools package to
+    optionally wrap subversion client commands with 'umask 002'.
+    (Closes: #242368, #259226, #282468, #292358)
+  * lc_ctype.patch: new patch to make locale errors non-fatal, suggested
+    by upstream developer Peter Lundblad.  (Closes: #363983)
+  * last-changed-date-charset.patch: new patch: convert $LastChangedDate$
+    keyword from UTF-8 to local character set.  (Closes: #290774)
+  * apache-crash-fix.patch: new patch to fix a crash in mod_dav_svn.
+  * swig-warning-124.patch: new patch to disable swig typemap warning,
+    drastically shrinking the build log.
+  
+  [ Troy Heber ]
+  * changing from UNRELEASED to unstable and uploading
+
+ -- Troy Heber <troyh@debian.org>  Fri, 05 May 2006 18:14:57 -0600
+
+subversion (1.3.1-2) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * Fix libsvn-ruby1.8: actually ship the swig glue, which we had overlooked.
+    Thanks to Thiago Avancini for the report and some Ruby help.
+  * Exclude Java bindings on kfreebsd-amd64.  (Closes: #361488)
+
+ -- Peter Samuelson <peter@p12n.org>  Sun,  9 Apr 2006 05:10:42 -0500
+
+subversion (1.3.1-1) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * New upstream version.
+    - Delete obsolete neon-0.25.5.patch.
+  * swig-1.3.28.patch: add a few more upstream patches.
+
+ -- Troy Heber <troyh@debian.org>  Tue, 04 Apr 2006 15:05:12 -0600
+
+subversion (1.3.0-5) unstable; urgency=high
+
+  * rpath.patch: Delete rpaths for apache2 modules.
+    (Closes: #359234, also see CVE-2006-1564)
+    - rules: Do not override INSTALL_MOD_SHARED, this is no longer needed
+    - libapache2-svn.install: Use modules from the install, not from
+      the build tree
+
+ -- Peter Samuelson <peter@p12n.org>  Tue, 28 Mar 2006 00:56:59 -0600
+
+subversion (1.3.0-4) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * rules: Support DEB_BUILD_OPTIONS=-jN, passed to child make processes.
+    Invoke 'make autogen-swig' separately as it has problems with -j.
+    Be more paranoid about cleaning out old swig headers.
+    Document all the DEB_BUILD_OPTIONS we now support.
+  * control: Don't say we provide python2.4-subversion, since we don't.
+  * swig-1.3.28.patch: add another upstream patchlet.  Should fix the
+    intermittent FTBFS due to the ruby test suite.
+  * rules: fix doc/subversion/README.db4.3.gz symlink (Closes: #357856)
+
+ -- Troy Heber <troyh@debian.org>  Mon, 20 Mar 2006 08:13:33 -0700
+
+subversion (1.3.0-3) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * rules: Symlink /usr/share/doc/libsvn-ruby -> libsvn-ruby1.8
+  * swig-1.3.27.patch: Rename to swig-1.3.28.patch, and update it with
+    more patches stolen from upstream, to support SWIG 1.3.28.
+    - control: Remove Build-Conflicts: swig (>= 1.3.28).  Assume for now
+      that 1.3.29 and newer won't cause other problems.
+
+  [ Adam Conrad ]
+  * Do the Provides/Replaces/Conflicts dance for python2.4-subversion as
+    well, since Ubuntu has shipped that for ages, and this allows for
+    smoother upgrades/sidegrades between the two.
+
+ -- Troy Heber <troyh@debian.org>  Sun, 12 Mar 2006 15:32:57 -0700
+
+subversion (1.3.0-2) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * Disable java bindings on m68k for now.  It seems to have problems
+    similar to the ones on arm and mips.  (See #344986.)
+  * Some suggestions from Ubuntu backporter Blair Zajac (Closes: #347775):
+    - Delete pregenerated swig headers which may or may not be compatible
+      with Debian's version of swig.
+    - Tighten Build-Depends on kaffe to >= 2:1.1.6: he reports that 1.1.5
+      fails to build the Java bindings.
+    - Build-Depends: junit, pass --with-junit to configure, and run 'make
+      check-javahl'.  It fails on current free JVMs, so ignore failure.
+    - Tighten subversion-dev dependency on libapr0-dev to >= 2.0.55-3,
+      to match the Build-Depends.
+    - Pass CLEANUP=true to 'make check' to reduce disk usage.
+  * subversion.README.Debian: Rewrite for clarity, and to document the two
+    Emacs helpers.  Thanks to Gavin Baker for both the research and the
+    writing.
+  * rules: 'make swig-rb' so that 'make install-swig-rb' does not have
+    to do it for us.  Thanks to Max Bowsher for noticing.
+  * Adjust swig patches:
+    - swig-1.3.27-hack.patch: remove, obsoleted by upstream changes.
+    - ruby-swig-1.3.27.patch: rename to swig-1.3.27.patch and update to
+      include trunk r18172, which is likely to go in a future 1.3.x.
+  * New package libsvn-doc with doxygen-generated API docs in HTML
+    format.  Thanks to Max Bowsher.  (Closes: #269635)
+    - Add Suggests: libsvn-doc for libsvn0-dev
+  * Rename python2.3-subversion to python-subversion, recommended by
+    Python policy.  This will allow for a slightly smoother global python
+    transition in the future.
+    - Replaces/Conflicts/Provides: python2.3-subversion
+    - Use #!/usr/bin/python everywhere, not #!/usr/bin/python2.3
+  * Add Provides: libsvn-dev to libsvn0-dev.  The package will be renamed
+    in the future, when libsvn0 becomes libsvn1.
+  * Loosen dependencies between subversion-tools and the other packages,
+    as the one is "Architecture: all" and the others are not.
+  * Build-Conflict with swig 1.3.28 and newer, to document reality.  This
+    has been addressed by upstream trunk but not yet backported.
+  * patches/neon-0.25.5.patch: new patch from upstream, to allow compiling
+    with neon 0.25.5.
+
+  [ Troy Heber ]
+  * Changing my email address
+
+ -- Troy Heber <troyh@debian.org>  Wed, 22 Feb 2006 08:18:12 -0700
+
+subversion (1.3.0-1) experimental; urgency=low
+
+  [ Peter, Guilherme ]
+  * New upstream version. (Closes: #344819)
+    - Undeprecates svnserve -R (Closes: #341438)
+    - Fixes typo in locks/db-logs.lock (Closes: #339298)
+    - README does not mention bdb specifics when using fsfs (Closes: #295860)
+    - Seems to not crash on deep directory checkouts with certain kernels.
+      (Closes: #348327)
+    - Back to a pristine upstream tar, as upstream has removed the
+      (non-free) Subversion Book.
+    - All patches rediffed / ported.
+      - no_extra_libs, svn_load_dirs_symlinks: renamed to no-extra-libs,
+        svn_load_dirs-symlinks, for consistency.
+      - commit-email-warning, l10n-segfault: Removed (fixed upstream).
+
+  [ Peter Samuelson ]
+  * New packages libsvn-ruby1.8 and dummy libsvn-ruby.  (Closes: #335987)
+    - patches/ruby-no-strict-aliasing.patch: new patch.
+    - patches/ruby-swig-1.3.27.patch: new patch from upstream, to
+      build with SWIG 1.3.27.  Upstream says this is still unofficial.
+  * Disable java on kfreebsd-i386.  (Closes: #345196)
+  * patches/bash_completion.patch: new patch to fix minor wildcard
+    breakage with bash completion.  (Closes: #342052)
+  * rules: remove x bit from /etc/bash_completion.d/subversion.
+    Thanks, lintian.
+  * control: downgrade db4.3-util to Suggests.
+  * Move README.db4.3 and the corresponding NEWS entry to the libsvn0
+    package.  Leave a symlink in /usr/share/doc/subversion/.
+    (Closes: #342235)
+  * README.db4.3: add notes about preserving file permissions.
+    Thanks to Ross Boylan.  (Closes: #345819)
+  * patches/svn_load_dirs_symlinks.patch: new patch to handle symlinks in
+    the svn_load_dirs contrib script.  Thanks to Tilman Koschnick.
+    (Closes: #311440, #319165)
+  * rules: cleanups:
+    - Use debhelper -s instead of -a, and -i -s instead of -A.
+      This would have prevented the need for 1.2.3dfsg1-2.
+    - Move some build rules out of the 'install' target.
+    - Enable additional tests (make check-swig-py).
+    - Drop use of 'time' (and corresponding build-dep in control).
+  * control: move from libneon24 to libneon25, as upstream now prefers.
+  * patches/no-extra-libs-2.patch: new patch: more spurious-link pruning.
+
+ -- Peter Samuelson <peter@p12n.org>  Fri,  6 Jan 2006 03:28:16 -0600
+
+subversion (1.2.3dfsg1-3) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * rules: Remove the unwritten requirement that /usr/bin/python be
+    specifically version 2.3:
+    - derive python version from debian/control, not from dpkg -l
+    - pass PYTHON=python2.3 explicitly into configure
+  * rules: clean rule: Seek and destroy _all_ *.pyc files.  There were
+    a few we didn't catch before, buried in the testsuite.
+  * Remove various unneeded files from language bindings (Closes: #310777)
+    - libsvn-core-perl.install: don't install /usr/lib/*.{a,la,so}
+    - python2.3-subversion.install: likewise
+    - libsvn-javahl.install: don't install /usr/lib/jni/*.{a,la}
+    - rules: delete *.{a,la} from python2.3/site-packages/libsvn
+  * control: build-depends on libapr0-dev (>= 2.0.55-3).
+    Earlier versions of libapr0 will try to make us link to libdb4.2.
+  * subversion.NEWS, README.db4.3: document db4.2 -> db4.3 upgrade.
+  * patches/no_extra_libs.patch: new patch to prevent linking to several
+    unneeded libraries.  (Closes: #336373, which was caused by linking to
+    libssl0.9.8.)
+    - debian/control: Remove several depends and build-depends we are no
+      longer using because of this
+  * patches/commit-email-warning.patch: new patch to eliminate a harmless
+    warning in a hook script.  (Closes: #336781)
+  * patches/perl-test-clean.patch: new patch to avoid leaving several
+    /tmp/svn-perl-test-xxxxxx dirs.
+  * patches/swig-1.3.27-hack.patch: new patch to avoid FTBFS from bad
+    interaction of swig 1.3.27 and <apr.h>.  A *really* ugly hack.
+
+  [ Adam Conrad ]
+  * Switch to using DB4.3 instead of DB4.2, as libapr0 has
+      (Closes: #335455, #335438)
+    - Bump build-dep and libsvn0-dev dep from libdb4.2-dev to libdb4.3-dev
+    - Bump subversion and libapache2-svn deps from db4.2-util to db4.3-util
+
+  [ Troy Heber ]
+  * Added note about the requirement for nfs-common when your repository lives
+    on a NFS volume. (closes: #316097)
+  * Changing the default behavior to not use apr_generate_random_bytes(),
+    Debian use the system APR which is configured to use /dev/random. In cases
+    where the entropy pool is drained svn commands can block waiting. Removing
+    the call to apr_generate_random_bytes and using the fallback apr_time_now
+    instead. (closes: #285708, #298822) 
+
+ -- Peter Samuelson <peter@p12n.org>  Fri,  2 Dec 2005 16:22:44 -0600
+
+subversion (1.2.3dfsg1-2) unstable; urgency=low
+
+  * Use DH_OPTIONS=-Nlibsvn-javahl in debian/rules, rather than the
+    Architecture fields in debian/control, to disable the java package.
+    Due to misuse of debhelper, the last attempt didn't work.  And I think
+    this way is nicer anyway.  Suggested by Steve Langasek.
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 19 Oct 2005 04:27:51 -0500
+
+subversion (1.2.3dfsg1-1) unstable; urgency=low
+
+  [ Guilherme de S. Pastore ]
+  * debian/control:
+    - changed section of libsvn-core-perl to perl
+    - changed section of libsvn-javahl to devel
+    - bump to Standards-Version 3.6.2.1 with no changes
+  * debian/rules:
+    - minor cleanups
+    - removed remnants of control auto-generation
+
+  [ Peter Samuelson ]
+  * Re-repack orig tarball to eliminate the tar-in-tar arrangement
+  * debian/rules: adjust to build without the tar-in-tar
+    - configure and build in ./BUILD
+    - 'clean' removes ./BUILD and files from autogen.sh
+    - adjust a lot of installation source paths
+    - pass both DEB_SRCDIR and DEB_BUILDDIR into debian/tools/Makefile
+  * debian/tools/Makefile: support separate src and build dirs
+  * debian/rules: modernise use of debhelper
+    - use dh_install instead of dh_movefiles
+    - move pathnames out of rules, into *.install, *.dirs, *.docs, *.examples
+    - side effect (but correct): move libsvn_swig_* from libsvn0{,-dev}
+      to python2.3-subversion and libsvn-core-perl
+    - install Java libraries to /usr/lib/jni, not /usr/lib (Closes: #327789)
+  * debian/rules, debian/control: disable libsvn-javahl on arm, armeb,
+    mips, mipsel, on advice from Jeroen van Wolffelaar.  It seems kaffe
+    may remain broken on these architectures for a while.  (Closes: #329184)
+  * debian/rules: rip out "architectures to run full testsuite on" logic,
+    on advice from Steve Langasek.  It is not safe to assume that
+    debian-specific changes to an upstream release will never cause test
+    failures.  Local admins can still use DEB_BUILD_OPTIONS=notest to
+    speed up a local compile.
+  * debian/control: relax all versioned build-deps; all the versions are
+    satisfied in sarge (and most of them in woody).
+  * debian/rules, debian/subversion-tools.{postinst,postrm,install}:
+    - move /usr/lib/subversion to /usr/share/subversion (Closes: #330824)
+    - move hot-backup.py to /usr/share/doc/subversion/examples
+    - create compat symlink /usr/lib/subversion
+  * debian/control: remove pkg-subversion-maintainers from Uploaders - it's
+    not the right place to document the existence of a list
+  * debian/control, debian/rules: build with kaffe-pthreads specifically
+    (works around a FTBFS with kaffe 1.1.6)
+
+ -- Peter Samuelson <peter@p12n.org>  Tue, 18 Oct 2005 03:03:27 -0500
+
+subversion (1.2.3a-1) unstable; urgency=low
+
+  * Welcome the Debian Subversion Team (Closes: #322257)
+  
+  [ Guilherme de S. Pastore ]
+  * New upstream release (Closes: #320417)
+    - tarball repackaged without svnbook, as it's licensed under
+      a non-DFSG-free license (Closes: #215083, #218185, #314154)
+    - fixes export segmentation fault with versioned items in
+      "deleted" state (Closes: #314381, #316133, #316227, #320572, #324037)
+  * debian/compat:
+    - bump to debhelper compatibility version 4
+    - no longer export DH_COMPAT from inside debian/rules
+  * debian/control:
+    - dropped auto-generation with m4
+    - dropped build-dependency on quilt
+    - bump to Standards-Version 3.6.2 with no changes
+    - removed Conflicts/Replaces on all packages not present in
+      stable anymore (Closes: #310519)
+  * debian/patches/ltmain.sh.patch:
+    - removed; applied upstream
+  * debian/patches/kaffe-cast.patch:
+    - removed; broken and unnecessary
+  * debian/subversion.doc-base.book:
+    - removed; the book is no longer present
+  * debian/README.Debian:
+    - Removed; was doing the work of a package description, and
+      mentioned the (removed) svnbook
+  * debian/python2.3-subversion.README.Debian:
+    - Renamed from pythonX.Y-subversion.README.Debian, we longer
+      use that auto-generation stuff
+  * debian/rules:
+    - tiny fixes to unbreak the build process
+    - include simple-patchsys.mk from CDBS instead of using quilt;
+      it was too complex for our needs
+    - fixed detection of tarballs, as to not get confused by CDBS
+      auto-generated lists, which would cause the build to fail
+    - no longer do any magic to auto-generate debian/control and
+      python related documentation; too complex for too little gain
+    - set LANG to C, otherwise the build may fail because of tests
+      failing for not being able to recognize strings returned by
+      some tools
+    - no longer do any magic to support builds on pre-sarge
+      environments; the package is already complex enough without
+      supporting old cruft unnecessarily
+  * Removed packaging documentation, as it was pretty much outdated
+  * Removed maintenance scripts from the package; left them
+    on the 'tools' section of the repository on svn.debian.org
+
+  [ David Kimdon ]
+  * Do not install vc-svn.el (closes: #314213, #315100, #324633)
+  * Autoload psvn.el by default. (closes: #223303, #235905, #305953)
+  * Remove hard-coded DEB_BUILDDIR from debian/rules.
+  * Enable javahl bindings by default (closes: #271125, #323839)
+
+  [ Peter Samuelson ]
+  * debian/patches/l10n-segfault.patch:
+    - fixes a "svn add" crash in the es, fr, it, pl, pt_BR and zh_TW
+      locales (Closes: #316143, #323376, #326079)
+  * debian/patches/rpath.patch:
+    - port to subversion 1.2.x and reenable (work in progress, suppresses
+      most rpaths)
+  * debian/lintian-overrides: new file for binary package overrides
+  * debian/rules:
+    - support DEB_BUILD_OPTIONS=noopt
+    - invent a DEB_BUILD_OPTIONS=notest to disable the test suite more
+      easily
+    - the INSTALL file is redundant, do not install it in /usr/share/doc
+    - change #!/usr/bin/env python to #!/usr/bin/python2.3 in assorted
+      scripts
+    - split and install lintian-overrides to appropriate packages
+    - minor cruft removal
+
+ -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br>  Fri,  9 Sep 2005 14:57:03 -0300
+
+subversion (1.2.0-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #310474)
+  * Fixes many bugs (some of these may have actually been fixed
+    before 1.2.0, in any case they are now fixed) :
+    svndumpfilter: no crash on 64-bit platforms (Closes: #309161)
+    symlink now works in "svn merge" (Closes: #296046)
+    svnserve does ipv6 (Closes: #235755) 
+    svn no longer can export non-existent files (Closes: #279080)
+    svn status "R" is documented in the svn book: (Closes: #269021)
+    Fix auth problem (Closes: #269165)
+    svn diff handles ctrl-c (Closes: #266973)
+  * Build-conflict with libsvn0 (<<1.2). This is a work-around to 
+    Debian bug 291641.
+  * The subversion book source has moved out of this package, install a
+    pre-built book.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed,  8 Jun 2005 22:19:21 -0700
+
+subversion (1.1.4-2) unstable; urgency=high
+
+  * Put call to dh_installdeb after call to dh_python.  Fixes purge
+    of python2.3-subversion (closes: #308777) 
+  * Disable full testsuite.  All archs have already past it.  No need to
+    burden the autobuilders with all the tests.
+  * Set DEB_BUILDDIR correctly since something is apparently setting it
+    incorrectly.
+
+ -- David Kimdon <dwhedon@debian.org>  Thu, 12 May 2005 21:04:56 -0700
+
+subversion (1.1.4-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #303179)
+  * Set LC_ALL for testsuite so build runs in a known environent.
+    (closes: #301495)
+  * Omit unnecessary svn.vim (now included in the standard vim distribution)
+    (closes: #298901)
+  * Try again to get -O2 in CFLAGS. (closes: #303744)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 27 Mar 2005 20:43:17 -0800
+
+subversion (1.1.3-3) unstable; urgency=low
+
+  * Add -O2 to CFLAGS.
+  * Fix trac's revision log (closes: #299817)
+    patche thanks to Torsten Landschoff <torsten@debian.org>
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 25 Feb 2005 20:25:02 -0800
+
+subversion (1.1.3-2) unstable; urgency=low
+
+  * Patches thanks to Torsten Landschoff <torsten@debian.org>
+   - Let cdbs handle updating config.{sub|guess}.
+   - Support swig 1.3.24.  (closes: #295452)
+  * Remove old upgrade notes from README.Debian.
+  * Fix doc url (closes: #293310)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 20 Feb 2005 11:31:34 -0800
+
+subversion (1.1.3-1) unstable; urgency=low
+
+  * New upstream release.  (closes: #290610, #288344, #290381)
+    - remove r12102.patch as it is integrated in this upstream release.
+  * Make libsvn0 conflict with libsvn-core-perl (= 1.0.9) (closes: #290807)
+  * Allow the build to use a 1.3.22 swig version since the Debian
+    version is patched to include the necessary runtime libraries.
+  * Don't start description synopses with a capital letter, make homepage
+    consistent explicit in package description (as suggested by the
+    Developer's Reference).
+  * Be more explicit about what the default apache module configuration
+    allows.  Default to a read-only repository for non-anonymous
+    users. (closes: #277303)
+  * The book isn't being built properly, stop building it and use the
+    version that is shipped with the tarball (closes: #282393).
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 15 Jan 2005 14:12:54 -0800
+
+subversion (1.1.1-2) unstable; urgency=low
+
+  * Fix minor incompatability between 1.0 and 1.1 libraries.
+    (closes: #275545)
+  * Remove conditionals and variables that allow debian/rules to 
+    support building subversion 1.0.
+  * Re-enable debian/patches/rpath.patch.  This get rpath out of
+    some of the binaries.
+  * Minor build system fixes.
+  * python2.3-subversion now Conflict/Replace's python2.1-subversion
+    (closes: #281047)
+  * Mention DAV in description of libapache2-svn package.
+    (closes: #277301)
+  * Uncomment section markers in default configuration files.  It is easy
+    to uncomment the option, but not the section marker and then wonder
+    why the change has not taken effect. (closes: #278162)
+  * Fix path to subversion book. (closes: #285240)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun,  5 Dec 2004 10:26:12 -0800
+
+subversion (1.1.1-1) experimental; urgency=low
+
+  * New upstream release.  (closes: #272000)
+  * Fix hard-coded swig version in debian/rules (closes: #276838)
+  * Mention 'dav' in the description of libapache2-svn so the package
+    is easier to find. (closes: #277302)
+  * Create libsvn-core-perl dependency on libsvn0 via the shlibs file
+    so the version is taken into account. (closes: #279439)
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 30 Oct 2004 07:59:52 -0700
+
+subversion (1.1.0-1) experimental; urgency=low
+  
+  * New upstream release. 
+  * Make debian/control.in a double-colon rule.  This allows us to 
+    build with old and new versions of cdbs.  We are not using
+    cdbs's debian/control rule.
+  * Increase debhelper build dependency to 4.1.25 since we use
+    dh_python. 
+  * Increase version number to prevent this package from being
+    removed from experimental.  (1.0.8-1 has been uploaded to 
+    unstable.)
+  * Disable testsuite on powerpc since I just ran it.
+  * Build depend on swig >= 1.3.22-2 so we get a runtime library
+    and the build doesn't fail.
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 25 Sep 2004 10:11:12 -0700
+
+subversion (1.0.6+1.1.0rc4-1) experimental; urgency=high
+
+  * New upstream release. 
+  * CAN-2004-0749: mod_authz_svn fails to protect metadata
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 24 Sep 2004 20:38:15 -0700
+
+subversion (1.0.6+1.1.0rc2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Build system changes so we can easily support subversion 1.1.x. 
+  * Minor build changes to support 1.1.x.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed,  8 Sep 2004 22:36:04 -0700
+
+subversion (1.0.6-2) unstable; urgency=high
+
+  * This package is source equivalent to 1.0.6-1.
+  * Remove debian/patches/apr_dir_make.patch as this is now fixed
+    in the apache2 version we depend on.
+  * Build depend on apache2 >= 2.0.50-11 so we get all fixes.
+  * Put version number to something that katie will not interpret as
+    a binary NMU.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed,  1 Sep 2004 22:03:43 -0700
+
+subversion (1.0.6-1.2.1) unstable; urgency=high
+
+  * Binary non-maintainer upload by temporary maintainer.
+
+ -- Matt Kraai <kraai@debian.org>  Thu, 26 Aug 2004 15:06:09 -0700
+
+subversion (1.0.6-1.2) unstable; urgency=high
+
+  * Non-maintainer upload with maintainer approval.
+  * Reverting the apache2/apr LFS transition by bumping our build-dep
+    to (>= 2.0.50-10), as the apache2 maintenance team has decided that
+    the ABI transition, while desireable, just wasn't manageable this
+    close to a release.
+  * Re-enable the testsuite on all arches to make sure all this ABI
+    buggery hasn't, well, buggered anything.
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri, 20 Aug 2004 10:34:24 -0600
+
+subversion (1.0.6-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload by temporary maintainer.
+  * Work around the apr_dir_make bug in Apache 2.0.50 (closes: #256909).
+  * Update apache build-dep to >= 2.0.50-9 (closes: #266170, #266193).
+
+ -- Matt Kraai <kraai@debian.org>  Tue, 17 Aug 2004 04:31:49 -0700
+
+subversion (1.0.6-1) unstable; urgency=high
+
+  * New upstream release.
+    - fix mod_authz_svn COPY security hole (closes: #261938)
+  * Depend on exim4 rather than exim. (closes: #255363)
+  * Link libsvn_swig_perl-1.so with all the libraries it depends on.
+    (closes: #262025)
+  * Update neon build-dep to >= 0.24.7.
+  * Update apache build-dep to >= 2.0.50.
+  * Refresh debian/patches/repos-templates.patch.
+  * Add build-dep on libkrb5-dev.
+  * Fix permissions on libsvn-core-perl shared libraries.
+  * Only remove modules from apache's configuration when we are
+    removing libapache2-svn, not on upgrades. (closes: #251245)
+    Additionally, move the module config manipulation from the postrm
+    to the prerm.  This way there is no time when apache is configured
+    to load a module that is not present on the system.
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 20 Jun 2004 15:34:57 +0200
+
+subversion (1.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fix CAN-2004-0413: Subversion svn:// protocol string parsing error.
+      (closes: #253694)
+  * Update build-depends to neon 0.24.6.
+  * Fix broken /etc/emacs/site-start.d/vc-svn.el (closes: #250058)
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 24 May 2004 14:45:09 +0200
+
+subversion (1.0.3-1) unstable; urgency=high
+
+  * New upstream release.
+    - fix CAN-2004-0397 :  Subversion remote vulnerability 
+      (closes: #249791)
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 19 May 2004 20:31:15 +0200
+
+subversion (1.0.2-5) unstable; urgency=low
+
+  * Fix apache modules link in a cleaner way.  Previously I had some
+    hard-coded link lines in debian rules.  The present change modfies the
+    subversion build system itself to hopefully do the right thing in all
+    cases.  This change is less invasive and should allow all archs to
+    build.  (closes: #246903)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun,  2 May 2004 11:09:20 +0200
+
+subversion (1.0.2-4) unstable; urgency=low
+
+  * Remove 'sudo' line that I didn't mean to commit and got included
+    in 1.0.2-3.  Thanks to Norbert Tretkowski for noticing.
+
+ -- David Kimdon <dwhedon@debian.org>  Sat,  1 May 2004 14:07:28 +0200
+
+subversion (1.0.2-3) unstable; urgency=low
+
+  * Fix apache modules link. (closes: #246258) 
+
+ -- David Kimdon <dwhedon@debian.org>  Sat,  1 May 2004 09:26:23 +0200
+
+subversion (1.0.2-2) unstable; urgency=low
+
+  * Fix python interpreter in svnshell. (closes: #245473)
+  * Include manpage for svn_load_dirs.  Thanks to Per Olofsson.
+    (closes: #245630)
+  * Remove rpath from shared libraries.
+  * Archs not marked to run the testsuite will now still run basic_tests.py
+  * Disable full testsuite on archs that have passed it for 1.0.2-1.
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 23 Apr 2004 20:53:43 +0200
+
+subversion (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+    * fix assertion failure in vwrite_tuple() (closes: #241076)
+  * Remove shlibs.local (closes: #244466)
+  * Put back in svnshell, patch the error messages so they are not
+    confusing (closes: #234462).
+  * Point to /usr/bin/svnshell as an example to help get started using 
+    the pythong bindings. (closes: #239924)
+  * subversion now suggests subversion-tools.  This may make it easier
+    to find the tools contained in subversion-tools. (closes: #243917)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 18 Apr 2004 16:09:55 +0200
+
+subversion (1.0.1-3) unstable; urgency=low
+
+  * Fix python2.3-subversion and subversion-tools priority so they are
+    the same as the priorities in the override file.
+  * Fix libtool problem by no longer doing the LIBTOOL_IS_A_FOOL
+    hack. (closes: #242460)
+  * Fix hard-coded link in debian/rules to link with ptoper swig.
+
+ -- David Kimdon <dwhedon@debian.org>  Sat,  3 Apr 2004 11:13:29 +0200
+
+subversion (1.0.1-2) unstable; urgency=low
+
+  * Apply changes up to the current head of the 1.0.x branch. 
+    This line is making its way to become 1.0.2.  The diff was
+    obtained like this:
+    svn diff http://svn.collab.net/repos/svn/tags/1.0.1 \
+             http://svn.collab.net/repos/svn/branches/1.0.x@9275
+    - Fix recursive propset (closes: #238558) 
+  * Increase swig build dependancy to 1.3.21-2 so we get a working
+    dependancy. (closes: #237230)
+
+ -- David Kimdon <dwhedon@debian.org>  Fri,  2 Apr 2004 20:19:46 +0200
+
+subversion (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Change libsvn0-dev and subversion-tools priority to extra so that
+    there is no longer a disparity between the override file and the
+    control file.
+  * cvs2svn is no longer part of this package, request for package filed,
+    see http://bugs.debian.org/237934 .
+  * libswig1.3 provides an incorrect shlibs file, add proper dependancies 
+    to debian/shlibs.local (closes: #220107)
+
+ -- David Kimdon <dwhedon@debian.org>  Thu, 11 Mar 2004 12:21:33 +0100
+
+subversion (1.0.0-2) unstable; urgency=low
+
+  * Apply changes up to the current head of the 1.0.x branch. 
+    This line is making its way to become 1.0.1 which is expected
+    to be released soon.  The diff was obtained like this:
+     svn diff http://svn.collab.net/repos/svn/tags/1.0.0 \
+              http://svn.collab.net/repos/svn/branches/1.0.x@8939 
+    - Fix directory walk ordering on filesystems that don't return
+    '.' first.  (closes: #231364)
+    - Many other fixes.
+  * Fix description of the subversion book (it is a version control,
+    not a revision control system)
+  * Remove local copy of patchsys-quilt.mk and add version to quilt build-dep.
+  * Don't strip binaries if 'nostrip' is in DEB_BUILD_OPTIONS.
+  * Patch from Erno Kuusela to 50vc-svn.el so subversion vc backend doesn't
+    supersede an existing default.
+  * Don't ship .pyc files in pythonX.Y-subversion.  These files should instead
+    be generated in the postinst. (closes: #236170)
+  * Detect if debian/control is invalid.  If invalid then recreate it and
+    exit failure telling the user to try again.  (closes: #204253)
+  * Add debian/shlibs.local which needs to stay around until #231659
+    is fixed (closes: #234932).
+  * Fix broken stamp files that were among other things making the build
+    execute the configure and autogen rules unnecessarily.
+  * Update to policy 3.6.1 (no changes).
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 23 Feb 2004 22:32:22 +0100
+
+subversion (1.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - INSTALL no longer says Subversion is alpha. (closes: #232945)
+    - Remove cvs2svn manpage.
+  * Fix formatting of NEWS.Debian. (closes: #232940)
+  * Put version in shlibs file.  In the last upload I removed all version
+    info from the shlibs file rather than converting = to >=.
+  * Enable testsuite on many archs.
+  * Build with srcdir == builddir.  This fixes some problems in the
+    perl bindings and generally makes the build system cleaner.
+  * Remove svnadmin-static.  With the build system changes it wasn't 
+    easy to keep it and we won't need it for a while if ever.
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 21 Feb 2004 08:49:04 +0100
+
+subversion (0.37.0-3) unstable; urgency=low
+
+  * When saying you need to dump/reload your repository it is helpful
+    to provide the path to the manual which describes how to do so.
+    (closes: #231176)
+  * Include README and HACKING. (closes: #218052)
+  * Mention to abbreviation 'svn' in short package descriptions.
+    (closes: #231698)
+  * shlibs file now creates a >= dependancy rather than a strict =.
+    (closes: #231681)
+  * Don't include svnshell.  It is just an example of how to use the 
+    bindings and isn't for general consumption. (closes: #230534)
+  * New package libsvn-core-perl. (closes: #208935)
+  * Fix doc build by giving the new path to the docbook stylesheets.
+    (closes: #231981)
+  * Start using 'quilt' and part of 'cdbs' to maintain separate pataches
+    within the source package.
+  * Fix default repos templates. (closes: #210901)
+  * Update swig build-dep to >= 1.3.21.  This isn't actually required
+    by Subversion but I have some current Subversion bug reports that
+    indicate mixing 1.3.19 builds with 1.3.21 systems may cause problems.
+  * Pass fulll path the swig to configure so as to ensure we use the swig
+    from the Debian package.
+  * Don't pass broken CFLAGS to swig wrapper build (closes: #232591)
+
+ -- David Kimdon <dwhedon@debian.org>  Sat,  7 Feb 2004 00:00:41 +0100
+
+subversion (0.37.0-2) unstable; urgency=low
+
+  * Remove more references to Subversion being alpha (closes: #230744) 
+  * Fix up debian/build.sh so the source package has all necessary files.
+    (closes: #230948)
+  * It looks like all archs have built the new swig now, so try this build
+    again (closes: #230955)
+  * NEWS.Debian and README.Debian made references to subversion 
+    0.35.1-1 which was never uploaded.  Fix those references so they point
+    to 0.37.0-1.
+
+ -- David Kimdon <dwhedon@debian.org>  Mon,  2 Feb 2004 19:56:12 +0100
+
+subversion (0.37.0-1) unstable; urgency=low
+  
+  ** NOTE: Repository dump/reload required.  See NEWS.Debian **
+
+  * New upstream release.
+    - Subversion is getting close to the 1.0 release (closes: #193062)
+    - svnserve ssh now accepts user@host (closes: #202885)
+  * Rebuild against new libapr. (closes: #230311)
+  * doc build has changed since the last release, update so it still builds.
+  * Add build-conflicts against broken libtool 1.5-6.
+  * Don't build book since the source distribution already provides
+    us with a built book.
+  * Build with Berkeley DB 4.2.
+  * Increase required apache2 version to 2.0.48-7 so we build with the
+    same version of Berkeley DB.
+  * No longer install binaries that include debug symbols.
+  * Autogenerated cruft is no longer part of the source package's diff.
+  * Update debian/copyright notice for 2004.
+  * The default /etc/subversion/config and /etc/subversion/servers are now
+    generated as part of the build.
+  * Link libsvn_swig_py properly. (closes: #220107)
+  * Remove note from debian/control saying that this is an alpha release.
+
+ -- David Kimdon <dwhedon@debian.org>  Tue, 18 Nov 2003 21:39:50 +0100
+
+subversion (0.33.0-1) unstable; urgency=low
+
+  * New upstream release. (closes: #220672)
+    - fix internal diff library (closes: #218406, #220474)
+    - cvs2svn fixed (closes: #216868)
+  * Change build dependancy from apache2-devb to apache2-threaded-dev.
+  * Remove hack to get around broken apr-config now that bug #197685 is
+    fixed.
+  * Build depend on docbook-xsl rather than docbook-xsl-stylesheets.
+    (closes: #220788)
+  * Now that neon 0.24.4 is available increase build dependancy to require
+    it.  Subversion itself doesn't require the new version but there are
+    enough bug fixes in that version of neon that it is better to use it.
+  * Enable mod_dav_fs in libapache2-svn.postinst (closes: #219620)
+  * Fix propchange-email.pl and commit-access-control.pl interpreter
+    (closes: #220692)
+  * Corrent python invocation in svnperms.py.
+  * Update /etc/subversion/{config,servers}
+  * Update debian/copyright. Re-sync with current upstream license (remove
+    reference to expat-lite, add reference to apr-util).  Fix download
+    URL to point only to http://subversion.tigris.org rather than trying
+    to show the exact URL since that can change.
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 15 Nov 2003 22:29:33 +0100
+
+subversion (0.32.1-1) unstable; urgency=low
+
+  * New upstream release.
+    New manpages. (closes: #206646)
+  * The source package shouldn't be in Debian native format. (closes: #216514) 
+  * Update default /etc/apache2/mods-available/dav_svn.conf with some better
+    comments and bring it up to date with current required syntax.
+  * Move last dump/reload notes from NEWS.Debian into README.Debian since it
+    isn't news anymore.
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 19 Oct 2003 19:22:52 +0200
+
+subversion (0.31.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove Matt Kraai from Uploaders field. Thanks for all the help 
+    Matt! 
+  * Wrote debian/tools/svn-make-config.c which is a tool that helps to
+    create default config files.  Maybe this can be included upstream
+    somehow.  Update /etc/subversion/{config,servers}
+  * Include svnadmin-static manpage.
+
+ -- David Kimdon <dwhedon@debian.org>  Tue,  7 Oct 2003 07:03:12 +0200
+
+subversion (0.30.0-2) unstable; urgency=low
+
+  * Adjust dynamic linker search path and location of svnversion 
+    binary so the book build doesn't generate a spurious error message.
+    As a bonus the version number in the built doc should be correct
+    now instead of saying 'Draft'.
+  * Set XSL_DIR when building the docs so we can find things like
+    docbook.xsl. It appears as though this succeeded when I built 
+    0.30.0-1 because make didn't need to recreate the documentation
+    completely.  On the autobuilders this was not the case.
+    (closes: #213116)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 28 Sep 2003 21:24:55 +0200
+
+subversion (0.30.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update /etc/subversion/{config,servers}
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 24 Sep 2003 22:15:17 +0200
+
+subversion (0.29.0-2) unstable; urgency=low
+
+  * Force neon build dependancy and libsvn0-dev dependancy to libneon24.
+    In reality neon 0.23.9 or greater will work, but since we need to 
+    hard-code the version in the libsvn0-dev dependnacy it is simpler to just
+    force libneon24. (closes: #206031)
+  * Disable testsuite on archs where it has passed.
+  * Remove unneeded, crufty shlibs.local.
+  * Make debian/control read-only to discourage edits to it rather than
+    debian/control.in. (closes: #211091)
+  * Drop debhelper build dependancy back to >=3 so it is easier to 
+    build the package on old systems.
+  * Actually install NEWS.Debian rather than having it sit in the
+    source package where no one can see it. (closes: #210684, #210822)
+  * Update /etc/subversion/config and /etc/subversion/servers
+  * Make package descriptions more clear and detailed. (closes: #210065)
+  * Fix commit-email.pl (closes: #211577)
+  * Remove extra hyphen in subversion.preinst rm's and make a note 
+    about why we are doing the rm.
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 14 Sep 2003 09:04:35 +0000
+
+subversion (0.29.0-1) unstable; urgency=low
+
+  * New upstream release:
+    - Work with neon 0.24 (closes: #206031).
+    - Handle tool rearrangment, thanks to Kevin M. Rosenberg (closes:
+      #208813).
+  * Require debhelper 4.1.51 or later to install NEWS.Debian.
+
+ -- Matt Kraai <kraai@debian.org>  Fri, 05 Sep 2003 16:14:51 -0700
+
+subversion (0.27.0-1) unstable; urgency=low
+
+  * Merge multi-line depends and build-depends fields (closes: #203413).
+  * Fix verb conjugations in libapache2-svn's description (closes:
+    #203417).
+  * Change Apache location from /svn/repos to /svn (closes: #203301).
+  * Change the default repository location to /var/lib/svn.
+  * Force dependencies on libsvn0 to require the same version that was
+    used to build (closes: #203454).
+  * Move svnindex.css and svnindex.xsl to /var/www/apache2-default in
+    libapache2-svn (closes: #203749).
+  * Include "svn" in the description of subversion (closes: #204179).
+  * Regenerate control (closes: #205311).
+
+ -- Matt Kraai <kraai@debian.org>  Thu, 14 Aug 2003 16:22:04 -0700
+
+subversion (0.26.0-1) unstable; urgency=low
+
+  * Add self to Uploaders.
+  * New upstream release:
+    - Handle absolute paths in svn_load_dirs.pl (closes: #187331).
+    - Call Cmd.__init__ in svnshell.py (closes: #198140).
+    - Handle paths containing quotes in cvs2svn (closes: #201290).
+  * Build-depend on apache2-dev (>= 2.0.47), libapr0-dev (>= 2.0.47), and
+    libneon23-dev (>= 0.23.9).
+  * Include fixes from 0.25-0.1 (closes: #198304, #199015, #199710,
+    #200657, #201009).
+  * Add perl (>= 5.8.0-7) to subversion-tools's dependencies (closes:
+    #191138).
+  * Add liburi-perl (>= 1.17-1) to subversion-tools's dependencies
+    (closes: #198143).
+  * Rename libapache2-dav-svn to libapache2-svn and include mod_authz_svn
+    (closes: #198182).
+
+ -- Matt Kraai <kraai@debian.org>  Thu, 24 Jul 2003 05:55:37 -0700
+
+subversion (0.25-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * Add missing files to python2.2-subversion (closes: #199015).
+  * Make subversion-tools replace subversion (<< 0.22.1-1)
+    (closes: #198304).
+
+ -- Matt Kraai <kraai@debian.org>  Sat, 12 Jul 2003 15:29:45 +0200
+
+subversion (0.24.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix quoting error in debian/rules that was breaking the swig build.
+  * Add shlibs.local to work around problems like bug 197989.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 18 Jun 2003 18:06:55 -0700
+
+subversion (0.24.1-1) unstable; urgency=low
+  
+  * New upstream release :
+    - no long includes svn-deisgn info document (closes: #196412)
+  * strip svnadmin-static.  It is very large and not needed for 
+    debugging since the shared version of svnadmin can be used as long
+    as the package is installed.
+  * Follow apache2 change to module build helper (apxs -> apxs2).
+    (closes: #196577)
+  * Update apache2 and apr build dependancy.
+  * Build fixes thanks to Michael Cardenas <mbc@debian.org>
+  * Update build dependancy libsasl-dev -> libsasl2-dev.
+  * svn-design.info is no longer built, remove texinfo build-dep.
+  * Update apache2 example configuration based on input from
+    solo turn <soloturn99@yahoo.com> (closes: #197089)
+  * Don't attempt to load vc-svn when package has been removed and 
+    only conffiles remain, patch thanks to Kalle Olavi Niemitalo <kon@iki.fi>
+    (closes: #193427)
+  * work around problem with apr-config (see bug #197685).
+
+ -- David Kimdon <dwhedon@debian.org>  Sun,  1 Jun 2003 20:45:05 -0700
+
+subversion (0.23.0-2) unstable; urgency=low
+
+  * Abort build on testsuite failure.
+  * Create a proper source package. (closes: #194517)
+  * Fix export over ra_svn. Thanks to Branden Robinson for the fix and
+    offering to NMU. (closes: #193060)
+  * Update comment-out vc-svn autoload commands to avoid problems with
+    xemacs. Thanks to Kalle Olavi Niemitalo <kon@iki.fi> for the 
+    problem analysis and patch. (closes: #191632)
+  * Disable testsuite on archs that passed 0.23.0-1.
+
+ -- David Kimdon <dwhedon@debian.org>  Thu, 22 May 2003 09:52:35 -0700
+
+subversion (0.23.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add build-dep on xsltproc, docbook-xsl-stylesheets, create
+    html version of book during build.
+  * Update to standards version 3.5.10 (no changes).
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 19 May 2003 18:34:24 -0700
+
+subversion (0.22.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Don't strip objects. This is a deliberate policy violation.  The
+    goal is to lower the barrier to anyone wishing to debug this
+    software.  See the notes in Bug#193062 for more info. 
+  * Let debhelper create conffiles.
+  * Include perl dependancy information in subversion-tools package 
+    (closes: #191138, #187324).
+  * Disable testsuite on archs that passed 0.22.1-1.
+
+ -- David Kimdon <dwhedon@debian.org>  Tue, 13 May 2003 18:20:44 -0700
+
+subversion (0.22.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Tone down the warning in the package description about data loss, simply
+    indicate that this software is still in development.
+  * Apply 0.21.0 changes to debian/control.in that were erronously applied
+    only to debian/control. (closes: #190353)
+  * Include HACKING in /usr/share/doc/subversion/. (closes: #191450)
+  * Don't automatically load emacs lisp files. The bindings can still be 
+    enabled by the system administrator uncommenting the lines in 
+    /etc/emacs/site-start.d. (closes: #190804)
+  * Update build dependancy to require more recent apache2-dev and 
+    libapr0-dev (closes: #192595)
+  * Speed up ./debian/rules by limiting the number of times we exec dpkg.
+  * Add versioned build-dep on debhelper.
+  * Move the python script /usr/bin/svnshell from the 'subversion' 
+    package into the 'subversion-tools' package. ('subversion-tools' 
+    already had a python dependancy)
+
+ -- David Kimdon <dwhedon@debian.org>  Thu,  8 May 2003 08:16:13 -0700
+
+subversion (0.21.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Include svnshell. (closes: #187446)
+  * Include svnindex.css and svnindex.xsl. (closes: #185465)
+  * Make subversion priority optional. (closes: #188141)
+  * Update to policy 3.5.9 (no changes).
+  * Fix svn-dev.vim (closes: #187937).
+  * Fix emacs svn-status-mode (closes: #188706).
+  * Remove subversion-server package (closes: #182653).  As indicated 
+    in the bug report the subversion-server package was only necessary if
+    one wanted to use subversion with apache.  I don't see a compelling
+    need for the subversion-server package, all it did is depend on
+    subversion, subversion-tools and libapache2-dav-svn.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 16 Apr 2003 00:37:05 -0700
+
+subversion (0.20.1-2) unstable; urgency=low
+
+  * Fix svnversion breakage, again, sigh.  This time with a fix that 
+    is easier to maintain (no longer need to patch upstream source). 
+    (closes: #186966)
+  * Fix improperly generated source package (was in Debian native format).
+  * Update package sections for libsvn0-dev and python2.2-subversion 
+    based on new archive sections.
+  * Update debian/copyright (fix spelling of 'acknowledgment' and
+    extend copyright to 2003).
+  * Remove NEWS.Debian (was news from 0.17)
+  * Update /etc/subversion/[config,servers]
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 31 Mar 2003 07:34:01 -0800
+
+subversion (0.20.1-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 30 Mar 2003 18:14:01 -0800
+
+subversion (0.20-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- David Kimdon <dwhedon@debian.org>  Thu, 20 Mar 2003 21:43:10 -0800
+
+subversion (0.19.1-2) unstable; urgency=low
+
+  * Fix psvn.el autoload. (closes: #185130)
+  * Fix autobuild failure. (closes: #185088)
+  * Minor update to /etc/subversion/servers.
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 17 Mar 2003 07:00:17 -0800
+
+subversion (0.19.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Install psvn.el and vc-svn.el so they are autoloaded by emacs,
+    thanks to Martin Pool <mbp@sourcefrog.net> for a patch. (closes: #184032)
+  * Retiring svn-[buildpackage|inject] until I update them.
+
+ -- David Kimdon <dwhedon@debian.org>  Sun,  9 Mar 2003 18:45:57 -0800
+
+subversion (0.18.1-1) unstable; urgency=low
+
+  * New upstream minor release.
+  * add python fixups from woody backport
+  * disable testsuite for archs that have passed it
+  * fixup db tool path in hotbackup.py, again (closes: #182777)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 23 Feb 2003 13:22:45 -0800
+
+subversion (0.18.0-1) unstable; urgency=low
+
+  * New upstream release. (closes: #180910)
+    - Use new --with-editor configure switch to set default editor to
+      /usr/bin/editor (closes: #162632, #164371)
+    - New cvs2svn manpage thanks to Robert Bihlmeyer <robbe@orcus.priv.at> 
+      (closes: #176576)
+  * Fixups for woody backport
+    - libtool patch is back.  It is only applied for the versions of libtool
+      that need it (such as the libtool in woody).
+    - make the testsuite run on woody.
+  * Add build-dep on libsasl-dev.
+  * Make subversion-tools depend on an explicit version of subversion and
+    python2.2-subversion (closes: #180621)
+
+ -- David Kimdon <dwhedon@debian.org>  Sun,  9 Feb 2003 22:16:27 -0800
+
+subversion (0.17.1-2) unstable; urgency=low
+ 
+  * The Berkeley DB update as of 0.17.1-1 requires you to run 
+    'svnadmin recover /path/to/repos', see README.Debian for 
+    more information.
+ 
+  * Include prominent note in changelog, README.Debian and 
+    NEWS.Debian indicating steps required for Berkeley DB upgrade.
+    (closes: #178819)
+  * Don't include CHANGES twice. (closes: #178694) 
+  * libapache2-dav-svn depends on a specific version of apache2 
+    (closes: #178833)
+  * Build-Dep on apache2 packages tightened to >> 2.0.44-6 since -5 
+    didn't have a non-interative install, this made subversion fail on
+    some autobuliders.
+  * Disable testsuite on the archetectures that passed 0.17.1-1.
+  * Remove version information for libapache2-dav-svn dependancy on 
+    apache2 since apache2 is a virtual package.
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 27 Jan 2003 17:02:31 -0800
+
+subversion (0.17.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build against berkeley db 4.1.24.
+  * Apply some changes from revs 4521:4523 so cvs2svn works.
+  * Include CHANGES in /usr/share/doc/subversion/.  This is the upstream
+    summary of changes for each release.
+  * Compile against current libapr (closes: #177836).
+  * Fix path in svn_load_dirs (closes: #176610).
+  * Increase verbosity on testsuite so autobuilders don't kill the testsuite
+    due to inactivity. 
+  * Don't create arch independant packages in the binary-arch target 
+    (closes: #174381)
+  * Make testsuite run on sparc and alpha.  It wasn't previously being run 
+    due to a bug in the shell snippet that determines whether or not we want
+    it to run.
+  * Change libapache2-dav-svn dependancy from apache2-common to apache2,
+    we need one of the mpm's to have a working server (closes: #175902)
+  * Work-around for duplicate conffile entries created by debhelper.
+  
+ -- David Kimdon <dwhedon@debian.org>  Sun, 15 Dec 2002 11:08:02 -0800
+
+subversion (0.16.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * update /etc/subversion/config to include webdav compression option
+  * add back subversion.conffiles, it is needed for older versions of
+    debhelper.
+  * /etc/subversion/proxies renamed to /etc/subversion/servers (actually this
+    happenned with 0.15.0 or so but I forgot to note it here)
+  * upgrade to policy 3.5.8
+  * include the contents of tools/hook-scripts/ in subversion-tools package
+    (closes: #171997)
+  * patches from Brandon Ehle <behle@pipedreaminteractive.com> to fix swig
+    build
+  * cat tests.log on testsuite failure.
+  * fix the pathnames on some scripts from tools/ on install.
+  * compile with -Wall
+  * subversion-tools now depends on exim | mail-transport-agent
+  * sed cvs2svn at install so we find rcsparse.py (closes: #172284)
+
+ -- David Kimdon <dwhedon@debian.org>  Thu,  5 Dec 2002 07:52:24 -0800
+
+subversion (0.15.0-2) unstable; urgency=low
+
+  * Fix broken conffile (closes: #171323) 
+  * Don't run testsuite on archs that succeeded with 0.15.0-1.
+  * remove subversion.conffiles until Bug#126520 is closed.
+
+ -- David Kimdon <dwhedon@debian.org>  Sun,  1 Dec 2002 08:28:35 -0800
+
+subversion (0.15.0-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Add dependancy on libdb4.0-util for subversion and libapache2-dav-svn
+    packages.  In case a repository gets wedged we want db4.0_recover
+    available. Fix paths in hot-backup.py (closes: #169797, #169796)
+  * Doc install cleanup thanks to Jon Middleton <jjm@ixtab.org.uk>
+  * aprutl version checking hack, thanks to Jon Middleton <jjm@ixtab.org.uk>
+  * Include a statically linked svnadmin that we can copy to svnadmin-$(VERSION)
+    on upgrade if the repository format changes.  This facilitates a 
+    repository dump/reload.
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 29 Nov 2002 10:19:14 -0800
+
+subversion (0.14.5-1) unstable; urgency=low
+
+  * add hot-backup.py (closes: #164870)
+  * Make swig1.3 build-dep a versioned build-dep (closes: #166301)
+  * The suggested location of the passwd file for libapache2-dav-svn has
+    moved from /etc/svn to /etc/subversion since the command line tools
+    store configuration info in that directory.
+  * add subversion-tools package.
+  * Add subversion-server package.  This package depends on other packages
+    that you probably want to have if you are setting up a Subversion server.
+  * Don't ship svn-design.info anymore.  All the info we need can be
+    found in the Subversion book.
+  * Subversion handbook is now a xml book, "Subversion : The Definitive Guide" 
+    include the html version of this book.
+  * Build fixes and updates thanks to Jon Middleton <jjm@debian.org>
+  * Warn users upgrading from versions prior to 0.14.3 that they need to
+    do a dump/reload (closes: #163092).  At some point I'd like to find a 
+    good way of better automating the conversion.
+  * a few lintian fixes.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 23 Oct 2002 08:01:54 -0700
+
+subversion (0.14.3-3) unstable; urgency=low
+
+  * Put autogen back as a prerequisite for the clean target.  I 
+    erroneously removed the autogen.sh run in the last upload, this left 
+    us with a broken libtool.  (closes: #164781)
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 19 Oct 2002 09:10:03 -0700
+
+subversion (0.14.3-2) unstable; urgency=low
+
+  * Disable testsuite on archs that have already built 0.14.3-1 
+  * new package python2.2-subversion (based on package created by
+    the subversion-snapshot source).  These python bindings are used
+    by various scripts that we want to include eventually.
+  * libtool bug 98342 is fixed.  We don't need to patch ltmain.sh anymore
+    (closes: #163858)
+  * build against new libapr0 which has a versioned shlibs file 
+    (closes: #162814)
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 25 Sep 2002 22:57:41 -0700
+
+subversion (0.14.3-1) unstable; urgency=low
+
+  * New upstream release (closes: #158677)
+     - build against new libneon (closes: #160270)
+     - updated manpage (closes: #158834)
+  * make symlinks in /etc/apache2/ relative rather than absolute
+    (closes: #161268)
+  * Change priotiry (optional->extra).
+  * Update to standards version 3.5.7.
+    - honor 'nostrip' in DEB_BUILD_OPTIONS
+    - build with debug info by default 
+  * include default dav_svn.conf in the proper location so
+    we can disable mod_dav_svn when libapache2-dav-svn is removed 
+    (closes: #158549).
+  * Use /etc/subversion/config to give us proper editor behavior rather
+    than patching the C source as I had when I closed Bug#157129.
+  * Patch libsvn_subr so it respects /etc/subversion/config.
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 24 Aug 2002 11:36:11 -0700
+
+subversion (0.14.1-3) unstable; urgency=low
+
+  * rename apache module libapache-dav-svn -> libapache2-dav-svn 
+    to indicate it is an apache2 module (closes: #158133)
+  * remove libapache-dav-svn dependancy on apache2, we only need to depend
+    on apache2-common (closes: #158132)
+  * cleanup handling of config.{sub|guess}
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 26 Aug 2002 21:15:35 -0700
+
+subversion (0.14.1-2) unstable; urgency=low
+
+  * Autotools fixes prompted by a failed autobuild and based on recomendations 
+    in /usr/share/doc/autotools-dev/README.Debian.gz
+    - call configure with --host and --build flags based on the output of
+      dpkg-architecture
+    - symlink config.{sub|guess} during build so they are always up to date.
+      Add build-dep on autotools-dev.
+    - Call autogen.sh when cleaning the tree.  Add versioned build-dep 
+      on autoconf.
+  * Remove commented python package rule and python2.2-dev build-dep. 
+    (I do plan on making the python package like in subversion-snapshot 
+    in the future but still need to figure some things out.)
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 24 Aug 2002 07:42:49 -0700
+
+subversion (0.14.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * some build fixes thanks to Jon Middleton <jjm@ixtab.org.uk>
+  * libsvn0-dev priority changed from optional to extra since 
+    libsvn0-dev depends on extra libdb4.0-dev and policy forbids 
+    binary dependancies on packages with lower priorities.
+  * libneon build dep changed (libneon-dev -> libneon21-dev)
+  * Conform to policy section 12.4 (Editors and Pagers) which states 
+    that if the EDITOR variable is not set the program should use 
+    /usr/bin/editor when necessary.  (closes: #157129)
+
+ -- David Kimdon <dwhedon@debian.org>  Fri,  9 Aug 2002 19:29:12 -0700
+
+subversion (0.14.0-2) unstable; urgency=low
+
+  * Fix up descriptions to indicate this is no longer pre-alpha,
+    this is an alpha realease.
+  * remove version dependancy's from build-deps and libapache-dav-svn deps,
+    the versions cause more trouble than they are worth and the proper 
+    dependancy will be realized (for the most part) by way of libapr.
+  * rebuild with new apache2.
+
+ -- David Kimdon <dwhedon@debian.org>  Tue,  6 Aug 2002 20:51:36 -0700
+
+subversion (0.14.0-1) unstable; urgency=low
+
+  * New upstream. Alpha release.
+     - fix svn merge segfault (closes: #152461)
+     - requires new libneon (closes: #152622)
+  * Updates to svn-[inject|buildpackage]. 
+  * Install /etc/bash_completion.d/subversion.  (This allows for 
+    programmable completion for the svn command under bash.)
+  * Include svn-handbook and svn-design, register properly with info
+    directory (closes: #153262)
+  * libsvn -> libsvn0 and other fixes base on recommendations in 
+    Junichi Uekawa's Debian Library Packaging guide.
+  * Simplify libapache-dav-svn.postrm.
+  * Add url to package descriptions. 
+  * add build-dep on python-dev (closes: #153199)
+  * remove build-dep on texi2html and texinfo since build documents are
+    available in the distribution.
+  * enable mod_dav in libapache_dav_svn, thanks to minus <minus@toneby.com>
+    for catching the bug.
+
+ -- David Kimdon <dwhedon@debian.org>  Sun, 30 Jun 2002 19:44:50 -0700
+
+subversion (0.13.0-1) unstable; urgency=low
+
+  * New upstream.
+  * Actually uploading for real (closes: #97234)
+  * Build debug version if DEB_BUILD_OPTIONS says to.
+  * Include hack to fix broken apxs2, we include our own version of apxs2 
+    and use that during the build.  This will go away when apache2-dev 
+    is fixed, that will likely be the release after 2.0.37-2.
+  * include selection from INSTALL in README.Debian
+  * Make warnings in debian/control about this being in-development, 
+    pre-alpha software more conspicuous.
+  * Create /etc/apache2/mods-enabled/dav_svn.{load|conf} symlinks in
+    libapache-dav-svn.postinst if appropriate files exist in 
+    /etc/apache2/mods-available.  Delete these links in
+    libapache-dav-svn.postrm.
+  * include identical README.Debian in subversion and libapache-dav-svn
+    the info is pertinant to both packages.
+  * write svnadmin manpage
+
+ -- David Kimdon <dwhedon@debian.org>  Sat,  8 Jun 2002 08:19:04 -0700
+
+subversion (0.12.0-1) unstable; urgency=low
+
+  * New upstream.
+  * decided to delete apr/, apr-util/ and neon/ subdirs from original tarball.
+    We aren't using them, they just take up space.
+  * include experimental svn-inject and svn-buildpackage
+  * run testsuite during build
+  * add build-dep on python so we can run the testsuite
+  * update package descriptions
+  * bring back libsvn package
+
+ -- David Kimdon <dwhedon@debian.org>  Sat,  4 May 2002 09:41:54 -0700
+
+subversion (0.11.1-1) unstable; urgency=low
+
+  * New upstream.
+  * Now we aren't deleting the apr/ and neon/ subdirs, even though
+    we don't use them.
+  * add zlib1g-dev, bison, and patch to build depends.
+  * files previously in libsvn package are now in subversion package,
+    there aren't any other projects that use those libraries.
+  * build in build-svn to keep source tree cleaner.
+  * subversion-server package renamed to libapache-dav-svn
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 12 Apr 2002 20:16:22 -0700
+
+subversion (0.10.2-1) unstable; urgency=low
+
+  * New upstream.
+  * build against new apache2, neon, Berkeley DB
+  * stop using DBS, it was getting in my way.
+  * work around libtool bug #98342 with patch from the BTS.
+  * use Debian's libexpat rather than the included one.
+  * no longer using autoconf as part of the build.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 20 Feb 2002 22:52:29 -0800
+
+subversion (0.8.0-1) unstable; urgency=low
+
+  * New upstream.
+  * track releases now rather than snapshots.
+  * build-depend on libtool, autoconf
+  * use dbs build scripts from package rather than on filesystem
+  * /etc/apache2/modules->/etc/apache2/mods-available
+  * rename packages svn-[server|client]-svn 
+    -> subversion-[server|client]-svn 
+  * change LIBTOOL_IS_A_FOOL hack since libsvn_ra wasn't building 
+    properly
+  * create /etc/svn/ in subversion-server
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 23 Nov 2001 20:37:16 -0800
+
+subversion-svn (473-1) unstable; urgency=low
+
+  * New upstream.
+  * build against pre-release apache-2.0.28 package
+  * install manpages and info pages.
+  * don't strip libmod_dav_svn, otherwise apache can't load it
+  * get the module name right in dav_svn.load
+  * create repository in /var/svn in postinst if directory 
+    doesn't exist and set up symlinks for apache2
+  * remove dav_svn.conf on purge
+  * remove rpath
+  * subversion Debian package is now self-hosting
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 16 Nov 2001 22:01:32 -0800
+
+subversion-svn (282-2) unstable; urgency=low
+
+  * libexpat -> libsvn_expat to avoid conflict. 
+  * don't use maintainer-mode b/c apache2 doesn't
+  * override mod_dav_svn install rule so we can put it in the right
+    place.
+
+ -- David Kimdon <dwhedon@debian.org>  Tue, 23 Oct 2001 08:32:55 -0700
+
+subversion-svn (282-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- David Kimdon <dwhedon@debian.org>  Mon, 22 Oct 2001 15:35:25 -0700
+
+subversion-svn (256-1) unstable; urgency=low
+
+  * New upstream, various packaging fixes.
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 17 Oct 2001 14:02:58 -0700
+
+subversion-svn (252-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- David Kimdon <dwhedon@debian.org>  Fri, 28 Sep 2001 20:31:48 -0700
--- subversion-1.6.17dfsg.orig/debian/test.sh
+++ subversion-1.6.17dfsg/debian/test.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# This is the meager start to a script that will test the package.
+
+SVN=/usr/bin/svn
+SVNADMIN=/usr/bin/svnadmin
+
+# create test repository
+rm -rf /var/lib/svn/*
+
+$SVNADMIN create --fs-type fsfs /var/lib/svn
+$SVN mkdir -m '' file:///var/lib/svn/repos
+
+# uncomment repos stuff
+
+/etc/init.d/apache2 restart
+
--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.postinst
+++ subversion-1.6.17dfsg/debian/libapache2-svn.postinst
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+case "$1" in
+    configure)
+        if [ -z "$2" ]; then
+            # Enable on new installs only
+            a2enmod dav_svn
+        fi
+        if [ -f '/etc/apache2/#enable_authz_svn#' ]; then
+            # Enable on upgrades where this used to be implied by dav_svn.load
+            a2enmod authz_svn
+            rm -f '/etc/apache2/#enable_authz_svn#'
+        fi
+        invoke-rc.d apache2 restart || true
+        ;;
+esac
+
+#DEBHELPER#
--- subversion-1.6.17dfsg.orig/debian/python-subversion.README.Debian
+++ subversion-1.6.17dfsg/debian/python-subversion.README.Debian
@@ -0,0 +1 @@
+See /usr/bin/svnshell for an example that uses the python bindings.
--- subversion-1.6.17dfsg.orig/debian/subversion.NEWS
+++ subversion-1.6.17dfsg/debian/subversion.NEWS
@@ -0,0 +1,38 @@
+subversion (1.5.0dfsg1-1) experimental; urgency=low
+
+  * As did Subversion 1.4.0, Subversion 1.5.0 will SILENTLY UPGRADE the
+    format of any working copy it touches.  Thereafter, you won't be able
+    to use earlier Subversion releases with the same working copy.
+  * In order to use certain features of 1.5.0, you will need to upgrade
+    your repositories.  Unlike with working copies, this is not done
+    automatically; use the 'svnadmin upgrade' command.
+  * A lot has changed in 1.5.0; you are encouraged to read
+    /usr/share/doc/subversion/svn_1.5_releasenotes.html .
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 24 Jul 2008 00:03:29 -0500
+
+subversion (1.4.6dfsg1-2) unstable; urgency=low
+
+  If you are using BDB repositories, you will get "DB_VERSION_MISMATCH"
+  errors when you try to use them with recent Subversion, due to the move
+  to db4.6.  To fix this, just run 'svnadmin recover /path/to/repo' for
+  each affected repository.  We apologise for the inconvenience.
+
+ -- Peter Samuelson <peter@p12n.org>  Tue, 12 Feb 2008 06:49:14 -0600
+
+subversion (1.4.0~rc4-1) experimental; urgency=low
+
+  Subversion 1.4.0 will SILENTLY UPGRADE the format of any working copy
+  it touches.  Thereafter, you won't be able to use earlier Subversion
+  releases with the same working copy.  The good news is that this new
+  format is much more efficient than the old; you should notice a
+  respectable speed increase for operations such as 'svn status',
+  especially with large checkouts.
+
+  1.4.0 also brings an incompatible enhancement (known as 'svndiff1') to
+  the repository storage format, reducing disk usage by something like
+  30%.  However, this ONLY affects new repositories, created with svnadmin
+  1.4.  Existing repositories will continue to use the old format.  If you
+  want to take advantage of svndiff1, dump and reload your repositories.
+
+ -- Peter Samuelson <peter@p12n.org>  Sun, 23 Jul 2006 15:49:56 -0500
--- subversion-1.6.17dfsg.orig/debian/subversion-tools.install
+++ subversion-1.6.17dfsg/debian/subversion-tools.install
@@ -0,0 +1,16 @@
+tools/hook-scripts/*			usr/share/subversion/hook-scripts
+BUILD/tools/hook-scripts/*		usr/share/subversion/hook-scripts
+BUILD/contrib/hook-scripts/commit-email.pl	usr/share/subversion/hook-scripts
+BUILD/contrib/client-side/svn_load_dirs/svn_load_dirs.pl  usr/bin
+
+tools/server-side/svn-backup-dumps.py		usr/bin
+contrib/server-side/svn-fast-backup		usr/bin
+contrib/client-side/svn-clean			usr/bin
+contrib/client-side/svn_apply_autoprops.py	usr/bin
+contrib/client-side/svnmerge/svnmerge.py	usr/bin
+contrib/client-side/svn2cl/svn2cl.sh		usr/bin
+contrib/client-side/svn2cl/*.xml		etc/svn2cl
+contrib/client-side/svn2cl/*.xsl		etc/svn2cl
+contrib/client-side/svn2cl/*.css		etc/svn2cl
+debian/bin/svn-bisect				usr/bin
+debian/bin/svnwrap				usr/bin
--- subversion-1.6.17dfsg.orig/debian/subversion.docs
+++ subversion-1.6.17dfsg/debian/subversion.docs
@@ -0,0 +1,6 @@
+HACKING
+README
+notes/sasl.txt
+notes/webdav-proxy
+notes/svnsync.txt
+debian/svn_1.5_releasenotes.html
--- subversion-1.6.17dfsg.orig/debian/authz_svn.load
+++ subversion-1.6.17dfsg/debian/authz_svn.load
@@ -0,0 +1,2 @@
+# Depends: dav_svn
+LoadModule authz_svn_module /usr/lib/apache2/modules/mod_authz_svn.so
--- subversion-1.6.17dfsg.orig/debian/subversion.install
+++ subversion-1.6.17dfsg/debian/subversion.install
@@ -0,0 +1,10 @@
+debian/tmp/usr/bin/svn*			usr/bin
+debian/tmp/usr/share/locale		usr/share
+debian/tmp/usr/share/man/man1		usr/share/man
+debian/tmp/usr/share/man/man5		usr/share/man
+debian/tmp/usr/share/man/man8		usr/share/man
+
+BUILD/dummy_home/.subversion/config	etc/subversion
+BUILD/dummy_home/.subversion/servers	etc/subversion
+contrib/client-side/emacs/psvn.el	usr/share/emacs/site-lisp
+debian/etc/50psvn.el			etc/emacs/site-start.d
--- subversion-1.6.17dfsg.orig/debian/python-subversion.dirs
+++ subversion-1.6.17dfsg/debian/python-subversion.dirs
@@ -0,0 +1 @@
+usr/bin
--- subversion-1.6.17dfsg.orig/debian/subversion-tools.dirs
+++ subversion-1.6.17dfsg/debian/subversion-tools.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/doc/subversion-tools
+usr/share/doc/subversion/examples
--- subversion-1.6.17dfsg.orig/debian/libsvn-perl.lintian-overrides
+++ subversion-1.6.17dfsg/debian/libsvn-perl.lintian-overrides
@@ -0,0 +1,2 @@
+# nobody but us will ever link to this, so we don't ship a shlibs file
+no-shlibs-control-file usr/lib/*/libsvn_swig_perl-1.so.*
--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.examples
+++ subversion-1.6.17dfsg/debian/libapache2-svn.examples
@@ -0,0 +1 @@
+tools/xslt/svnindex.*
--- subversion-1.6.17dfsg.orig/debian/libsvn-ruby1.8.lintian-overrides
+++ subversion-1.6.17dfsg/debian/libsvn-ruby1.8.lintian-overrides
@@ -0,0 +1,2 @@
+# nobody but us will ever link to this, so we don't ship a shlibs file
+no-shlibs-control-file usr/lib/*/libsvn_swig_ruby-1.so.*
--- subversion-1.6.17dfsg.orig/debian/libsvn-dev.install
+++ subversion-1.6.17dfsg/debian/libsvn-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/subversion-1
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/*.la
--- subversion-1.6.17dfsg.orig/debian/libsvn-ruby.links
+++ subversion-1.6.17dfsg/debian/libsvn-ruby.links
@@ -0,0 +1 @@
+usr/share/doc/libsvn-ruby1.8 usr/share/doc/libsvn-ruby
--- subversion-1.6.17dfsg.orig/debian/libsvn-doc.examples
+++ subversion-1.6.17dfsg/debian/libsvn-doc.examples
@@ -0,0 +1 @@
+tools/examples/*.c
--- subversion-1.6.17dfsg.orig/debian/subversion-tools.docs
+++ subversion-1.6.17dfsg/debian/subversion-tools.docs
@@ -0,0 +1,3 @@
+contrib/client-side/svnmerge/svnmerge.README
+contrib/client-side/svn_load_dirs/svn_load_dirs.README
+contrib/client-side/svn_load_dirs/svn_load_dirs_property_table.example
--- subversion-1.6.17dfsg.orig/debian/subversion.README.Debian
+++ subversion-1.6.17dfsg/debian/subversion.README.Debian
@@ -0,0 +1,56 @@
+Subversion for Debian
+=====================
+
+Subversion is maintained by a team at:
+
+  http://pkg-subversion.alioth.debian.org/
+
+
+NFS and Repositories
+--------------------
+You should never host a BDB-format repository on an NFS volume: it can
+lead to data corruption and data loss.  We recommend the svn://
+(svnserve) or svn+ssh:// (ssh tunnel) access methods instead.
+
+A FSFS repository can be hosted on NFS, but make sure you have the
+'lockd' daemon (from the 'nfs-common' package) running on both client
+and server.  See also this Subversion FAQ entry:
+
+  http://subversion.tigris.org/faq.html#nfs
+
+
+The umask issue
+---------------
+If you are sharing BDB repositories between multiple users, you may
+wish to use the 'svnwrap' script after setting proper permissions.
+This sets 'umask 002' before running the real subversion binary.  See
+'man svnwrap' for details.
+
+
+Emacs and Subversion
+--------------------
+There are two packages that provide support for Subversion in Emacs:
+
+* psvn.el:
+
+  A PCL-CVS-style interface for Subversion.
+
+* vc-svn.el:
+
+  A Subversion backend for the Emacs VC system.  This is no longer
+  included in the Subversion package; maintainership has been taken
+  over by the Emacs project.  It will be included in Emacs 22, and is
+  now available in the 'emacs-snapshot' package.  It is not currently
+  in Xemacs.
+
+  If you use Emacs 21 (vc-svn appears to be incompatible with Xemacs),
+  you will need to manually install an older version of vc-svn.el from
+  the Subversion site; the Emacs 22 version of vc-svn.el does not work
+  with older Emacsen.  You can download it using Subversion itself:
+
+    svn export \
+      http://svn.collab.net/repos/svn/trunk/contrib/client-side/vc-svn.el@9195
+
+  Place it in /usr/local/share/emacs/21.4/site-lisp/ or elsewhere in
+  your autoload path.  Then ensure that 'SVN appears in the list of the
+  custom variable vc-handled-backends.
--- subversion-1.6.17dfsg.orig/debian/rules
+++ subversion-1.6.17dfsg/debian/rules
@@ -0,0 +1,421 @@
+#!/usr/bin/make -f
+
+# DEB_BUILD_OPTIONS supported:
+#   noopt       Compile with gcc -O0 rather than -O2
+#   nostrip     Do not strip binaries and libraries
+#   debug       Enable additional debug support
+#   nocheck     Skip test suites (synonym 'notest')
+#   with-javahl, no-javahl |
+#   with-apache, no-apache | enable/disable certain packages
+#   with-ruby, no-ruby     |
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# Disable test-suite which got broken by apr 1.4.6
+DEB_OPT_NOCHECK := 1
+
+# Fully functional Java support is still a bit spotty on some Debian
+# architectures.  DISABLE_JAVAHL_ARCHS overrides ENABLE_JAVAHL=yes.
+# Note: the Build-Depends line in debian/control must be kept in sync
+# with DISABLE_JAVAHL_ARCHS.
+
+ENABLE_JAVAHL        := yes
+DISABLE_JAVAHL_ARCHS := alpha arm hppa m68k mips mipsel hurd-i386
+ifneq (,$(filter $(DEB_HOST_ARCH), $(DISABLE_JAVAHL_ARCHS)))
+  ENABLE_JAVAHL :=
+endif
+
+# We may need to disable libapache2-svn and/or libsvn-ruby*.
+ENABLE_APACHE        := yes
+ENABLE_RUBY          := yes
+
+DEB_BUILDDIR     := BUILD
+MAKE_B           := $(MAKE) -C $(DEB_BUILDDIR)
+
+export LANG := C
+export HOME := $(DEB_BUILDDIR)/dummy_home
+
+include /usr/share/quilt/quilt.make
+
+# ENABLE_FOO -> DEB_OPT_WITH_FOO=1
+# DEB_BUILD_OPTIONS='foo bar' -> DEB_OPT_FOO=1, DEB_OPT_BAR=1
+# DEB_BUILD_OPTIONS='no-foo' -> DEB_OPT_WITH_FOO=""
+$(foreach o, JAVAHL APACHE RUBY, $(if $(filter y yes 1,$(ENABLE_$o)), \
+    $(eval DEB_OPT_WITH_$o := 1),$(eval DEB_OPT_WITH_$o :=)))
+d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS" | tr 'a-z-,' 'A-Z_ ')
+$(foreach o, $(d_b_o), \
+  $(if $(findstring =,$o), $(eval DEB_OPT_$o), $(eval DEB_OPT_$o := 1)))
+$(foreach o, $(filter NO_%,$(d_b_o)), $(eval DEB_OPT_$(subst NO_,WITH_,$o) :=))
+$(if $(DEB_OPT_PARALLEL),$(eval MAKEFLAGS += -j$(DEB_OPT_PARALLEL)))
+
+# How to fix "#!/usr/bin/env " lines:  $(call fix_shebangs_in, /your/dir)
+fix_shebangs_in = \
+	find $1 -type f | xargs -r egrep -m1 -c '^\#! ?/' | sed -n 's/:1//p' |\
+	xargs -r sed -i -e 's:^\#! */usr/bin/env perl.*:\#!/usr/bin/perl -w:' \
+			-e 's:^\#! */usr/bin/env pyth.*:\#!/usr/bin/python:' \
+			-e 's:^\#! */usr/bin/env ruby.*:\#!/usr/bin/$(RUBY):'
+
+PERL_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/perl/native
+PY_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/python
+PYVERSIONS := $(shell pyversions -vi)
+
+allpy = \
+	set -e; for v in $(PYVERSIONS); do \
+		$(RM) $(PY_DIR); \
+		ln -fs python$$v $(PY_DIR); \
+		pylib=$$(python$$v -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
+		$1; \
+	done
+
+libdir := /usr/lib/$(DEB_HOST_MULTIARCH)
+confflags := \
+		--prefix=/usr \
+		--libdir=$(libdir) \
+		--mandir=\$${prefix}/share/man \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-neon=/usr \
+		--without-serf \
+		--with-berkeley-db=:::db \
+		--with-sasl=/usr \
+		--with-editor=/usr/bin/editor \
+		--with-ruby-sitedir=/usr/lib/ruby \
+		--with-swig=/usr \
+		--with-kwallet \
+		--with-gnome-keyring
+
+ifdef DEB_OPT_DEBUG
+  confflags+= --enable-debug 
+endif
+export EXTRA_CFLAGS := -O2
+ifdef DEB_OPT_NOOPT
+  EXTRA_CFLAGS := -O0
+endif
+
+export DH_OPTIONS
+ifdef DEB_OPT_WITH_JAVAHL
+  # jikes 1.22 cannot compile javahl.
+  confflags += --enable-javahl --without-jikes \
+               --with-jdk=/usr/lib/jvm/java-gcj \
+               --with-junit=/usr/share/java/junit.jar
+else
+  DH_OPTIONS += -Nlibsvn-java
+  confflags += --disable-javahl
+endif
+
+ifdef DEB_OPT_WITH_APACHE
+  confflags += --with-apxs=/usr/bin/apxs2 --disable-mod-activation
+else
+  confflags += --without-apxs
+  DH_OPTIONS += -Nlibapache2-svn
+endif
+
+ifdef DEB_OPT_WITH_RUBY
+  RUBY := $(shell dh_listpackages | sed -ne '/libsvn-ruby1/s//ruby1/p')
+  rb_defs := SWIG_RB_SITE_LIB_DIR=$(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendordir']")
+  rb_defs += SWIG_RB_SITE_ARCH_DIR=$(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendorarchdir']")
+else
+  DH_OPTIONS += -Nlibsvn-ruby -Nlibsvn-$(RUBY)
+  RUBY := fooby
+endif
+
+
+# Set autoconf cross-compile mode correctly.
+# Also disable testsuite if cross-compiling.
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+  DEB_OPT_NOCHECK := 1
+endif
+
+
+# I'm not trying to be difficult: this check exists because building as
+# root really _does_ fail.  The failure mode as of 1.4.0 is test 17
+# from switch_tests.py.  Upstream response is "so don't build as root".
+# (fakeroot does not fail, as it does not wrap the access(2) syscall.)
+#
+# We run this code from build-arch, since that's what actually fails as
+# root, but also from autogen, since that will halt the build earlier.
+define DONT_BE_ROOT
+	@if [ $$(id -u) = 0 ] && [ -z "$(FAKEROOTKEY)" ]; then \
+		echo >&2 "***"; \
+		echo >&2 "*** Building as root is not supported ***"; \
+		false; \
+	fi
+endef
+
+debian/stamp-autogen: $(QUILT_STAMPFN)
+	$(DONT_BE_ROOT)
+	./autogen.sh
+	touch $@
+
+debian/stamp-configure: $(QUILT_STAMPFN) debian/stamp-autogen
+	dh_testdir
+
+	test -e patches || ln -s debian/patches patches
+	mkdir -p $(DEB_BUILDDIR) $(HOME)
+	cd $(DEB_BUILDDIR) && \
+		PYTHON=/usr/bin/python RUBY=/usr/bin/$(RUBY) \
+		$(CURDIR)/configure $(confflags)
+
+	# Subversion upstream ships with Swig 1.3.25 pregenerated
+	# files, which may interact badly with the build if Debian swig
+	# is not version 1.3.25 - particularly with swig 1.3.24.
+	# Thus we unconditionally delete the pregenerated files.
+	+$(MAKE_B) extraclean-swig
+	for v in $(PYVERSIONS); do \
+		cp -la $(PY_DIR) $(PY_DIR)$$v; \
+	done
+	$(RM) -r $(PY_DIR)
+
+	touch $@
+
+build: debian/stamp-build-arch debian/stamp-build-indep
+
+check_defs := CLEANUP=1 LC_ALL=C
+check_swig := check-swig-py check-swig-pl $(if $(DEB_OPT_WITH_RUBY),check-swig-rb)
+check_all := $(check_swig) $(if $(DEB_OPT_WITH_JAVAHL),check-javahl) check
+check-help:
+	@echo "$(MAKE) $(check_all)"
+
+check check-swig-rb check-javahl: debian/stamp-build-arch
+	+$(MAKE_B) $@ $(check_defs)
+
+check-swig-pl: debian/stamp-build-arch
+	+$(MAKE_B) $@ $(check_defs)
+	$(MAKE) -C $(PERL_DIR) test LC_ALL=C
+
+check-swig-py: debian/stamp-build-arch
+	$(call allpy, \
+	  $(MAKE_B) $@ PYTHON=python$$v PYVER=$$v $(check_defs))
+
+build-arch: debian/stamp-build-arch
+debian/stamp-build-arch: debian/stamp-configure
+	dh_testdir
+	$(DONT_BE_ROOT)
+
+	# note: autogen-swig does not support -jN
+	$(call allpy, $(MAKE_B) -j1 autogen-swig)
+	+$(MAKE_B) all tools
+	# Run svn once, to make sure it populates $(HOME)/.subversion/*
+	$(DEB_BUILDDIR)/subversion/svn/svn --version > /dev/null
+	$(call allpy, \
+	  $(MAKE_B) swig-py PYTHON=python$$v PYVER=$$v \
+	            PYTHON_INCLUDES=-I/usr/include/python$$v \
+	            swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
+	# note: swig-pl seems to have trouble with -jN
+	+$(MAKE_B) -j1 swig-pl
+	$(MAKE) -C $(PERL_DIR) all \
+		OPTIMIZE="-g -Wall $(EXTRA_CFLAGS)"
+ifdef DEB_OPT_WITH_RUBY
+	+$(MAKE_B) swig-rb $(rb_defs)
+endif
+ifdef DEB_OPT_WITH_JAVAHL
+	+$(MAKE_B) -j1 javahl
+endif
+	touch $@
+
+ifndef DEB_OPT_NOCHECK
+	@echo "###################################################"
+	@echo "Running testsuite - may take a while.  To disable,"
+	@echo "use DEB_BUILD_OPTIONS=nocheck or edit debian/rules."
+	@echo
+	$(MAKE) -f debian/rules $(check_swig)
+
+  ifdef DEB_OPT_WITH_JAVAHL
+	# This fails on current free JVMs, according to Blair Zajac.
+	# Thus the "-" prefix, to ignore failure, for now.
+	-$(MAKE) -f debian/rules check-javahl
+  endif
+
+	# Run 'check' last, as it takes longest.  'cat tests.log' is for
+	# obtaining diagnostics from buildd logs.
+	@if ! $(MAKE) -f debian/rules check; then \
+	  echo "###################################################"; \
+	  echo "Testsuite failed, 'tests.log' follows:"; echo; \
+	  cat $(DEB_BUILDDIR)/tests.log; \
+	  exit 1; \
+	fi
+endif
+	touch $@
+
+build-indep: debian/stamp-build-indep
+debian/stamp-build-indep: debian/stamp-configure
+	+$(MAKE_B) doc-api
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_clean
+	$(RM) patches
+	! [ -f $(DEB_BUILDDIR)/Makefile ] || $(MAKE_B) extraclean-swig distclean
+	$(RM) -r $(DEB_BUILDDIR)
+	$(RM) -r subversion/bindings/swig/ruby/test/.test-result
+	$(RM) build-outputs.mk gen-make.opts subversion/svn_private_config.h.in
+	find -name \*.pyc -exec $(RM) {} +
+	# these are (re)generated by autogen.sh
+	$(RM) subversion/bindings/swig/proxy/*.swg
+	$(RM) configure build/ltmain.sh build/libtool.m4 build/lt*.m4
+	$(RM) build/config.sub build/config.guess
+	$(RM) debian/stamp-*
+
+debian/stamp-install-indep: debian/stamp-build-indep
+	dh_prep -i
+	dh_installdirs -i
+
+ifdef DEB_OPT_WITH_JAVAHL
+	$(MAKE_B) install-javahl-java \
+		DESTDIR=$(CURDIR)/debian/tmp \
+		javahl_javadir=/usr/share/java \
+		javahl_javahdir=/usr/include/svn-javahl
+endif
+
+	dh_install -i
+
+	mkdir -p debian/libsvn-doc/usr/share/doc/libsvn1
+	mkdir -p debian/libsvn-doc/usr/share/doc/libsvn-doc
+	cp -a $(DEB_BUILDDIR)/doc/doxygen/html \
+		debian/libsvn-doc/usr/share/doc/libsvn1/
+	$(RM) debian/libsvn-doc/usr/share/doc/libsvn1/html/jquery.js
+	ln -s ../libsvn1/html debian/libsvn-doc/usr/share/doc/libsvn-doc/
+	mkdir debian/libsvn-doc/usr/share/doc/libsvn1/examples
+	ln -s ../libsvn1/examples debian/libsvn-doc/usr/share/doc/libsvn-doc/
+
+	# Install files for 'subversion-tools' package.
+	install $(DEB_BUILDDIR)/tools/backup/hot-backup.py \
+		debian/subversion-tools/usr/bin/svn-hot-backup
+
+	rm debian/subversion-tools/usr/share/subversion/hook-scripts/*.in
+	rm -r debian/subversion-tools/usr/share/subversion/hook-scripts/mailer/tests
+ifndef DEB_OPT_WITH_RUBY
+	rm debian/subversion-tools/usr/share/subversion/hook-scripts/*.rb
+endif
+
+	# Fix some scripts not to use #!/usr/bin/env.
+	$(call fix_shebangs_in, debian/*/usr/bin \
+		debian/subversion-tools/usr/share/subversion/hook-scripts)
+	cd debian/subversion-tools/usr/share/subversion/hook-scripts; \
+		chmod 0755 commit-email.pl commit-access-control.pl \
+			   mailer/mailer.py verify-po.py svnperms.py;
+
+	# Remove suffixes from binaries in /usr/bin
+	prename 's/\.(sh|pl|rb|py)$$//' debian/*/usr/bin/*
+
+	pod2man -c 'User Commands' -r "" contrib/client-side/svn-clean \
+		$(DEB_BUILDDIR)/contrib/client-side/svn-clean.1
+
+	touch $@
+
+debian/stamp-install-arch: debian/stamp-build-arch
+	dh_prep -s
+	dh_installdirs -s
+
+	$(MAKE_B) local-install install-tools \
+		DESTDIR=$(CURDIR)/debian/tmp toolsdir=/usr/bin
+	sed -i 's:/usr/lib/\([^/]*/\)?lib\([^ ]*\).la:-l\1:g' debian/tmp/usr/lib/*/*.la
+
+	$(call allpy, \
+	  $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \
+	            PYTHON=python$$v PYVER=$$v \
+	            swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
+	$(RM) debian/tmp/usr/lib/python*/*-packages/libsvn/*.la
+	$(RM) debian/tmp/usr/lib/python*/*-packages/libsvn/*.a
+
+ifdef DEB_OPT_WITH_JAVAHL
+	$(MAKE_B) install-javahl \
+		DESTDIR=$(CURDIR)/debian/tmp \
+		javahl_javadir=/usr/share/java \
+		javahl_javahdir=/usr/include/svn-javahl
+endif
+
+	$(MAKE_B) install-swig-pl-lib \
+		DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C $(PERL_DIR) install \
+		MAN3EXT=3perl DESTDIR=$(CURDIR)/debian/tmp
+
+ifdef DEB_OPT_WITH_RUBY
+	$(MAKE_B) install-swig-rb $(rb_defs) \
+		DESTDIR=$(CURDIR)/debian/tmp
+	find debian/tmp/usr/lib/ruby \( -name \*.a -o -name \*.la \) -exec $(RM) {} +
+endif
+
+	cd debian/tmp/$(libdir); for lib in ra fs auth swig; do \
+	    $(RM) libsvn_$${lib}_*.so libsvn_$${lib}_*.la; \
+	done
+	cd debian/tmp/$(libdir); $(RM) libsvn_swig*.a libsvnjavahl.a libsvnjavahl.la
+	# Intermediate hack, until we can remove the rest of the .la files.
+	sed -i  "/dependency_libs/s/=.*/=''/" debian/tmp/$(libdir)/*.la
+	dh_install -s
+ifdef DEB_OPT_WITH_JAVAHL
+	mkdir -p debian/libsvn-java/$(libdir)
+	mv debian/libsvn-java/usr/lib/jni debian/libsvn-java/$(libdir)/
+endif
+	ln -s libsvn_ra_neon-1.so.1 debian/libsvn1/$(libdir)/libsvn_ra_dav-1.so.1
+
+	install -m644 tools/client-side/bash_completion \
+		debian/subversion/etc/bash_completion.d/subversion
+
+ifdef DEB_OPT_WITH_APACHE
+	install subversion/mod_authz_svn/INSTALL \
+		debian/libapache2-svn/usr/share/doc/libapache2-svn/INSTALL.authz
+endif
+
+	cp tools/examples/svnshell.py debian/python-subversion/usr/bin/svnshell
+	$(call fix_shebangs_in, debian/python-subversion/usr/bin/svnshell)
+
+	touch $@
+
+binary-indep: debian/stamp-install-indep
+	dh_testdir
+	dh_testroot
+	dh_link -i
+	dh_installdocs -i
+	dh_installexamples -i
+	$(call fix_shebangs_in, debian/*/usr/share/doc/*/examples)
+	dh_installman -i
+	dh_installchangelogs -i CHANGES
+	dh_lintian -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_perl -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: debian/stamp-install-arch
+	dh_testdir
+	dh_testroot
+	dh_link -s
+	dh_installdocs -s
+	dh_installexamples -s
+	$(call fix_shebangs_in, debian/*/usr/share/doc/*/examples)
+	dh_installchangelogs -s CHANGES
+	dh_lintian -s
+	dh_fixperms -s
+	dh_strip -s
+	dh_compress -s
+
+	# dh_makeshlibs (1) creates shlibs/symbols files and (2) generates
+	# calls to 'ldconfig' in postinst/postrm.  We want (1) only for
+	# libsvn1, but (2) for the swig packages too.
+	dh_makeshlibs -s -Xjava -X_auth_ -X_ra_neon -X_ra_serf -X_ra_local -X_fs_
+	$(RM) debian/libsvn-*/DEBIAN/shlibs debian/python-subversion/DEBIAN/shlibs
+	$(RM) debian/libsvn-*/DEBIAN/symbols debian/python-subversion/DEBIAN/symbols
+	dh_perl -s
+	dh_pysupport -s
+	dh_installdeb -s
+	dh_shlibdeps -s -X_auth_
+	sed -i 's:libsvn-private\(, *\)\?::' debian/*.substvars
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
+
+binary: binary-indep binary-arch
+
+.PHONY: build build-arch build-indep binary binary-arch binary-indep
+.PHONY: clean check-help $(check_all)
--- subversion-1.6.17dfsg.orig/debian/subversion.examples
+++ subversion-1.6.17dfsg/debian/subversion.examples
@@ -0,0 +1 @@
+tools/dev/gnuify-changelog.pl
--- subversion-1.6.17dfsg.orig/debian/libsvn1.install
+++ subversion-1.6.17dfsg/debian/libsvn1.install
@@ -0,0 +1,9 @@
+debian/tmp/usr/lib/*/libsvn_ra*.so.1*
+debian/tmp/usr/lib/*/libsvn_fs*.so.1*
+debian/tmp/usr/lib/*/libsvn_wc-1.so.1*
+debian/tmp/usr/lib/*/libsvn_delta-1.so.1*
+debian/tmp/usr/lib/*/libsvn_subr-1.so.1*
+debian/tmp/usr/lib/*/libsvn_client-1.so.1*
+debian/tmp/usr/lib/*/libsvn_repos-1.so.1*
+debian/tmp/usr/lib/*/libsvn_diff-1.so.1*
+debian/tmp/usr/lib/*/libsvn_auth_*.so.1*
--- subversion-1.6.17dfsg.orig/debian/libsvn-perl.install
+++ subversion-1.6.17dfsg/debian/libsvn-perl.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/perl5
+debian/tmp/usr/lib/*/libsvn_swig_perl*.so.*
+debian/tmp/usr/share/man/man3/SVN::*.3perl
--- subversion-1.6.17dfsg.orig/debian/subversion-tools.NEWS
+++ subversion-1.6.17dfsg/debian/subversion-tools.NEWS
@@ -0,0 +1,16 @@
+subversion-tools (1.2.3dfsg1-1) unstable; urgency=low
+
+  /usr/lib/subversion has moved to /usr/share/subversion; a symlink has
+  been left behind.  This only affects installations where repositories
+  have been configured to use hook scripts shipped in /usr/lib/subversion,
+  without making local copies of the scripts.  After the release of Debian
+  Etch, the compatibility symlink will disappear.  Please update your
+  repository configurations accordingly.
+
+  The other script affected is /usr/lib/subversion/hot-backup.py, which
+  has now moved into /usr/share/doc/subversion/examples.  It was never a
+  supported executable (or it would live in /usr/bin).  It is also no
+  longer needed, because "svnadmin hotcopy" now includes the same
+  functionality.  Please use "svnadmin hotcopy" instead.
+
+ -- Peter Samuelson <peter@p12n.org>  Sat, 15 Oct 2005 20:09:52 -0500
--- subversion-1.6.17dfsg.orig/debian/python-subversion.examples
+++ subversion-1.6.17dfsg/debian/python-subversion.examples
@@ -0,0 +1 @@
+tools/examples/*.py
--- subversion-1.6.17dfsg.orig/debian/compat
+++ subversion-1.6.17dfsg/debian/compat
@@ -0,0 +1 @@
+7
--- subversion-1.6.17dfsg.orig/debian/subversion.dirs
+++ subversion-1.6.17dfsg/debian/subversion.dirs
@@ -0,0 +1 @@
+etc/bash_completion.d
--- subversion-1.6.17dfsg.orig/debian/python-subversion.install
+++ subversion-1.6.17dfsg/debian/python-subversion.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/libsvn_swig_py*.so.*
+debian/tmp/usr/lib/python*
--- subversion-1.6.17dfsg.orig/debian/dav_svn.load
+++ subversion-1.6.17dfsg/debian/dav_svn.load
@@ -0,0 +1,2 @@
+# Depends: dav
+LoadModule dav_svn_module /usr/lib/apache2/modules/mod_dav_svn.so
--- subversion-1.6.17dfsg.orig/debian/dav_svn.conf
+++ subversion-1.6.17dfsg/debian/dav_svn.conf
@@ -0,0 +1,56 @@
+# dav_svn.conf - Example Subversion/Apache configuration
+#
+# For details and further options see the Apache user manual and
+# the Subversion book.
+#
+# NOTE: for a setup with multiple vhosts, you will want to do this
+# configuration in /etc/apache2/sites-available/*, not here.
+
+# <Location URL> ... </Location>
+# URL controls how the repository appears to the outside world.
+# In this example clients access the repository as http://hostname/svn/
+# Note, a literal /svn should NOT exist in your document root.
+#<Location /svn>
+
+  # Uncomment this to enable the repository
+  #DAV svn
+
+  # Set this to the path to your repository
+  #SVNPath /var/lib/svn
+  # Alternatively, use SVNParentPath if you have multiple repositories under
+  # under a single directory (/var/lib/svn/repo1, /var/lib/svn/repo2, ...).
+  # You need either SVNPath and SVNParentPath, but not both.
+  #SVNParentPath /var/lib/svn
+
+  # Access control is done at 3 levels: (1) Apache authentication, via
+  # any of several methods.  A "Basic Auth" section is commented out
+  # below.  (2) Apache <Limit> and <LimitExcept>, also commented out
+  # below.  (3) mod_authz_svn is a svn-specific authorization module
+  # which offers fine-grained read/write access control for paths
+  # within a repository.  (The first two layers are coarse-grained; you
+  # can only enable/disable access to an entire repository.)  Note that
+  # mod_authz_svn is noticeably slower than the other two layers, so if
+  # you don't need the fine-grained control, don't configure it.
+
+  # Basic Authentication is repository-wide.  It is not secure unless
+  # you are using https.  See the 'htpasswd' command to create and
+  # manage the password file - and the documentation for the
+  # 'auth_basic' and 'authn_file' modules, which you will need for this
+  # (enable them with 'a2enmod').
+  #AuthType Basic
+  #AuthName "Subversion Repository"
+  #AuthUserFile /etc/apache2/dav_svn.passwd
+
+  # To enable authorization via mod_authz_svn (enable that module separately):
+  #<IfModule mod_authz_svn.c>
+  #AuthzSVNAccessFile /etc/apache2/dav_svn.authz
+  #</IfModule>
+
+  # The following three lines allow anonymous read, but make
+  # committers authenticate themselves.  It requires the 'authz_user'
+  # module (enable it with 'a2enmod').
+  #<LimitExcept GET PROPFIND OPTIONS REPORT>
+    #Require valid-user
+  #</LimitExcept> 
+
+#</Location>
--- subversion-1.6.17dfsg.orig/debian/subversion-tools.postrm
+++ subversion-1.6.17dfsg/debian/subversion-tools.postrm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+if [ -L /usr/lib/subversion ]; then
+	rm /usr/lib/subversion
+fi
--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.preinst
+++ subversion-1.6.17dfsg/debian/libapache2-svn.preinst
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+case "$1" in
+    install | upgrade)
+        # The transition from dav_svn.load with authz_svn_module in it,
+        # to a separate .load file, happened in 1.6.17dfsg-2.  Here we
+        # signal the postinst, with a temp file, to enable authz_svn.
+        if grep -q '^LoadModule  *authz_svn_module' \
+                   /etc/apache2/mods-enabled/dav_svn.load 2>/dev/null; then
+            touch '/etc/apache2/#enable_authz_svn#'
+        fi
+        ;;
+esac
--- subversion-1.6.17dfsg.orig/debian/libapache2-svn.README.Debian
+++ subversion-1.6.17dfsg/debian/libapache2-svn.README.Debian
@@ -0,0 +1,4 @@
+This apache module is configured in /etc/apache2/mods-available/dav_svn.conf
+
+
+ -- Guilherme de S. Pastore <gpastore@colband.com.br>, Sat Aug 20 19:56:07 2005
--- subversion-1.6.17dfsg.orig/debian/contrib-license-audit
+++ subversion-1.6.17dfsg/debian/contrib-license-audit
@@ -0,0 +1,77 @@
+Files in 'contrib' are not necessarily copyrighted and licensed
+consistently with the rest of Subversion.  So they must be audited
+individually for copyright statements and license terms.
+
+Last updated 13 Mar 2008 by Peter Samuelson for 1.5.0-beta1 tarball.
+
+* Same copyright and license as subversion:
+  cgi/tweak-log.cgi
+  client-side/diff-wrap.sh
+  client-side/incremental-update.py
+  client-side/search-svnlog.pl
+  client-side/svn-hgmerge.py
+  client-side/svn-push/svn-push.c
+  client-side/svn_update.pl
+  client-side/svnmerge/svnmerge-migrate-history.py
+  hook-scripts/check-mime-type.pl
+  hook-scripts/commit-block-joke.py
+  hook-scripts/pre-commit-check.py
+  hook-scripts/pre-lock-require-needs-lock.py
+  hook-scripts/remove-zombie-locks.py
+  server-side/mod_dontdothat/*
+  server-side/svn-fast-backup
+  server-side/svn-tweak-author.py
+
+* Same license as subversion:
+  client-side/svnmucc/svnmucc.c
+  client-side/wcgrep
+  hook-scripts/case-insensitive.py
+  server-side/svnmirror.sh
+
+* GNU GPL v2 or later:
+  client-side/asvn
+  client-side/emacs/dsvn.el
+  client-side/emacs/psvn.el
+  client-side/svn-clean
+  client-side/svn-merge-vendor.py
+  client-side/svn_apply_autoprops.py
+  client-side/svn_export_empty_files.py
+  client-side/svncopy/*
+  client-side/svnmerge/svnmerge.py
+  client-side/svnmerge/svnmerge_test.py
+  hook-scripts/syntax-check.sh
+  server-side/fsfsverify.py
+
+* Apache license v2:
+  server-side/authz_svn_group.py
+
+* MIT-like:
+  client-side/svn-resolve
+  client-side/svn-viewdiff
+  hook-scripts/enforcer/*
+
+* BSD-like:
+  client-side/svn2cl/*
+  client-side/svnmerge.sh
+
+* Academic Free License v3.0:
+  client-side/svn_load_dirs/*
+
+* No license :(, must remove from tarball:
+  cgi/mirror_dir_through_svn.*
+  client-side/diff3wrap.bat
+  client-side/diffwrap.bat
+  client-side/svn-log.pl
+  client-side/svn_all_diffs.pl
+  client-side/vim/*
+  hook-scripts/detect-merge-conflicts.sh
+  server-side/backup-recipe.sh
+  server-side/load_repo_with_mergesensitive_copy.sh
+
+* No license, but...
+  client-side/emacs/vc-svn.el - assumed same as the newer version on
+    savannah.gnu.org, which says GNU GPL v2 or later
+  client-side/svnmerge/svnmerge-migrate-test.sh - assumed same as
+    svnmerge-migrate-history.py
+  client-side/svnmucc/svnmucc-test.py - assumed same as svnmucc.c
+  server-side/svnmirror-test.sh - assumed same as svnmirror.sh
--- subversion-1.6.17dfsg.orig/debian/etc/50psvn.el
+++ subversion-1.6.17dfsg/debian/etc/50psvn.el
@@ -0,0 +1,3 @@
+; Set up autoloads for psvn (svn directory edit mode for emacs)
+
+(autoload 'svn-status "psvn" nil t)
--- subversion-1.6.17dfsg.orig/debian/bin/svn-bisect
+++ subversion-1.6.17dfsg/debian/bin/svn-bisect
@@ -0,0 +1,187 @@
+#!/bin/sh -e
+#
+# Copyright (C) 2008,2009 by Robert Millan
+# Copyright (C) 2009 by Peter Samuelson
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+dir=.svn-bisect
+: ${SVN:=svn}
+
+svn_info ()
+{
+    LC_ALL=C $SVN info | awk "/^$1:/{ print \$2 }"
+}
+
+usage ()
+{
+  cat << EOF
+Usage:
+  $0 start [good_rev [bad_rev]]
+  $0 good [revision]
+  $0 bad [revision]
+  $0 run {command}
+  $0 status
+  $0 reset
+EOF
+}
+
+do_init ()
+{
+    rm -rf $dir
+    mkdir -p $dir
+    svn_info URL > $dir/url
+    svn_info Revision > $dir/start
+    if [ -n "$1" ]; then do_good_bad good "$1"; fi
+    if [ -n "$2" ]; then do_good_bad bad "$2"; fi
+}
+
+do_reset ()
+{
+    if [ ! -d $dir ]; then return 0; fi
+    if [ ! -f $dir/url ]; then
+        echo >&2 "Error: no $dir/url file"
+        exit 1
+    fi
+    url=$(cat $dir/url)
+    rev=$(cat $dir/start)
+    $SVN switch -r$rev "$url@$rev"
+    rm -fr $dir
+    echo "Now at r$rev in $url"
+}
+
+do_status ()
+{
+    if [ ! -d $dir ]; then
+        status='not initialized'
+    elif [ -f $dir/found ]; then
+        status="found bad revision r$(cat $dir/found)"
+    elif [ ! -f $dir/revs ]; then
+        if [ ! -f $dir/good ]; then
+            status='still need a "good" revision'
+        elif [ ! -f $dir/bad ]; then
+            status='still need a "bad" revision'
+        else
+            status='???'
+        fi
+    else
+        status="r$(head -n1 $dir/revs) is good, r$(tail -n1 $dir/revs) is bad"
+        status="$status, $(($(wc -l < $dir/revs) - 2)) unknown revs in between"
+    fi
+    echo "svn-bisect: status: $status"
+}
+
+do_good_bad ()
+{
+    what=$1
+    shift
+    good=0; bad=99999999;
+    if [ -n "$1" ] ; then
+        current=$(echo "$1" | sed s/^r*// | tee $dir/$what)
+    else
+        current=$(svn_info Revision | tee $dir/$what)
+    fi
+
+    if [ -f $dir/revs ]; then
+        cat $dir/revs | while read rev; do
+            if { [ $what = good ] && [ $rev -ge $current ]; } ||
+               { [ $what = bad ] && [ $rev -le $current ]; }; then
+                echo $rev
+            fi
+        done > $dir/revs.new;
+        mv $dir/revs.new $dir/revs
+    elif [ -f $dir/good ] && [ -f $dir/bad ]; then
+        $SVN log -q -r$(cat $dir/good):$(cat $dir/bad) |
+          awk '/^r/{print $1}' | cut -c2- > $dir/revs
+    else
+        return 0
+    fi
+    good=$(head -n1 $dir/revs)
+    bad=$(tail -n1 $dir/revs)
+    url=$(cat $dir/url)
+    start=$(cat $dir/start)
+    n=$(wc -l < $dir/revs)
+    case $n in
+        0)
+            echo >&2 "Error: no good or bad revs"
+            exit 1 ;;
+        1)
+            echo >&2 "Error: r$(cat $dir/revs) is marked as both good and bad"
+            exit 1 ;;
+        2)
+            echo "Regression found!"
+            echo "Last good revision: r$good"
+            echo "First bad revision:"
+            $SVN log -r$bad
+            echo "Use '$0 reset' or 'rm -r $dir' to clean up"
+            echo $bad > $dir/found
+            return 0 ;;
+    esac
+    target=$(head -n $(((n+1)/2)) $dir/revs | tail -n1)
+    echo "Switching to r$target ..."
+    $SVN switch -r$target "$url@$start"
+    url2=$(svn_info URL)
+    if [ "$url" != "$url2" ]; then
+        echo "r$target is in $url2"
+    fi
+    return $?
+}
+
+do_run ()
+{
+    cmd=$1
+    shift
+    while [ -d $dir ] && [ ! -f $dir/found ]; do
+        set +e
+        eval ${cmd}
+        status=$?
+        set -e
+        case $status in
+            125) $0 skip ;;
+            0) $0 good ;;
+            *) $0 bad ;;
+        esac
+    done
+}
+
+
+cmd=$1
+shift
+case "$cmd" in
+
+    start) do_init "$@" ;;
+
+    bad) do_good_bad bad "$@" ;;
+
+    good) do_good_bad good "$@" ;;
+
+    run) do_run "$@" ;;
+
+    status) do_status ;;
+
+    reset) do_reset ;;
+
+    -h|--help)
+        usage
+        exit 0 ;;
+
+    "")
+        usage >&2
+        exit 1 ;;
+
+    *)
+        echo "Unknown parameter \`$cmd'" >&2
+        usage >&2
+        exit 1 ;;
+esac
--- subversion-1.6.17dfsg.orig/debian/bin/svnwrap
+++ subversion-1.6.17dfsg/debian/bin/svnwrap
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# svnwrap.sh: wrapper subversion client programs, which sets umask=002.
+#
+# Copyright 2006 by Peter Samuelson
+# Permission is granted to everyone to use and distribute this work,
+# without limitation, modified or unmodified, in any way, for any purpose.
+#
+# This script is not always needed: for somewhat complicated reasons,
+# subversion already Does The Right Thing for FSFS repositories but
+# cannot feasibly do so for BDB.
+#
+# See the manpage for more details.
+
+umask 002
+
+known_progs='svn svnlook svnserve svnadmin svnversion'
+known_progs_path=/usr/bin
+
+usage () {
+    echo >&2 "Usage: svnwrap {program} [args...]"
+    echo >&2 "Valid programs: $known_progs"
+    exit 1
+}
+
+exe=
+arg0=$(basename "$0")
+case " $known_progs " in
+    *" $arg0 "*) exe=$arg0 ;;
+    *" $1 "*) exe=$1; shift ;;
+    *) usage ;;
+esac
+case "$exe" in *" "*) usage ;; esac
+
+exec $known_progs_path/$exe "$@"
--- subversion-1.6.17dfsg.orig/debian/source/lintian-overrides
+++ subversion-1.6.17dfsg/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# We don't want a random binNMU to change the bdb version to one that
+# nobody has tested with svn.  So we have to hardcode it.
+build-depends-on-versioned-berkeley-db
--- subversion-1.6.17dfsg.orig/debian/source/format
+++ subversion-1.6.17dfsg/debian/source/format
@@ -0,0 +1 @@
+1.0
--- subversion-1.6.17dfsg.orig/debian/patches/kwallet-wid
+++ subversion-1.6.17dfsg/debian/patches/kwallet-wid
@@ -0,0 +1,31 @@
+Pass a window ID into kwallet, so it can attach itself to the xterm.
+Patch by peters, with reference to Arfrever's much more complicated
+effort in trunk.
+
+
+--- a/subversion/libsvn_auth_kwallet/kwallet.cpp
++++ b/subversion/libsvn_auth_kwallet/kwallet.cpp
+@@ -22,6 +22,7 @@
+ 
+ /*** Includes. ***/
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
+@@ -114,8 +115,14 @@
+                                  "kwallet-opening-failed",
+                                  APR_HASH_KEY_STRING))
+     {
++      long wid = 0;
++      const char *wid_env_string = getenv("WINDOWID");
++      if (wid_env_string)
++        {
++          wid = atol(wid_env_string);
++        }
+       wallet = KWallet::Wallet::openWallet(wallet_name,
+-                                           -1,
++                                           wid ? wid : 1,
+                                            KWallet::Wallet::Synchronous);
+     }
+   if (wallet)
--- subversion-1.6.17dfsg.orig/debian/patches/entropy
+++ subversion-1.6.17dfsg/debian/patches/entropy
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## entropy by <troyh@debian.org>
+##
+## DP: Changing the default behavior to not use apr_generate_random_bytes(), Debian use
+## DP: the system APR which is configured to use /dev/random. In cases where the
+## DP: entropy pool is drained svn commands can block waiting. Moving to the fallback
+## DP: of using time. (Closes: #285708, #298822) 
+
+@DPATCH@
+--- a/subversion/libsvn_ra_svn/cram.c
++++ b/subversion/libsvn_ra_svn/cram.c
+@@ -118,12 +118,8 @@
+  * should prevent replay attacks in practice. */
+ static apr_status_t make_nonce(apr_uint64_t *nonce)
+ {
+-#if APR_HAS_RANDOM
+-  return apr_generate_random_bytes((unsigned char *) nonce, sizeof(*nonce));
+-#else
+   *nonce = apr_time_now();
+   return APR_SUCCESS;
+-#endif
+ }
+ 
+ svn_error_t *svn_ra_svn_cram_server(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
--- subversion-1.6.17dfsg.orig/debian/patches/svn2cl-upstream
+++ subversion-1.6.17dfsg/debian/patches/svn2cl-upstream
@@ -0,0 +1,185 @@
+- Fix the XSL to better comply with XML standards.  (#546990)
+- Use svn --non-interactive to avoid hanging on, e.g., password prompts.
+  (#443860)
+
+
+--- a/contrib/client-side/svn2cl/svn2cl.xsl
++++ b/contrib/client-side/svn2cl/svn2cl.xsl
+@@ -56,8 +56,6 @@
+ -->
+ 
+ <!DOCTYPE xsl:stylesheet [
+- <!ENTITY tab "&#9;">
+- <!ENTITY newl "&#38;#xA;">
+  <!ENTITY space "&#32;">
+ ]>
+ 
+@@ -119,7 +117,7 @@
+    </xsl:otherwise>
+   </xsl:choose>
+   <!-- add newlines at the end of the changelog -->
+-  <xsl:text>&newl;</xsl:text>
++  <xsl:text>&#xA;</xsl:text>
+  </xsl:template>
+ 
+  <!-- format one entry from the log -->
+@@ -149,7 +147,7 @@
+     <xsl:if test="($prevdate!=$date) or ($prevauthor!=$author)">
+      <!-- add newline -->
+      <xsl:if test="not(position()=1)">
+-      <xsl:text>&newl;</xsl:text>
++      <xsl:text>&#xA;</xsl:text>
+      </xsl:if>
+      <!-- date -->
+      <xsl:value-of select="$date" />
+@@ -158,15 +156,15 @@
+      <!-- author's name -->
+      <xsl:apply-templates select="author" />
+      <!-- two newlines -->
+-     <xsl:text>&newl;</xsl:text>
+-     <xsl:if test="$separate-daylogs!='yes'"><xsl:text>&newl;</xsl:text></xsl:if>
++     <xsl:text>&#xA;</xsl:text>
++     <xsl:if test="$separate-daylogs!='yes'"><xsl:text>&#xA;</xsl:text></xsl:if>
+     </xsl:if>
+    </xsl:when>
+    <!-- write the log header -->
+    <xsl:otherwise>
+     <!-- add newline -->
+     <xsl:if test="not(position()=1)">
+-     <xsl:text>&newl;</xsl:text>
++     <xsl:text>&#xA;</xsl:text>
+     </xsl:if>
+     <!-- date -->
+     <xsl:apply-templates select="date" />
+@@ -175,7 +173,7 @@
+     <!-- author's name -->
+     <xsl:apply-templates select="author" />
+     <!-- two newlines -->
+-    <xsl:text>&newl;&newl;</xsl:text>
++    <xsl:text>&#xA;&#xA;</xsl:text>
+    </xsl:otherwise>
+   </xsl:choose>
+   <!-- get paths string -->
+@@ -195,7 +193,7 @@
+    <!-- add a line break before the log message -->
+    <xsl:choose>
+     <xsl:when test="$breakbeforemsg='yes'">
+-     <xsl:text>&newl;</xsl:text>
++     <xsl:text>&#xA;</xsl:text>
+     </xsl:when>
+     <xsl:when test="number($breakbeforemsg)&gt;0">
+      <xsl:call-template name="newlines">
+@@ -208,9 +206,9 @@
+    </xsl:call-template>
+   </xsl:variable>
+   <!-- add newline here if separate-daylogs is in effect -->
+-  <xsl:if test="$groupbyday='yes' and $separate-daylogs='yes'"><xsl:text>&newl;</xsl:text></xsl:if>
++  <xsl:if test="$groupbyday='yes' and $separate-daylogs='yes'"><xsl:text>&#xA;</xsl:text></xsl:if>
+   <!-- first line is indented (other indents are done in wrap template) -->
+-  <xsl:text>&tab;*&space;</xsl:text>
++  <xsl:text>&#x9;*&space;</xsl:text>
+   <!-- set up the text to wrap -->
+   <xsl:variable name="txt">
+    <xsl:value-of select="$rev" />
+@@ -382,23 +380,23 @@
+   <xsl:param name="txt" />
+   <xsl:variable name="normtxt" select="normalize-space($txt)" />
+   <xsl:choose>
+-   <xsl:when test="contains($txt,'&newl;')">
++   <xsl:when test="contains($txt,'&#xA;')">
+      <!-- text contains newlines, do the first line -->
+      <xsl:call-template name="wrap">
+-      <xsl:with-param name="txt" select="substring-before($txt,'&newl;')" />
++      <xsl:with-param name="txt" select="substring-before($txt,'&#xA;')" />
+      </xsl:call-template>
+      <!-- print tab -->
+-     <xsl:text>&tab;&space;&space;</xsl:text>
++     <xsl:text>&#x9;&space;&space;</xsl:text>
+      <!-- wrap the rest of the text -->
+      <xsl:call-template name="wrap">
+-      <xsl:with-param name="txt" select="substring-after($txt,'&newl;')" />
++      <xsl:with-param name="txt" select="substring-after($txt,'&#xA;')" />
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="(string-length($normtxt) &lt; (($linelen)-9)) or not(contains($normtxt,' '))">
+     <!-- this is easy, nothing to do -->
+     <xsl:value-of select="$normtxt" />
+     <!-- add newline -->
+-    <xsl:text>&newl;</xsl:text>
++    <xsl:text>&#xA;</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+     <!-- find the first line -->
+@@ -420,7 +418,7 @@
+     <!-- print line -->
+     <xsl:value-of select="$line" />
+     <!-- print newline and tab -->
+-    <xsl:text>&newl;&tab;&space;&space;</xsl:text>
++    <xsl:text>&#xA;&#x9;&space;&space;</xsl:text>
+     <!-- wrap the rest of the text -->
+     <xsl:call-template name="wrap">
+      <xsl:with-param name="txt" select="normalize-space(substring($normtxt,string-length($line)+1))" />
+@@ -449,26 +447,26 @@
+   <xsl:param name="txt" />
+   <xsl:choose>
+    <!-- find starting newlines -->
+-   <xsl:when test="substring($txt,1,1) = '&newl;'">
++   <xsl:when test="substring($txt,1,1) = '&#xA;'">
+     <xsl:call-template name="trim-newln">
+      <xsl:with-param name="txt" select="substring($txt,2)" />
+     </xsl:call-template>
+    </xsl:when>
+    <!-- find trailing newlines -->
+-   <xsl:when test="substring($txt,string-length($txt),1) = '&newl;'">
++   <xsl:when test="substring($txt,string-length($txt),1) = '&#xA;'">
+     <xsl:call-template name="trim-newln">
+      <xsl:with-param name="txt" select="substring($txt,1,string-length($txt)-1)" />
+     </xsl:call-template>
+    </xsl:when>
+    <!-- if the message has paragrapgs, find the first one -->
+-   <xsl:when test="$reparagraph='yes' and contains($txt,'&newl;&newl;')">
++   <xsl:when test="$reparagraph='yes' and contains($txt,'&#xA;&#xA;')">
+      <!-- remove newlines from first paragraph -->
+-     <xsl:value-of select="normalize-space(substring-before($txt,'&newl;&newl;'))" />
++     <xsl:value-of select="normalize-space(substring-before($txt,'&#xA;&#xA;'))" />
+      <!-- paragraph separator -->
+-     <xsl:text>&newl;&newl;</xsl:text>
++     <xsl:text>&#xA;&#xA;</xsl:text>
+      <!-- do the rest of the text -->
+      <xsl:call-template name="trim-newln">
+-      <xsl:with-param name="txt" select="substring-after($txt,'&newl;&newl;')" />
++      <xsl:with-param name="txt" select="substring-after($txt,'&#xA;&#xA;')" />
+      </xsl:call-template>
+    </xsl:when>
+    <!-- remove more single newlines -->
+@@ -485,7 +483,7 @@
+  <!-- insert a number of newlines -->
+  <xsl:template name="newlines">
+   <xsl:param name="count" />
+-  <xsl:text>&newl;</xsl:text>
++  <xsl:text>&#xA;</xsl:text>
+   <xsl:if test="$count&gt;1">
+    <xsl:call-template name="newlines">
+     <xsl:with-param name="count" select="($count)-1" />
+--- a/contrib/client-side/svn2cl/svn2cl.sh
++++ b/contrib/client-side/svn2cl/svn2cl.sh
+@@ -50,8 +50,8 @@ SEPARATEDAYLOGS="no"
+ ACTIONS="no"
+ CHANGELOG=""
+ OUTSTYLE="cl"
+-SVNLOGCMD="svn --verbose --xml log"
+-SVNINFOCMD="svn info"
++SVNLOGCMD="svn --non-interactive --verbose --xml log"
++SVNINFOCMD="svn --non-interactive info"
+ AUTHORSFILE=""
+ IGNORE_MESSAGE_STARTING=""
+ TITLE="ChangeLog"
+@@ -290,7 +290,7 @@ fi
+ # try to determin a prefix to strip from all paths
+ if [ "$STRIPPREFIX" = "AUTOMATICALLY-DETERMINED" ]
+ then
+-  STRIPPREFIX=`LANG=C eval "$SVNINFOCMD" 2> /dev/null | $AWK '/^URL:/{url=$2} /^Repository Root:/{root=$3} END{if(root){print substr(url,length(root)+2)}else{n=split(url,u,"/");print u[n]}}'`
++  STRIPPREFIX=`LANG=C eval "$SVNINFOCMD" | $AWK '/^URL:/{url=$2} /^Repository Root:/{root=$3} END{if(root){print substr(url,length(root)+2)}else{n=split(url,u,"/");print u[n]}}'`
+   STRIPPREFIX=`echo "$STRIPPREFIX" | sed 's/%20/ /g'`
+ fi
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/cve-2013-1845
+++ subversion-1.6.17dfsg/debian/patches/cve-2013-1845
@@ -0,0 +1,189 @@
+Author: Philip Martin <philip.martin@wandisco.com>
+Subject: Introduce a subpool to control memory use
+
+Setting or deleting a large number of properties on a node (file or
+directory)  will result in a large amount of memory use.  Due to the
+memory pooling behavior of Apache httpd and Subversion the completion of
+the request will not result in the immediate release of memory used.
+Repeated commits with the same properties will result in each httpd process
+plateauing out at some amount of memory.  This could result in a Denial of
+Service if the system is exhausted of all available memory.
+
+Origin: upstream, commit:r1443929
+Bug-CVE: http://subversion.apache.org/security/CVE-2013-1845-advisory.txt
+Bug-Debian: http://bugs.debian.org/704940
+Last-Update: 2013-04-16
+Applied-Upstream: commit:r1443929
+
+
+Index: subversion/mod_dav_svn/dav_svn.h
+===================================================================
+--- a/subversion/mod_dav_svn/dav_svn.h	(revision 1461956)
++++ b/subversion/mod_dav_svn/dav_svn.h	(working copy)
+@@ -254,6 +254,9 @@ struct dav_resource_private {
+      interface (ie: /path/to/item?p=PEGREV]? */
+   svn_boolean_t pegged;
+ 
++  /* Cache any revprop change error */
++  svn_error_t *revprop_error;
++
+   /* Pool to allocate temporary data from */
+   apr_pool_t *pool;
+ };
+Index: subversion/mod_dav_svn/deadprops.c
+===================================================================
+--- a/subversion/mod_dav_svn/deadprops.c	(revision 1461956)
++++ b/subversion/mod_dav_svn/deadprops.c	(working copy)
+@@ -49,8 +49,7 @@ struct dav_db {
+ 
+ 
+ struct dav_deadprop_rollback {
+-  dav_prop_name name;
+-  svn_string_t value;
++  int dummy;
+ };
+ 
+ 
+@@ -134,6 +133,7 @@ save_value(dav_db *db, const dav_prop_name *name,
+ {
+   const char *propname;
+   svn_error_t *serr;
++  apr_pool_t *subpool;
+ 
+   /* get the repos-local name */
+   get_repos_propname(db, name, &propname);
+@@ -151,10 +151,14 @@ save_value(dav_db *db, const dav_prop_name *name,
+     }
+ 
+   /* Working Baseline or Working (Version) Resource */
++
++  /* A subpool to cope with mod_dav making multiple calls, e.g. during
++     PROPPATCH with multiple values. */
++  subpool = svn_pool_create(db->resource->pool);
+   if (db->resource->baselined)
+     if (db->resource->working)
+       serr = svn_repos_fs_change_txn_prop(db->resource->info->root.txn,
+-                                          propname, value, db->resource->pool);
++                                          propname, value, subpool);
+     else
+       {
+         /* ### VIOLATING deltaV: you can't proppatch a baseline, it's
+@@ -168,19 +172,29 @@ save_value(dav_db *db, const dav_prop_name *name,
+            propname, value, TRUE, TRUE,
+            db->authz_read_func,
+            db->authz_read_baton,
+-           db->resource->pool);
++           subpool);
+ 
++        /* mod_dav doesn't handle the returned error very well, it
++           generates its own generic error that will be returned to
++           the client.  Cache the detailed error here so that it can
++           be returned a second time when the rollback mechanism
++           triggers. */
++        if (serr)
++          db->resource->info->revprop_error = svn_error_dup(serr);
++
+         /* Tell the logging subsystem about the revprop change. */
+         dav_svn__operational_log(db->resource->info,
+                                  svn_log__change_rev_prop(
+                                               db->resource->info->root.rev,
+                                               propname,
+-                                              db->resource->pool));
++                                              subpool));
+       }
+   else
+     serr = svn_repos_fs_change_node_prop(db->resource->info->root.root,
+                                          get_repos_path(db->resource->info),
+-                                         propname, value, db->resource->pool);
++                                         propname, value, subpool);
++  svn_pool_destroy(subpool);
++
+   if (serr != NULL)
+     return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
+                                 NULL,
+@@ -395,6 +409,7 @@ db_remove(dav_db *db, const dav_prop_name *name)
+ {
+   svn_error_t *serr;
+   const char *propname;
++  apr_pool_t *subpool;
+ 
+   /* get the repos-local name */
+   get_repos_propname(db, name, &propname);
+@@ -403,6 +418,10 @@ db_remove(dav_db *db, const dav_prop_name *name)
+   if (propname == NULL)
+     return NULL;
+ 
++  /* A subpool to cope with mod_dav making multiple calls, e.g. during
++     PROPPATCH with multiple values. */
++  subpool = svn_pool_create(db->resource->pool);
++
+   /* Working Baseline or Working (Version) Resource */
+   if (db->resource->baselined)
+     if (db->resource->working)
+@@ -419,11 +438,12 @@ db_remove(dav_db *db, const dav_prop_name *name)
+                                            propname, NULL, TRUE, TRUE,
+                                            db->authz_read_func,
+                                            db->authz_read_baton,
+-                                           db->resource->pool);
++                                           subpool);
+   else
+     serr = svn_repos_fs_change_node_prop(db->resource->info->root.root,
+                                          get_repos_path(db->resource->info),
+-                                         propname, NULL, db->resource->pool);
++                                         propname, NULL, subpool);
++  svn_pool_destroy(subpool);
+   if (serr != NULL)
+     return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
+                                 "could not remove a property",
+@@ -598,19 +618,14 @@ db_get_rollback(dav_db *db,
+                 const dav_prop_name *name,
+                 dav_deadprop_rollback **prollback)
+ {
+-  dav_error *err;
+-  dav_deadprop_rollback *ddp;
+-  svn_string_t *propval;
++  /* This gets called by mod_dav in preparation for a revprop change.
++     mod_dav_svn doesn't need to make any changes during rollback, but
++     we want the rollback mechanism to trigger.  Making changes in
++     response to post-revprop-change hook errors would be positively
++     wrong. */
+ 
+-  if ((err = get_value(db, name, &propval)) != NULL)
+-    return err;
++  *prollback = apr_palloc(db->p, sizeof(dav_deadprop_rollback));
+ 
+-  ddp = apr_palloc(db->p, sizeof(*ddp));
+-  ddp->name = *name;
+-  ddp->value.data = propval ? propval->data : NULL;
+-  ddp->value.len = propval ? propval->len : 0;
+-
+-  *prollback = ddp;
+   return NULL;
+ }
+ 
+@@ -618,12 +633,20 @@ db_get_rollback(dav_db *db,
+ static dav_error *
+ db_apply_rollback(dav_db *db, dav_deadprop_rollback *rollback)
+ {
+-  if (rollback->value.data == NULL)
+-    {
+-      return db_remove(db, &rollback->name);
+-    }
++  dav_error *derr;
+ 
+-  return save_value(db, &rollback->name, &rollback->value);
++  if (! db->resource->info->revprop_error)
++    return NULL;
++  
++  /* Returning the original revprop change error here will cause this
++     detailed error to get returned to the client in preference to the
++     more generic error created by mod_dav. */
++  derr = dav_svn__convert_err(db->resource->info->revprop_error,
++                              HTTP_INTERNAL_SERVER_ERROR, NULL,
++                              db->resource->pool);
++  db->resource->info->revprop_error = NULL;
++
++  return derr;
+ }
+ 
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/last-changed-date-charset
+++ subversion-1.6.17dfsg/debian/patches/last-changed-date-charset
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## last-changed-date-charset by <peter@p12n.org>
+##
+## DP: Convert $LastChangedDate$ keyword to the local character set.
+## DP: See #290774.
+
+@DPATCH@
+--- a/subversion/libsvn_subr/subst.c
++++ b/subversion/libsvn_subr/subst.c
+@@ -193,8 +193,12 @@
+           break;
+         case 'D': /* long format of date of this revision */
+           if (date)
+-            svn_stringbuf_appendcstr(value,
+-                                     svn_time_to_human_cstring(date, pool));
++	    {
++              char *date_keyword;
++              char *date_utf8 = svn_time_to_human_cstring (date, pool);
++              svn_utf_cstring_from_utf8(&date_keyword, date_utf8, pool);
++              svn_stringbuf_appendcstr(value, date_keyword);
++            }
+           break;
+         case 'r': /* number of this revision */
+           if (rev)
--- subversion-1.6.17dfsg.orig/debian/patches/series
+++ subversion-1.6.17dfsg/debian/patches/series
@@ -0,0 +1,42 @@
+build-fixes
+entropy
+java-build
+last-changed-date-charset
+no-extra-libs
+no-extra-libs-2
+repos-templates
+rpath
+ruby-no-strict-aliasing
+ruby-test-svnserve-race
+ruby-typemap-digest
+ruby-test-info
+ssh-no-controlmaster
+svnshell
+apr-abi
+fix-bdb-version-detection
+svn2cl-debian
+python-builds
+examples-compile-instructions
+svn-clean-ignore
+commit-email
+no-dbus-spam
+svn2cl-upstream
+kwallet-wid
+loosen-sqlite-version-check
+change-range
+perl-warning
+swig2-compat
+perl-compiler-flags
+sasl-mem-handling
+python-exception-syntax
+po
+apache_module_dependency
+disable_failing_tests
+workaround_EINVAL_on_kfreebsd
+g++47
+chunksize-integer.patch
+cve-2013-1845
+cve-2013-1846
+cve-2013-1849
+CVE-2013-1968.patch
+CVE-2013-2112.patch
--- subversion-1.6.17dfsg.orig/debian/patches/ruby-test-info
+++ subversion-1.6.17dfsg/debian/patches/ruby-test-info
@@ -0,0 +1,29 @@
+--- 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
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/svnshell
+++ subversion-1.6.17dfsg/debian/patches/svnshell
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## svnshell by <dwhedon@debian.org>
+##
+## DP: Contains r20992 from upstream trunk, which may be in 1.4.1.
+
+@DPATCH@
+--- a/tools/examples/svnshell.py
++++ b/tools/examples/svnshell.py
+@@ -49,14 +49,8 @@
+   def postcmd(self, stop, line):
+     self._setup_prompt()
+ 
+-  _errors = ["Huh?",
+-             "Whatchoo talkin' 'bout, Willis?",
+-             "Say what?",
+-             "Nope.  Not gonna do it.",
+-             "Ehh...I don't think so, chief."]
+-
+   def default(self, line):
+-    print(self._errors[randint(0, len(self._errors) - 1)])
++    print "Unknown command."
+ 
+   def do_cat(self, arg):
+     """dump the contents of a file"""
--- subversion-1.6.17dfsg.orig/debian/patches/fix-bdb-version-detection
+++ subversion-1.6.17dfsg/debian/patches/fix-bdb-version-detection
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-bdb-version-detection.dpatch by <peter@p12n.org>
+##
+## DP: Do not rely on apu-config to print "-ldb4.3" or whatever - see #378105.
+## DP: Instead, include -laprutil-1 in the compile line.
+## DP:
+## DP: I don't think this can be sent upstream, as it won't work when
+## DP: compiling aprutil in-tree.  But I'm not certain.
+
+@DPATCH@
+--- a/build/ac-macros/berkeley-db.m4
++++ b/build/ac-macros/berkeley-db.m4
+@@ -164,7 +164,7 @@
+     SVN_DB_LIBS=["${SVN_DB_LIBS-`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"]
+ 
+     CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS" 
+-    LIBS="`$apu_config --ldflags` $SVN_DB_LIBS $LIBS"
++    LIBS="`$apu_config --ldflags --link-ld` $SVN_DB_LIBS $LIBS"
+ 
+     if test -n "$svn_berkeley_db_header"; then
+       SVN_DB_HEADER="#include <$svn_berkeley_db_header>"
--- subversion-1.6.17dfsg.orig/debian/patches/python-builds
+++ subversion-1.6.17dfsg/debian/patches/python-builds
@@ -0,0 +1,120 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## python-builds by <doko@debian.org>
+##
+## DP: Prepare upstream build system for building multiple python versions.
+## DP: Mostly, rename libsvn_swig_py to libsvn_swig_py2.x.
+## DP: Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
+
+@DPATCH@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -121,6 +121,7 @@
+ APACHE_LDFLAGS = @APACHE_LDFLAGS@
+ 
+ SWIG = @SWIG@
++PYTHON_INCLUDES = @PYTHON_INCLUDES@
+ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
+ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
+ SWIG_PY_LINK = @SWIG_PY_LINK@
+--- a/build/ac-macros/swig.m4
++++ b/build/ac-macros/swig.m4
+@@ -93,7 +93,8 @@
+     AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
+       ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
+     ])
+-    SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
++    PYTHON_INCLUDES="$ac_cv_python_includes"
++    SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) \$(PYTHON_INCLUDES)"
+ 
+     if test "$ac_cv_python_includes" = "none"; then
+       AC_MSG_WARN([python bindings cannot be built without distutils module])
+@@ -266,6 +267,7 @@
+       AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
+   fi
+   AC_SUBST(SWIG)
++  AC_SUBST(PYTHON_INCLUDES)
+   AC_SUBST(SWIG_PY_INCLUDES)
+   AC_SUBST(SWIG_PY_COMPILE)
+   AC_SUBST(SWIG_PY_LINK)
+--- a/build.conf
++++ b/build.conf
+@@ -398,7 +398,7 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = core.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_diff libsvn_subr apr
+ description = Subversion core library bindings
+ include-runtime = yes
+@@ -407,7 +407,7 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = svn_client.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_client libsvn_subr apr
+ nonlibs = swig_core
+ description = Subversion client library bindings
+@@ -416,7 +416,7 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = svn_delta.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_delta libsvn_subr apr
+ nonlibs = swig_core
+ description = Subversion delta library bindings
+@@ -425,7 +425,7 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = svn_diff.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_diff libsvn_subr apr
+ nonlibs = swig_core
+ description = Subversion diff library bindings
+@@ -434,7 +434,7 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = svn_fs.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_fs libsvn_subr apr
+ nonlibs = swig_core
+ description = Subversion FS library bindings
+@@ -443,7 +443,7 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = svn_ra.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_ra libsvn_subr apr
+ nonlibs = swig_core
+ description = Subversion RA library bindings
+@@ -452,7 +452,7 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = svn_repos.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_repos libsvn_subr apr
+ nonlibs = swig_core
+ description = Subversion repository library bindings
+@@ -461,13 +461,13 @@
+ type = swig
+ path = subversion/bindings/swig
+ sources = svn_wc.i
+-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby
+        libsvn_wc libsvn_subr apr
+ nonlibs = swig_core
+ description = Subversion WC library bindings
+ 
+ # SWIG utility library for Python modules
+-[libsvn_swig_py]
++[libsvn_swig_py$(PYVER)]
+ type = swig_lib
+ lang = python
+ path = subversion/bindings/swig/python/libsvn_swig_py
--- subversion-1.6.17dfsg.orig/debian/patches/disable_failing_tests
+++ subversion-1.6.17dfsg/debian/patches/disable_failing_tests
@@ -0,0 +1,91 @@
+--- a/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
++++ b/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
+@@ -132,11 +132,11 @@ class SubversionRepositoryTestCase(unitt
+         self.assertEqual(None, node.content_type)
+         self.assertEqual(None, node.get_content())
+ 
+-    def test_get_file_content(self):
+-        node = self.repos.get_node('/trunk/README.txt')
+-        self.assertEqual(8, node.content_length)
+-        self.assertEqual('text/plain', node.content_type)
+-        self.assertEqual('A test.\n', node.get_content().read())
++#    def test_get_file_content(self):
++#        node = self.repos.get_node('/trunk/README.txt')
++#        self.assertEqual(8, node.content_length)
++#        self.assertEqual('text/plain', node.content_type)
++#        self.assertEqual('A test.\n', node.get_content().read())
+ 
+     def test_get_dir_properties(self):
+         f = self.repos.get_node('/trunk')
+@@ -222,33 +222,33 @@ class SubversionRepositoryTestCase(unitt
+                                       'tags/v1/README.txt', 7)
+         self.assertRaises(StopIteration, diffs.next)
+ 
+-    def test_diff_dir_different_revs(self):
+-        diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8)
+-        self._cmp_diff((None, ('trunk/dir1/dir2', 8),
+-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
+-        self._cmp_diff((None, ('trunk/dir1/dir3', 8),
+-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
+-        self._cmp_diff((None, ('trunk/README2.txt', 6),
+-                        (Node.FILE, Changeset.ADD)), diffs.next())
+-        self._cmp_diff((('trunk/dir2', 4), None,
+-                        (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
+-        self._cmp_diff((('trunk/dir3', 4), None,
+-                        (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
+-        self.assertRaises(StopIteration, diffs.next)
+-
+-    def test_diff_dir_different_dirs(self):
+-        diffs = self.repos.get_deltas('trunk', 1, 'branches/v1x', 12)
+-        self._cmp_diff((None, ('branches/v1x/dir1', 12),
+-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
+-        self._cmp_diff((None, ('branches/v1x/dir1/dir2', 12),
+-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
+-        self._cmp_diff((None, ('branches/v1x/dir1/dir3', 12),
+-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
+-        self._cmp_diff((None, ('branches/v1x/README.txt', 12),
+-                        (Node.FILE, Changeset.ADD)), diffs.next())
+-        self._cmp_diff((None, ('branches/v1x/README2.txt', 12),
+-                        (Node.FILE, Changeset.ADD)), diffs.next())
+-        self.assertRaises(StopIteration, diffs.next)
++#    def test_diff_dir_different_revs(self):
++#        diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8)
++#        self._cmp_diff((None, ('trunk/dir1/dir2', 8),
++#                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
++#        self._cmp_diff((None, ('trunk/dir1/dir3', 8),
++#                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
++#        self._cmp_diff((None, ('trunk/README2.txt', 6),
++#                        (Node.FILE, Changeset.ADD)), diffs.next())
++#        self._cmp_diff((('trunk/dir2', 4), None,
++#                        (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
++#        self._cmp_diff((('trunk/dir3', 4), None,
++#                        (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
++#        self.assertRaises(StopIteration, diffs.next)
++
++#    def test_diff_dir_different_dirs(self):
++#        diffs = self.repos.get_deltas('trunk', 1, 'branches/v1x', 12)
++#        self._cmp_diff((None, ('branches/v1x/dir1', 12),
++#                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
++#        self._cmp_diff((None, ('branches/v1x/dir1/dir2', 12),
++#                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
++#        self._cmp_diff((None, ('branches/v1x/dir1/dir3', 12),
++#                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
++#        self._cmp_diff((None, ('branches/v1x/README.txt', 12),
++#                        (Node.FILE, Changeset.ADD)), diffs.next())
++#        self._cmp_diff((None, ('branches/v1x/README2.txt', 12),
++#                        (Node.FILE, Changeset.ADD)), diffs.next())
++#        self.assertRaises(StopIteration, diffs.next)
+ 
+     def test_diff_dir_no_change(self):
+         diffs = self.repos.get_deltas('trunk', 7,
+--- a/subversion/bindings/swig/python/tests/wc.py
++++ b/subversion/bindings/swig/python/tests/wc.py
+@@ -194,7 +194,7 @@ class SubversionWorkingCopyTestCase(unit
+   def test_entries_read(self):
+       entries = wc.entries_read(self.wc, True)
+ 
+-      self.assertEqual(['', 'tags', 'branches', 'trunk'], list(entries.keys()))
++      self.assertEqual(sorted(['', 'tags', 'branches', 'trunk']), sorted(list(entries.keys())))
+ 
+   def test_get_ignores(self):
+       self.assert_(isinstance(wc.get_ignores(None, self.wc), list))
--- subversion-1.6.17dfsg.orig/debian/patches/swig2-compat
+++ subversion-1.6.17dfsg/debian/patches/swig2-compat
@@ -0,0 +1,120 @@
+Support swig 2.0.  From upstream r1049503, modified.
+
+Index: subversion-1.6.17dfsg/build/ac-macros/swig.m4
+===================================================================
+--- subversion-1.6.17dfsg.orig/build/ac-macros/swig.m4	2011-09-08 21:16:51.000000000 -0500
++++ subversion-1.6.17dfsg/build/ac-macros/swig.m4	2011-09-08 21:17:01.000000000 -0500
+@@ -75,13 +75,13 @@
+     #   packages/rpm/rhel-4/subversion.spec
+     if test -n "$SWIG_VERSION" &&
+        test "$SWIG_VERSION" -ge "103024" &&
+-       test "$SWIG_VERSION" -le "103036"; then
++       test "$SWIG_VERSION" -le "201000"; then
+       SWIG_SUITABLE=yes
+     else
+       SWIG_SUITABLE=no
+       AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
+       AC_MSG_WARN([Subversion requires 1.3.24 or later, and is known to work])
+-      AC_MSG_WARN([with versions up to 1.3.36])
++      AC_MSG_WARN([with versions up to 2.0.x])
+     fi
+   fi
+  
+Index: subversion-1.6.17dfsg/build/generator/swig/__init__.py
+===================================================================
+--- subversion-1.6.17dfsg.orig/build/generator/swig/__init__.py	2011-09-08 21:16:51.000000000 -0500
++++ subversion-1.6.17dfsg/build/generator/swig/__init__.py	2011-09-08 21:17:01.000000000 -0500
+@@ -50,9 +50,8 @@
+       swig_version = _exec.output([self.swig_path, "-version"])
+       m = re.search("Version (\d+).(\d+).(\d+)", swig_version)
+       if m:
+-        return int(
+-          "%s0%s0%s" % (m.group(1), m.group(2), m.group(3)))
++        return (m.group(1), m.group(2), m.group(3))
+     except AssertionError:
+       pass
+-    return 0
++    return (0, 0, 0)
+ 
+Index: subversion-1.6.17dfsg/build/generator/swig/checkout_swig_header.py
+===================================================================
+--- subversion-1.6.17dfsg.orig/build/generator/swig/checkout_swig_header.py	2011-09-08 21:16:51.000000000 -0500
++++ subversion-1.6.17dfsg/build/generator/swig/checkout_swig_header.py	2011-09-08 21:17:01.000000000 -0500
+@@ -39,15 +39,15 @@
+       os.remove(out)
+     if self._skip_checkout(path):
+       open(out, "w")
+-    elif self.version() == 103024:
++    elif self.version() == (1, 3, 24):
+       shutil.copy(build_path_join(self.swig_libdir, path), out)
+     else:
+       run("%s -o %s -co %s" % (self.swig_path, out, path))
+ 
+   def _skip_checkout(self, path):
+     """Should we skip this checkout?"""
+-    return (path == "ruby/rubytracking.swg" and self.version() < 103026 or
+-            path == "common.swg" and self.version() > 103024)
++    return (path == "ruby/rubytracking.swg" and self.version() < (1, 3, 26) or
++            path == "common.swg" and self.version() > (1, 3, 24))
+ 
+   def _output_file(self, path):
+     """Get output filename"""
+Index: subversion-1.6.17dfsg/build/generator/swig/external_runtime.py
+===================================================================
+--- subversion-1.6.17dfsg.orig/build/generator/swig/external_runtime.py	2011-09-08 21:16:51.000000000 -0500
++++ subversion-1.6.17dfsg/build/generator/swig/external_runtime.py	2011-09-08 21:17:01.000000000 -0500
+@@ -45,7 +45,7 @@
+ 
+     # Build runtime files
+     out = self._output_file(lang)
+-    if self.version() == 103024:
++    if self.version() == (1, 3, 24):
+       out_file = open(out, "w")
+       out_file.write(open("%s/swigrun.swg" % self.proxy_dir).read())
+       out_file.write(open("%s/common.swg" % self.proxy_dir).read())
+@@ -59,12 +59,12 @@
+ 
+     # SWIG 1.3.24-27 should include rubyhead.swg in their
+     # external runtime, but they don't.
+-    if lang == "ruby" and self.version() < 103028:
++    if lang == "ruby" and self.version() < (1, 3, 28):
+       runtime = open(out).read()
+       out_file = open(out, "w")
+       head = open("%s/rubyhead.swg" % self.proxy_dir).read();
+       out_file.write(head)
+-      if self.version() >= 103026:
++      if self.version() >= (1, 3, 26):
+         # SWIG 1.3.26-27 should include rubytracking.swg in their
+         # external runtime, but they don't.
+         tracking = open("%s/rubytracking.swg" % self.proxy_dir).read();
+@@ -74,7 +74,7 @@
+ 
+     # SWIG 1.3.25 and earlier use the wrong number of arguments in calls to
+     # SWIG_GetModule. We fix this below.
+-    if self.version() <= 103025:
++    if self.version() <= (1, 3, 25):
+       for line in fileinput.input(out, inplace=1):
+         sys.stdout.write(
+           re.sub(r"SWIG_GetModule\(\)", "SWIG_GetModule(NULL)", line)
+Index: subversion-1.6.17dfsg/subversion/bindings/swig/INSTALL
+===================================================================
+--- subversion-1.6.17dfsg.orig/subversion/bindings/swig/INSTALL	2011-09-08 21:16:51.000000000 -0500
++++ subversion-1.6.17dfsg/subversion/bindings/swig/INSTALL	2011-09-08 21:17:01.000000000 -0500
+@@ -65,7 +65,7 @@
+ 
+ 
+ Step 1:  Install a suitable version of SWIG (which is
+-         currently swig version 1.3.24 - 1.3.31).
++         currently swig version 1.3.24 - 2.0.x).
+ 
+     * Perhaps your distribution packages a suitable version - if it does
+       install it, and skip to the last bullet point in this section.
+@@ -260,7 +260,7 @@
+        the --with-swig parameter to the installed location for SWIG.
+        Example:
+ 
+-        > gen-make.py -t vcproj --with-swig="C:\Program Files\SWIG-1.3.31"
++        > gen-make.py -t vcproj --with-swig="C:\Program Files\SWIG-2.0.1"
+ 
+    4.  If you haven't already built Subversion, you should do so now.
+        Instructions are in the main INSTALL file.
--- subversion-1.6.17dfsg.orig/debian/patches/ruby-typemap-digest
+++ subversion-1.6.17dfsg/debian/patches/ruby-typemap-digest
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ruby-typemap-digest by <zippel@linux-m68k.org>
+##
+## DP: Change the ruby 'digest' typemaps to tolerate NULL pointers.
+## DP: This may be the bug which has sporadically plagued us for
+## DP: several months, most recently on m68k.  Patch by Roman Zippel.
+## DP:
+## DP: Sent upstream: http://svn.haxx.se/dev/archive-2006-09/0536.shtml
+
+@DPATCH@
+--- a/subversion/bindings/swig/include/svn_types.swg
++++ b/subversion/bindings/swig/include/svn_types.swg
+@@ -1053,7 +1053,7 @@
+ #ifdef SWIGRUBY
+ %typemap(argout) unsigned char digest[ANY] {
+   char *digest_string = (char *)svn_md5_digest_to_cstring($1, _global_pool);
+-  %append_output(rb_str_new2(digest_string));
++  %append_output(rb_str_new2(digest_string ? digest_string : ""));
+ }
+ #endif
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/ruby-test-svnserve-race
+++ subversion-1.6.17dfsg/debian/patches/ruby-test-svnserve-race
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## ruby-test-svnserve-race by <peter@p12n.org>
+##
+## DP: Hack to try to avoid the race in the ruby testsuite harness between
+## DP: starting up a svnserve process and trying to connect to it.  If the
+## DP: client tries to connect too soon, before svnserve has initialised
+## DP: itself, the test in progress gets a 'connection refused' and fails.
+## DP:
+## DP: This race causes random test failures on slow platforms - observed on
+## DP: an arm with 32 MB of RAM, and m68k buildds of unknown specs.
+
+@DPATCH@
+--- a/subversion/bindings/swig/ruby/test/util.rb
++++ b/subversion/bindings/swig/ruby/test/util.rb
+@@ -1,5 +1,6 @@
+ require "fileutils"
+ require "pathname"
++require "socket"
+ 
+ require "my-assertions"
+ 
+@@ -222,11 +223,7 @@
+                "-d", "--foreground")
+         }
+         pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG)
+-        if status and status.exited?
+-          if $DEBUG
+-            STDERR.puts "port #{port} couldn't be used for svnserve"
+-          end
+-        else
++        if wait_until_svnserve_gets_available_at(port)
+           # svnserve started successfully.  Note port number and cease
+           # startup attempts.
+           @svnserve_port = port
+@@ -289,4 +286,25 @@
+     include Svnserve
+     extend SetupEnvironment
+   end
++
++  # Waits until svnserve gets available at port +port+, avoiding the race
++  # condition between starting up a svnserve process and trying to connect
++  # to it (Bug#378837 in Debian's BTS).
++  def wait_until_svnserve_gets_available_at(port)
++    1000.times do |n|
++      begin
++	pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG)
++	if status and status.exited?
++	  STDERR.puts "port #{port} couldn't be used for svnserve"
++	  return false
++	end
++	TCPSocket.new(@svnserve_host, port).close
++      rescue Errno::ECONNREFUSED
++	sleep(n < 10 ? 0.2 : 0.5)
++      else
++	return true
++      end
++    end
++    raise "svnserve couldn't get available at port #{port}"
++  end
+ end
--- subversion-1.6.17dfsg.orig/debian/patches/no-extra-libs
+++ subversion-1.6.17dfsg/debian/patches/no-extra-libs
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## no-extra-libs by <peter@p12n.org>
+##
+## DP: Work around "libtool disease" in '{apr,aprutil,neon}-config --libs',
+## DP: where they think our runtime linker is too stupid to handle recursive
+## DP: library dependencies.
+## DP:
+## DP: See Debian bug #338302.
+
+@DPATCH@
+--- a/build/ac-macros/apr.m4
++++ b/build/ac-macros/apr.m4
+@@ -74,16 +74,10 @@
+     AC_MSG_ERROR([apr-config --prefix failed])
+   fi
+ 
+-  dnl When APR stores the dependent libs in the .la file, we don't need 
+-  dnl --libs.
+-  SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
++  SVN_APR_LIBS="`pkg-config --libs apr-1`"
++  SVN_APR_EXPORT_LIBS="`pkg-config --libs apr-1`"
+   if test $? -ne 0; then
+-    AC_MSG_ERROR([apr-config --link-libtool --libs failed])
+-  fi
+-
+-  SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
+-  if test $? -ne 0; then
+-    AC_MSG_ERROR([apr-config --link-ld --libs failed])
++    AC_MSG_ERROR([pkg-config --libs apr-1 failed])
+   fi
+ 
+   SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"
+--- a/build/ac-macros/aprutil.m4
++++ b/build/ac-macros/aprutil.m4
+@@ -77,14 +77,8 @@
+     AC_MSG_ERROR([apu-config --prefix failed])
+   fi
+ 
+-  dnl When APR stores the dependent libs in the .la file, we don't need
+-  dnl --libs.
+-  SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
+-  if test $? -ne 0; then
+-    AC_MSG_ERROR([apu-config --link-libtool --libs failed])
+-  fi
+-
+-  SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
++  SVN_APRUTIL_LIBS="`pkg-config --libs apr-util-1`"
++  SVN_APRUTIL_EXPORT_LIBS="`pkg-config --libs apr-util-1`"
+   if test $? -ne 0; then
+     AC_MSG_ERROR([apu-config --link-ld --libs failed])
+   fi
--- subversion-1.6.17dfsg.orig/debian/patches/no-dbus-spam
+++ subversion-1.6.17dfsg/debian/patches/no-dbus-spam
@@ -0,0 +1,26 @@
+Suppress console spam from the gnome_keyring auth plugin.
+Also committed upstream r38878 for svn 1.7.
+
+--- a/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
++++ b/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
+@@ -478,6 +478,12 @@
+     }
+ }
+ 
++static void log_noop(const gchar *log_domain, GLogLevelFlags log_level,
++                     const gchar *message, gpointer user_data)
++{
++  /* do nothing */
++}
++
+ static void
+ init_gnome_keyring(void)
+ {
+@@ -485,6 +491,7 @@
+   application_name = g_get_application_name();
+   if (!application_name)
+     g_set_application_name("Subversion");
++  g_log_set_default_handler(log_noop, NULL);
+ }
+ 
+ static const svn_auth_provider_t gnome_keyring_simple_provider = {
--- subversion-1.6.17dfsg.orig/debian/patches/perl-compiler-flags
+++ subversion-1.6.17dfsg/debian/patches/perl-compiler-flags
@@ -0,0 +1,15 @@
+Add to, but don't replace, Perl ExtUtils::MakeMaker's CCFLAGS.
+Evidently this was a problem exposed by Perl 5.14.  From upstream r1145203.
+
+
+--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
++++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
+@@ -48,7 +48,7 @@ chomp $apr_shlib_path_var;
+ my %config = (
+     ABSTRACT => 'Perl bindings for Subversion',
+     DEFINE => $cppflags,
+-    CCFLAGS => $cflags,
++    CCFLAGS => join(' ', $cflags, $Config{ccflags}),
+     INC  => join(' ',$apr_cflags, $apu_cflags, 
+                  " -I$swig_srcdir/perl/libsvn_swig_perl",
+                  " -I$svnlib_srcdir/include",
--- subversion-1.6.17dfsg.orig/debian/patches/chunksize-integer.patch
+++ subversion-1.6.17dfsg/debian/patches/chunksize-integer.patch
@@ -0,0 +1,17 @@
+Author: W. Martin Borgert <debacle@debian.org>
+
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683188#78
+Bug-Debian: http://bugs.debian.org/683188
+Forwarded: not-needed
+Last-Update: 2016-04-16
+--- subversion-1.7.9.orig/subversion/bindings/swig/python/svn/core.py
++++ subversion-1.7.9/subversion/bindings/swig/python/svn/core.py
+@@ -145,7 +145,7 @@
+       # read the rest of the stream
+       chunks = [ ]
+       while 1:
+-        data = svn_stream_read(self._stream, SVN_STREAM_CHUNK_SIZE)
++        data = svn_stream_read(self._stream, int(SVN_STREAM_CHUNK_SIZE))
+         if not data:
+           break
+         chunks.append(data)
--- subversion-1.6.17dfsg.orig/debian/patches/ssh-no-controlmaster
+++ subversion-1.6.17dfsg/debian/patches/ssh-no-controlmaster
@@ -0,0 +1,30 @@
+Fix / work around the bug where 'ssh -o ControlMaster=auto'
+interacts badly with the svn+ssh tunnel scheme.  As I note in
+the bug log for #413102, I don't really think the problem is
+either svn's or openssh's fault, but the obvious way to avoid
+it is to avoid accidentally becoming a ControlMaster.  In this
+mode we will still use ssh connection sharing, but only if a
+ControlMaster is already present.
+
+--- a/subversion/libsvn_subr/config_file.c
++++ b/subversion/libsvn_subr/config_file.c
+@@ -1009,7 +1009,7 @@
+         "### passed to the tunnel agent as <user>@<hostname>.)  If the"      NL
+         "### built-in ssh scheme were not predefined, it could be defined"   NL
+         "### as:"                                                            NL
+-        "# ssh = $SVN_SSH ssh -q"                                            NL
++        "# ssh = $SVN_SSH ssh -q -o ControlMaster=no"                        NL
+         "### If you wanted to define a new 'rsh' scheme, to be used with"    NL
+         "### 'svn+rsh:' URLs, you could do so as follows:"                   NL
+         "# rsh = rsh"                                                        NL
+--- a/subversion/libsvn_ra_svn/client.c
++++ b/subversion/libsvn_ra_svn/client.c
+@@ -381,7 +381,7 @@
+        * versions have it too. If the user is using some other ssh
+        * implementation that doesn't accept it, they can override it
+        * in the [tunnels] section of the config. */
+-      val = "$SVN_SSH ssh -q";
++      val = "$SVN_SSH ssh -q -o ControlMaster=no";
+     }
+ 
+   if (!val || !*val)
--- subversion-1.6.17dfsg.orig/debian/patches/rpath
+++ subversion-1.6.17dfsg/debian/patches/rpath
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## rpath by <dwhedon@debian.org>
+
+@DPATCH@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -184,8 +184,9 @@
+ COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
+ COMPILE_JAVAHL_JAVAH = $(JAVAH)
+ 
+-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+ LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
++LINK_LIB = $(LINK) -rpath $(libdir)
+ 
+ # special link rule for mod_dav_svn
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
+@@ -678,7 +679,9 @@
+ 	./config.status subversion/bindings/swig/perl/native/Makefile.PL
+ 
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+-	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
++	cd $(SWIG_PL_DIR)/native; \
++		$(PERL) Makefile.PL INSTALLDIRS=vendor; \
++		sed -i -e '/^LD_RUN_PATH/s/^/#/' Makefile Makefile.[a-z]*
+ 
+ swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
+   $(SWIG_PL_DIR)/native/Makefile
+--- a/build.conf
++++ b/build.conf
+@@ -472,7 +472,7 @@
+ lang = python
+ path = subversion/bindings/swig/python/libsvn_swig_py
+ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
+-link-cmd = $(LINK) $(SWIG_PY_LIBS)
++link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
+ install = swig-py-lib
+ # need special build rule to include -DSWIGPYTHON
+ compile-cmd = $(COMPILE_SWIG_PY)
+@@ -495,7 +495,7 @@
+ lang = ruby
+ path = subversion/bindings/swig/ruby/libsvn_swig_ruby
+ libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
+-link-cmd = $(LINK) $(SWIG_RB_LIBS)
++link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
+ install = swig-rb-lib
+ # need special build rule to include
+ compile-cmd = $(COMPILE_SWIG_RB)
+--- a/build/generator/gen_base.py
++++ b/build/generator/gen_base.py
+@@ -358,7 +358,7 @@
+     self.install = options.get('install')
+     self.compile_cmd = options.get('compile-cmd')
+     self.sources = options.get('sources', '*.c *.cpp')
+-    self.link_cmd = options.get('link-cmd', '$(LINK)')
++    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
+ 
+     self.external_lib = options.get('external-lib')
+     self.external_project = options.get('external-project')
+@@ -410,6 +410,7 @@
+       extmap = self.gen_obj._extension_map
+       self.objext = extmap['exe', 'object']
+       self.filename = build_path_join(self.path, name + extmap['exe', 'target'])
++      self.link_cmd = '$(LINK)'
+ 
+     self.manpages = options.get('manpages', '')
+     self.testing = options.get('testing')
+--- a/build/generator/gen_make.py
++++ b/build/generator/gen_make.py
+@@ -389,8 +389,8 @@
+           name = base.replace('mod_', '')
+           self.ofile.write('\tcd %s ; '
+                            '$(MKDIR) "$(APACHE_LIBEXECDIR)" ; '
+-                           '$(INSTALL_MOD_SHARED) -n %s %s\n'
+-                           % (dirname, name, fname))
++                           '$(INSTALL_LIB) %s $(APACHE_LIBEXECDIR)\n'
++                           % (dirname, fname))
+         self.ofile.write('\n')
+ 
+       elif area != 'test' and area != 'bdb-test':
--- subversion-1.6.17dfsg.orig/debian/patches/java-build
+++ subversion-1.6.17dfsg/debian/patches/java-build
@@ -0,0 +1,26 @@
+A hack to get around differences between Sun javah and gcj javah - in Sun
+javah, symbols in a nested class use _ as a separator instead of _00024.
+
+--- a/build/generator/gen_make.py
++++ b/build/generator/gen_make.py
+@@ -290,7 +290,8 @@
+             '%s_CLASS_FILENAMES = %s\n'
+             '%s_CLASSES = %s\n'
+             '$(%s_HEADERS): $(%s_CLASS_FILENAMES)\n'
+-            '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_CLASSES)\n'
++            '\t%s -d %s -classpath %s:$(%s_CLASSPATH) -all %s\n'
++            '\tcd %s; sed -i s/_00024/_/ *.h\n'
+             % (targ_varname, ' '.join(header_class_filenames),
+ 
+                targ_varname, ' '.join(header_classes),
+@@ -298,7 +299,9 @@
+                targ_varname, targ_varname,
+ 
+                target_ob.link_cmd, target_ob.output_dir, target_ob.classes,
+-               targ_varname, targ_varname))
++               targ_varname, target_ob.classes,
++
++               target_ob.output_dir))
+ 
+         # Build the objects from the object_srcs with one 'javac' call
+         if object_srcs:
--- subversion-1.6.17dfsg.orig/debian/patches/python-exception-syntax
+++ subversion-1.6.17dfsg/debian/patches/python-exception-syntax
@@ -0,0 +1,35 @@
+As of Python 2.6, "raise" no longer accepts a literal string; you have
+to create an Exception object out of it.  (#585358)
+
+
+--- a/contrib/server-side/fsfsverify.py
++++ b/contrib/server-side/fsfsverify.py
+@@ -978,7 +978,7 @@ def fixStream(e, revFile):
+       break
+ 
+   if not m:
+-    raise "Couldn't find end of rep!"
++    raise Exception("Couldn't find end of rep!")
+ 
+   finalOffset = errorOffset + srcLength
+   srcOffset = errorOffset
+--- a/contrib/server-side/svn-fast-backup
++++ b/contrib/server-side/svn-fast-backup
+@@ -257,7 +257,7 @@ def do_rsync_backup():
+ 
+     # copy db/current.  -R tells rsync to use relative pathnames.
+     if runcmd([rsync, '-aR', 'db/current', rsync_dest]):
+-        raise "%s: rsync failed" %sys.argv[0]
++        raise Exception("%s: rsync failed" %sys.argv[0])
+ 
+     # Now copy everything else.
+     cmd = [rsync, '-a',
+@@ -270,7 +270,7 @@ def do_rsync_backup():
+         cmd += ['--link-dest', os.path.join(options.backup_dir, previous_backups[-1])]
+ 
+     if runcmd(cmd):
+-        raise "%s: rsync failed" %sys.argv[0]
++        raise Exception("%s: rsync failed" %sys.argv[0])
+ 
+     # Rename to final name.
+     if not options.simulate:
--- subversion-1.6.17dfsg.orig/debian/patches/perl-warning
+++ subversion-1.6.17dfsg/debian/patches/perl-warning
@@ -0,0 +1,18 @@
+Fix warning on network errors in perl bindings (Bug #422699).
+It's actually a common case where an error structure doesn't have an
+auxilliary message string, so we shouldn't expect one.
+From upstream r1146834, included in 1.7.x.
+
+
+--- a/subversion/bindings/swig/perl/native/Core.pm
++++ b/subversion/bindings/swig/perl/native/Core.pm
+@@ -581,7 +581,8 @@ sub expanded_message {
+ 
+ 		my $error_message = $svn_error->strerror();
+ 		while ($svn_error) {
+-		    $error_message .= ': ' . $svn_error->message();
++		    my $msg = $svn_error->message();
++		    $error_message .= ": $msg" if $msg;
+ 				$svn_error = $svn_error->child();
+ 		}
+ 		return $error_message;
--- subversion-1.6.17dfsg.orig/debian/patches/repos-templates
+++ subversion-1.6.17dfsg/debian/patches/repos-templates
@@ -0,0 +1,86 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## repos-templates by <dwhedon@debian.org>
+
+@DPATCH@
+--- a/subversion/libsvn_repos/repos.c
++++ b/subversion/libsvn_repos/repos.c
+@@ -266,7 +266,7 @@
+ 
+ #define PREWRITTEN_HOOKS_TEXT                                                 \
+   "# For more examples and pre-written hooks, see those in"                NL \
+-  "# the Subversion repository at"                                         NL \
++  "# /usr/share/subversion/hook-scripts, and in the repository at"         NL \
+   "# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and"        NL \
+   "# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/"          NL
+ 
+@@ -345,8 +345,11 @@
+ "REPOS=\"$1\""                                                               NL
+ "USER=\"$2\""                                                                NL
+ ""                                                                           NL
+-"commit-allower.pl --repository \"$REPOS\" --user \"$USER\" || exit 1"       NL
+-"special-auth-check.py --user \"$USER\" --auth-level 3 || exit 1"            NL
++"# Exit on all errors."                                                      NL
++"set -e"                                                                     NL
++""                                                                           NL
++"\"$REPOS\"/hooks/commit-allower.pl --repository \"$REPOS\" --user \"$USER\"" NL
++"\"$REPOS\"/hooks/special-auth-check.py --user \"$USER\" --auth-level 3"     NL
+ ""                                                                           NL
+ "# All checks passed, so allow the commit."                                  NL
+ "exit 0"                                                                     NL;
+@@ -433,10 +436,13 @@
+ "$SVNLOOK log -t \"$TXN\" \"$REPOS\" | \\"                                   NL
+ "   grep \"[a-zA-Z0-9]\" > /dev/null || exit 1"                              NL
+ ""                                                                           NL
++"# Exit on all errors."                                                      NL
++"set -e"                                                                     NL
++""                                                                           NL
+ "# Check that the author of this commit has the rights to perform"           NL
+ "# the commit on the files and directories being modified."                  NL
+-"commit-access-control.pl \"$REPOS\" \"$TXN\" commit-access-control.cfg || exit 1"
+-                                                                             NL
++"\"$REPOS\"/hooks/commit-access-control.pl \"$REPOS\" $TXN \\"               NL
++"  \"$REPOS\"/hooks/commit-access-control.cfg"                               NL
+ ""                                                                           NL
+ "# All checks passed, so allow the commit."                                  NL
+ "exit 0"                                                                     NL;
+@@ -743,7 +749,7 @@
+ "REPOS=\"$1\""                                                               NL
+ "REV=\"$2\""                                                                 NL
+                                                                              NL
+-"mailer.py commit \"$REPOS\" \"$REV\" /path/to/mailer.conf"                  NL;
++"\"$REPOS\"/hooks/mailer.py commit \"$REPOS\" $REV \"$REPOS\"/mailer.conf"   NL;
+ 
+ #undef SCRIPT_NAME
+ 
+@@ -804,7 +810,8 @@
+ "USER=\"$2\""                                                                NL
+ ""                                                                           NL
+ "# Send email to interested parties, let them know a lock was created:"      NL
+-"mailer.py lock \"$REPOS\" \"$USER\" /path/to/mailer.conf"                   NL;
++"\"$REPOS\"/hooks/mailer.py lock \\"                                         NL
++"  \"$REPOS\" \"$USER\" \"$REPOS\"/hooks/mailer.conf"                        NL;
+ 
+ #undef SCRIPT_NAME
+ 
+@@ -863,7 +870,8 @@
+ "USER=\"$2\""                                                                NL
+ ""                                                                           NL
+ "# Send email to interested parties, let them know a lock was removed:"      NL
+-"mailer.py unlock \"$REPOS\" \"$USER\" /path/to/mailer.conf"                 NL;
++"\"$REPOS\"/hooks/mailer.py unlock \\"                                       NL
++"  \"$REPOS\" \"$USER\" \"$REPOS\"/hooks/mailer.conf"                        NL;
+ 
+ #undef SCRIPT_NAME
+ 
+@@ -928,8 +936,8 @@
+ "PROPNAME=\"$4\""                                                            NL
+ "ACTION=\"$5\""                                                              NL
+ ""                                                                           NL
+-"mailer.py propchange2 \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" "
+-"\"$ACTION\" /path/to/mailer.conf"                                           NL;
++"\"$REPOS\"/hooks/mailer.py propchange2 \"$REPOS\" $REV \\"                  NL
++"  \"$USER\" \"$PROPNAME\" \"$ACTION\" \"$REPOS\"/hooks/mailer.conf"         NL;
+ 
+ #undef SCRIPT_NAME
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/workaround_EINVAL_on_kfreebsd
+++ subversion-1.6.17dfsg/debian/patches/workaround_EINVAL_on_kfreebsd
@@ -0,0 +1,11 @@
+--- a/subversion/bindings/swig/ruby/test/util.rb
++++ b/subversion/bindings/swig/ruby/test/util.rb
+@@ -304,6 +304,8 @@ exit 1
+ 	TCPSocket.new(@svnserve_host, port).close
+       rescue Errno::ECONNREFUSED
+ 	sleep(n < 10 ? 0.2 : 0.5)
++      rescue Errno::EINVAL
++	sleep(n < 10 ? 0.2 : 0.5)
+       else
+ 	return true
+       end
--- subversion-1.6.17dfsg.orig/debian/patches/svn2cl-debian
+++ subversion-1.6.17dfsg/debian/patches/svn2cl-debian
@@ -0,0 +1,21 @@
+svn2cl-debian: hard-code svn2cl's data directory to /etc/svn2cl/.
+
+--- a/contrib/client-side/svn2cl/svn2cl.sh
++++ b/contrib/client-side/svn2cl/svn2cl.sh
+@@ -252,15 +252,7 @@
+   esac
+ done
+ 
+-# find the directory that this script resides in
+-prog="$0"
+-while [ -h "$prog" ]
+-do
+-  dir=`dirname "$prog"`
+-  prog=`ls -ld "$prog" | sed "s/^.*-> \(.*\)/\1/;/^[^/]/s,^,$dir/,"`
+-done
+-dir=`dirname "$prog"`
+-dir=`cd "$dir" && pwd`
++dir=/etc/svn2cl
+ XSL="$dir/svn2${OUTSTYLE}.xsl"
+ 
+ # check if the authors file is formatted as a legacy
--- subversion-1.6.17dfsg.orig/debian/patches/CVE-2013-2112.patch
+++ subversion-1.6.17dfsg/debian/patches/CVE-2013-2112.patch
@@ -0,0 +1,24 @@
+Description: Fix CVE-2013-2112
+ Subversion's svnserve server process may exit when an incoming TCP connection
+ is closed early in the connection process.
+ .
+ This can lead to disruption for users of the server.
+Origin: upstream, http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
+Bug-Debian: http://bugs.debian.org/711033
+Forwarded: not-needed
+Author: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2013-06-05
+
+--- a/subversion/svnserve/main.c
++++ b/subversion/svnserve/main.c
+@@ -773,7 +773,9 @@
+                                          connection_pool) == APR_CHILD_DONE)
+             ;
+         }
+-      if (APR_STATUS_IS_EINTR(status))
++      if (APR_STATUS_IS_EINTR(status)
++          || APR_STATUS_IS_ECONNABORTED(status)
++          || APR_STATUS_IS_ECONNRESET(status))
+         {
+           svn_pool_destroy(connection_pool);
+           continue;
--- subversion-1.6.17dfsg.orig/debian/patches/g++47
+++ subversion-1.6.17dfsg/debian/patches/g++47
@@ -0,0 +1,46 @@
+Build fix for g++ 4.7.x.  Upstream 
+
+--- a/subversion/libsvn_auth_kwallet/kwallet.cpp
++++ b/subversion/libsvn_auth_kwallet/kwallet.cpp
+@@ -52,6 +52,9 @@
+ /* KWallet simple provider, puts passwords in KWallet                    */
+ /*-----------------------------------------------------------------------*/
+ 
++static int q_argc = 1;
++static char q_argv0[] = "svn"; // Build non-const char * from string constant
++static char *q_argv[] = { q_argv0 };
+ 
+ static const char *
+ get_application_name(apr_hash_t *parameters,
+@@ -182,12 +185,11 @@ kwallet_password_get(const char **passwo
+   QCoreApplication *app;
+   if (! qApp)
+     {
+-      int argc = 1;
+-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++      int argc = q_argc;
++      app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(1,
+-                     (char *[1]) {(char *) "svn"},
++  KCmdLineArgs::init(q_argc, q_argv,
+                      get_application_name(parameters, pool),
+                      "subversion",
+                      ki18n(get_application_name(parameters, pool)),
+@@ -252,12 +254,11 @@ kwallet_password_set(apr_hash_t *creds,
+   QCoreApplication *app;
+   if (! qApp)
+     {
+-      int argc = 1;
+-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++      int argc = q_argc;
++      app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(1,
+-                     (char *[1]) {(char *) "svn"},
++  KCmdLineArgs::init(q_argc, q_argv,
+                      get_application_name(parameters, pool),
+                      "subversion",
+                      ki18n(get_application_name(parameters, pool)),
--- subversion-1.6.17dfsg.orig/debian/patches/examples-compile-instructions
+++ subversion-1.6.17dfsg/debian/patches/examples-compile-instructions
@@ -0,0 +1,98 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## examples_compile_instructions by <peter@p12n.org>
+##
+## DP: Fix build instructions for /usr/share/doc/libsvn-doc/examples/*.c.
+
+@DPATCH@
+--- a/tools/examples/getlocks_test.c
++++ b/tools/examples/getlocks_test.c
+@@ -15,13 +15,11 @@
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  *
+- *  To compile on unix against Subversion and APR libraries, try
+- *  something like:
++ *  To compile on Debian:
+  *
+  *  cc getlocks_test.c -o getlocks_test \
+- *  -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \
+- *  -L/usr/local/apache2/lib -L/usr/local/lib \
+- *  -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lapr-0 -laprutil-0
++ *  -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) \
++ *  -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1
+  *
+  */
+ 
+--- a/tools/examples/headrev.c
++++ b/tools/examples/headrev.c
+@@ -15,13 +15,11 @@
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  *
+- *  To compile on unix against Subversion and APR libraries, try
+- *  something like:
++ *  To compile on Debian:
+  *
+  *  cc headrev.c -o headrev \
+- *  -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \
+- *  -L/usr/local/apache2/lib -L/usr/local/lib \
+- *  -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lapr-0 -laprutil-0
++ *  -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) \
++ *  -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1
+  *
+  */
+ 
+--- a/tools/examples/minimal_client.c
++++ b/tools/examples/minimal_client.c
+@@ -25,12 +25,10 @@
+  *  For a much more complex example, the svn cmdline client might be
+  *  considered the 'reference implementation'.
+  *
+- *  From a Linux system, a typical commandline compile might look like:
++ *  To compile on Debian:
+  *
+  *  cc minimal_client.c -o minimal_client \
+- *  -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \
+- *  -L/usr/local/apache2/lib -L/usr/local/lib \
+- *  -lsvn_client-1 -lapr-0 -laprutil-0
++ *  -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) -lsvn_client-1
+  *
+  */
+ 
+--- a/tools/examples/svnput.c
++++ b/tools/examples/svnput.c
+@@ -28,13 +28,10 @@
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  *
+- *  To compile on unix against Subversion and APR libraries, try
+- *  something like:
++ *  To compile on Debian:
+  *
+  *  cc svnput.c -o svnput \
+- *  -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \
+- *  -L/usr/local/apache2/lib -L/usr/local/lib \
+- *  -lsvn_client-1 -lapr-0 -laprutil-0
++ *  -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) -lsvn_client-1
+  *
+  */
+ 
+--- a/tools/examples/testwrite.c
++++ b/tools/examples/testwrite.c
+@@ -15,13 +15,11 @@
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  *
+- *  To compile on unix against Subversion and APR libraries, try
+- *  something like:
++ *  To compile on Debian:
+  *
+  *  cc testwrite.c -o testwrite \
+- *  -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \
+- *  -L/usr/local/apache2/lib -L/usr/local/lib \
+- *  -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lsvn-fs-1 -lapr-0 -laprutil-0
++ *  -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) \
++ *  -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lsvn_fs-1
+  *
+  */
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/po
+++ subversion-1.6.17dfsg/debian/patches/po
@@ -0,0 +1,40 @@
+Bug 607381 from Laurent Bigonville <bigon@debian.org>:
+> The French and Japanese translation for the "resolve" command are
+> reporting wrong arguments for the --accept parameter.
+
+This will be obsolete in 1.7.
+
+--- a/subversion/po/fr.po
++++ b/subversion/po/fr.po
+@@ -8595,7 +8595,7 @@ msgid ""
+ "                             'theirs-conflict', 'mine-full', 'theirs-full')"
+ msgstr ""
+ "précise l'action de la résolution automatique de conflit\n"
+-"    ('postpone', 'base', 'mine-conflict',\n"
++"    ('base', 'working', 'mine-conflict',\n"
+ "     'theirs-conflict', 'mine-full', 'theirs-full')"
+ 
+ #: ../svn/main.c:802
+--- a/subversion/po/ja.po
++++ b/subversion/po/ja.po
+@@ -7951,7 +7951,8 @@ msgid ""
+ "                             'edit', 'launch')"
+ msgstr ""
+ "自動競合解決の操作を指定します\n"
+-"                            ('postpone', 'base', 'mine-full', 'theirs-full',\n"
++"                            ('postpone', 'base', 'mine-conflict',\n"
++"                             'theirs-conflict', 'mine-full', 'theirs-full',\n"
+ "                             'edit', 'launch')"
+ 
+ # * Description for 'svn --show-revs'
+@@ -8936,8 +8937,8 @@ msgid ""
+ "                             'theirs-conflict', 'mine-full', 'theirs-full')"
+ msgstr ""
+ "自動競合解決の操作を指定します\n"
+-"                            ('postpone', 'base', 'mine-full', 'theirs-full',\n"
+-"                             'edit', 'launch')"
++"                            ('base', 'working', 'mine-conflict',\n"
++"                             'theirs-conflict', 'mine-full', 'theirs-full')"
+ 
+ # * Description for 'svn resolved'.
+ # * "resolved: " is displayed at the head of the first line.
--- subversion-1.6.17dfsg.orig/debian/patches/ruby-no-strict-aliasing
+++ subversion-1.6.17dfsg/debian/patches/ruby-no-strict-aliasing
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## ruby-no-strict-aliasing by <peter@p12n.org>
+##
+## DP: Compile ruby bindings with -fno-strict-aliasing.
+## DP: It seems swig is generating _really_ bad code here, or something.
+## DP:
+## DP: Whatever it is, this line suppresses 1323 warnings, any of which might
+## DP: be real bugs with real consequences.
+
+@DPATCH@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -126,7 +126,7 @@
+ SWIG_PY_LIBS = @SWIG_PY_LIBS@
+ SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
+ SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
+-SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
++SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ -fno-strict-aliasing
+ SWIG_RB_LINK = @SWIG_RB_LINK@
+ SWIG_RB_LIBS = @SWIG_RB_LIBS@
+ SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@
--- subversion-1.6.17dfsg.orig/debian/patches/sasl-mem-handling
+++ subversion-1.6.17dfsg/debian/patches/sasl-mem-handling
@@ -0,0 +1,31 @@
+Fix a memory lifetime issue that caused SASL auth with svn:// URLs to crash.
+From upstream r1166555,1166678.
+
+
+--- a/subversion/libsvn_ra_svn/cyrus_auth.c
++++ b/subversion/libsvn_ra_svn/cyrus_auth.c
+@@ -730,9 +730,7 @@ svn_ra_svn__do_cyrus_auth(svn_ra_svn__se
+   const char *mechstring = "", *last_err = "", *realmstring;
+   const char *local_addrport = NULL, *remote_addrport = NULL;
+   svn_boolean_t success;
+-  /* Reserve space for 3 callbacks (for the username, password and the
+-     array terminator). */
+-  sasl_callback_t callbacks[3];
++  sasl_callback_t *callbacks;
+   cred_baton_t cred_baton;
+   int i;
+ 
+@@ -768,6 +766,13 @@ svn_ra_svn__do_cyrus_auth(svn_ra_svn__se
+   cred_baton.realmstring = realmstring;
+   cred_baton.pool = pool;
+ 
++  /* Reserve space for 3 callbacks (for the username, password and the
++     array terminator).  These structures must persist until the
++     disposal of the SASL context at pool cleanup, however the
++     callback functions will not be invoked outside this function so
++     other structures can have a shorter lifetime. */
++  callbacks = apr_palloc(sess->conn->pool, sizeof(*callbacks) * 3);
++
+   /* Initialize the callbacks array. */
+ 
+   /* The username callback. */
--- subversion-1.6.17dfsg.orig/debian/patches/build-fixes
+++ subversion-1.6.17dfsg/debian/patches/build-fixes
@@ -0,0 +1,172 @@
+--- a/build/generator/swig/checkout_swig_header.py
++++ b/build/generator/swig/checkout_swig_header.py
+@@ -20,15 +20,14 @@ class Generator(generator.swig.Generator
+ 
+   def write_makefile_rules(self, makefile):
+     """Write makefile rules to checkout files"""
+-    script_path = '$(top_srcdir)/build/generator/swig/checkout_swig_header.py'
+-    conf = '$(abs_srcdir)/build.conf'
+-    makefile.write('CHECKOUT_SWIG = cd $(top_builddir) && $(PYTHON)' +
+-                   ' %s %s $(SWIG)\n\n' % (script_path, conf))
++    script_path = 'build/generator/swig/checkout_swig_header.py'
++    makefile.write('CHECKOUT_SWIG = cd $(top_srcdir) &&' +
++                   ' $(PYTHON) %s build.conf $(SWIG)\n' % script_path)
+     checkout_locations = []
+     for path in self.swig_checkout_files:
+       out = self._output_file(path)
+       checkout_locations.append(out)
+-      makefile.write('%s: %s\n' % (out, script_path) +
++      makefile.write('%s: $(top_srcdir)/%s\n' % (out, script_path) +
+                      '\t$(CHECKOUT_SWIG) %s\n\n' % path)
+     makefile.write('SWIG_CHECKOUT_FILES = %s\n\n\n'
+                    % " ".join(checkout_locations))
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -249,14 +249,14 @@ INSTALL_EXTRA_SWIG_PY=\
+ 
+ # The path to generated and complementary source files for the SWIG
+ # bindings.
+-SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl
+-SWIG_PY_DIR = $(abs_builddir)/subversion/bindings/swig/python
+-SWIG_RB_DIR = $(abs_builddir)/subversion/bindings/swig/ruby
++SWIG_PL_DIR = $(top_builddir)/subversion/bindings/swig/perl
++SWIG_PY_DIR = $(top_builddir)/subversion/bindings/swig/python
++SWIG_RB_DIR = $(top_builddir)/subversion/bindings/swig/ruby
+ 
+ # The path to the source files for the SWIG bindings
+ SWIG_PL_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/perl
+-SWIG_PY_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/python
+-SWIG_RB_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/ruby
++SWIG_PY_SRC_DIR = $(top_srcdir)/subversion/bindings/swig/python
++SWIG_RB_SRC_DIR = $(top_srcdir)/subversion/bindings/swig/ruby
+ 
+ ### Automate JAR creation using Makefile generator's javahl-java.jar
+ ### property.  Enhance generator to support JAR installation.
+@@ -537,6 +537,7 @@ doc: doc-misc-docs doc-api doc-javahl
+ # Generate API documentation for the C libraries.
+ ### This could also generate POD for swig-perl, etc.
+ doc-api:
++	[ -d doc ] || $(MKDIR) doc
+ 	( cd $(top_srcdir) && \
+ 	  sed "s,\(OUTPUT_DIRECTORY *= *\),\1$(abs_builddir)/," \
+ 	  doc/doxygen.conf | doxygen - )
+@@ -716,8 +717,7 @@ clean-swig-pl:
+ 	fi
+ 	for d in $(SWIG_PL_DIR)/libsvn_swig_perl; \
+ 	do \
+-	  cd $$d; \
+-	  rm -rf *.lo *.la *.o .libs; \
++	  (cd $$d && rm -rf *.lo *.la *.o .libs); \
+ 	done
+ 	if [ -f "$(SWIG_PL_DIR)/native/Makefile" ]; then \
+ 	  cd $(SWIG_PL_DIR)/native; $(MAKE) clean; \
+@@ -750,7 +750,7 @@ clean-swig-py:
+ 	fi
+ 	for d in $(SWIG_PY_DIR) $(SWIG_PY_DIR)/libsvn_swig_py; \
+ 	do \
+-	  cd $$d && rm -rf *.lo *.la *.o *.pyc .libs; \
++	  (cd $$d && rm -rf *.lo *.la *.o *.pyc .libs); \
+ 	done
+ 	find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) -name "*.pyc" -exec rm {} ';'
+ 
+@@ -774,8 +774,7 @@ clean-swig-rb:
+ 	fi
+ 	for d in $(SWIG_RB_DIR) $(SWIG_RB_DIR)/libsvn_swig_ruby; \
+ 	do \
+-	  cd $$d; \
+-	  rm -rf *.lo *.la *.o .libs; \
++	  (cd $$d && rm -rf *.lo *.la *.o .libs); \
+ 	done
+ 
+ extraclean-swig-rb: clean-swig-rb
+--- a/build/generator/gen_make.py
++++ b/build/generator/gen_make.py
+@@ -183,9 +183,9 @@ class Generator(gen_base.GeneratorBase):
+       source_dir = build_path_dirname(source)
+       opts = self.swig.opts[objname.lang]
+       if not self.release_mode:
+-        self.ofile.write('%s: %s\n' % (objname, deps) +
+-          '\t$(SWIG) $(SWIG_INCLUDES) %s ' % opts +
+-          '-o $@ $(top_srcdir)/%s\n' % source
++        self.ofile.write('$(top_srcdir)/%s:' % objname +
++                         ' $(top_srcdir)/%s %s\n' % (source, deps) +
++          '\t$(SWIG) $(SWIG_INCLUDES) %s -o $@ $<\n' % opts
+         )
+ 
+     self.ofile.write('\n')
+@@ -456,11 +456,11 @@ class Generator(gen_base.GeneratorBase):
+       self.ofile.write('%s: %s\n' % (objname, deps))
+       cmd = objname.compile_cmd
+       if cmd:
+-        if not getattr(objname, 'source_generated', 0):
++#        if not getattr(objname, 'source_generated', 0):
+           self.ofile.write('\t%s %s\n\n'
+                            % (cmd, '$(canonicalized_srcdir)' + str(sources[0])))
+-        else:
+-          self.ofile.write('\t%s %s\n\n' % (cmd, sources[0]))
++#        else:
++#          self.ofile.write('\t%s %s\n\n' % (cmd, sources[0]))
+       else:
+         self.ofile.write('\n')
+ 
+--- a/build/generator/gen_base.py
++++ b/build/generator/gen_base.py
+@@ -284,7 +284,8 @@ class SourceFile(DependencyNode):
+ 
+ class SWIGSource(SourceFile):
+   def __init__(self, filename):
+-    SourceFile.__init__(self, filename, build_path_dirname(filename))
++    SourceFile.__init__(self, filename,
++                        build_path_dirname('$(top_srcdir)/' + filename))
+   pass
+ 
+ lang_abbrev = {
+--- a/build/generator/swig/header_wrappers.py
++++ b/build/generator/swig/header_wrappers.py
+@@ -32,7 +32,7 @@ class Generator(generator.swig.Generator
+     """Write makefile rules for generating SWIG wrappers for Subversion
+     header files."""
+     wrapper_fnames = []
+-    python_script = '$(abs_srcdir)/build/generator/swig/header_wrappers.py'
++    python_script = 'build/generator/swig/header_wrappers.py'
+     makefile.write('GEN_SWIG_WRAPPER = cd $(top_srcdir) && $(PYTHON)' +
+                    ' %s build.conf $(SWIG)\n\n'  % python_script)
+     for fname in self.includes:
+--- a/configure.ac
++++ b/configure.ac
+@@ -1010,6 +1010,11 @@ SVN_CONFIG_SCRIPT(packages/solaris/pkgin
+ AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
+ 
+ AC_OUTPUT
++if test "$abs_srcdir" != "$abs_builddir"
++then
++  AC_MSG_NOTICE([Creating build directories])
++  (cd "$abs_srcdir"; find subversion tools contrib -type d) | xargs $MKDIR
++fi
+ 
+ # ==== Print final messages to user ==========================================
+ 
+--- a/build.conf
++++ b/build.conf
+@@ -648,13 +648,14 @@ libs = libsvn_test libsvn_repos libsvn_f
+ # ----------------------------------------------------------------------------
+ # Tests for libsvn_subr
+ 
+-[auth-test]
+-description = Test platform-specific auth provider access
+-type = exe
+-path = subversion/tests/libsvn_subr
+-sources = auth-test.c
+-install = test
+-libs = libsvn_test libsvn_subr
++# Fails because it assumes gnome-keyring facilities are available at test time
++#[auth-test]
++#description = Test platform-specific auth provider access
++#type = exe
++#path = subversion/tests/libsvn_subr
++#sources = auth-test.c
++#install = test
++#libs = libsvn_test libsvn_subr
+ 
+ [cache-test]
+ description = Test in-memory cache
--- subversion-1.6.17dfsg.orig/debian/patches/loosen-sqlite-version-check
+++ subversion-1.6.17dfsg/debian/patches/loosen-sqlite-version-check
@@ -0,0 +1,18 @@
+The actual ABI compatibility of sqlite3 doesn't seem to depend on the
+patchlevel (the x in 3.7.x), so omit that in our sanity check here.
+
+This matters in Debian because the sqlite3 library package exports a
+slightly more liberal shlibs file than the library version itself.
+
+
+--- a/subversion/libsvn_subr/sqlite.c
++++ b/subversion/libsvn_subr/sqlite.c
+@@ -486,7 +486,7 @@ static volatile svn_atomic_t sqlite_init
+ static svn_error_t *
+ init_sqlite(void *baton, apr_pool_t *pool)
+ {
+-  if (sqlite3_libversion_number() < SQLITE_VERSION_NUMBER) {
++  if (sqlite3_libversion_number()/1000 < SQLITE_VERSION_NUMBER/1000) {
+     return svn_error_createf(SVN_ERR_SQLITE_ERROR, NULL,
+                              _("SQLite compiled for %s, but running with %s"),
+                              SQLITE_VERSION, sqlite3_libversion());
--- subversion-1.6.17dfsg.orig/debian/patches/svn-clean-ignore
+++ subversion-1.6.17dfsg/debian/patches/svn-clean-ignore
@@ -0,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## svn-clean-ignore by <peter@p12n.org>
+##
+## DP: Support a new 'svn-clean:ignore' directory property in
+## DP: svn-clean, conceptually a lot like the svn:ignore property.
+## DP: svn-clean will not remove files that match svn-clean:ignore.
+## DP: Suggested by Jonathan Hall <flimzy@flimzy.com>.
+## DP: Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0236.shtml
+
+@DPATCH@
+--- a/contrib/client-side/svn-clean
++++ b/contrib/client-side/svn-clean
+@@ -52,11 +52,20 @@
+ # Precompile regexes.
+ $_ = qr/$_/ foreach @exclude;
+ 
++my %svn_clean_ignore;
+ if ($use_svn_module) {
+ 
+     # Create SVN client object. No need for connection to remote server.
+     my $ctx = new SVN::Client;
+ 
++    my $ign = $ctx->propget('svn-clean:ignore', $path, undef, 1);
++    for my $dir (keys %$ign) {
++        for (split /\n/, $ign->{$dir}) {
++            for (glob "$dir/$_") {
++                $svn_clean_ignore{$_} = 1 if -e $_;
++            }
++        }
++    }
+     # Call handler function with status info for each file.
+     $ctx->status( $path, undef, \&clean, !$nonrecursive, 1, 0, 1 );
+ }
+@@ -64,8 +73,22 @@
+     warn "Warning: Not using SVN Perl modules, this might be slow.\n"
+       unless $quiet;
+ 
+-    # Build svn client command
+-    my @command = qw(svn status --no-ignore -v);
++    my @command = qw(svn propget svn-clean:ignore);
++    push @command, '-R' unless $nonrecursive;
++    open PG, '-|', @command, @ARGV;
++    my $dir;
++    while (<PG>) {
++        if (s/(.*?) - //) {
++            $dir = $1;
++        }
++        chomp;
++        for (glob "$dir/$_") {
++            $svn_clean_ignore{$_} = 1 if -e $_;
++        }
++    }
++    close PG;
++
++    @command = qw(svn status --no-ignore -v);
+     if ($nonrecursive) {
+         push @command, '-N';
+     }
+@@ -84,6 +107,7 @@
+   LINE: while (<SVN>) {
+         if (/^([\?ID])/) {
+             my $file = (split)[-1];
++            next if $svn_clean_ignore{$file};
+             foreach my $ex (@exclude) {
+                 if ( $file =~ $ex ) {
+                     print "excluded $file\n" unless $quiet or $print;
+@@ -109,6 +133,7 @@
+ # Main file-wiping function.
+ sub clean {
+     my ( $path, $status ) = @_;
++    return if $svn_clean_ignore{$path};
+ 
+     # Use relative path for pretty-printing.
+     if ( $path =~ s/^\Q$CWD\E\/?//o ) {
+@@ -165,7 +190,9 @@
+ B<svn-clean> will scan the given files and directories recursively and find
+ unversioned files and directories (files and directories that are not present in
+ the Subversion repository). After the scan is done, these files and directories
+-will be deleted.
++will be deleted.  Files which match patterns in the I<svn-clean:ignore> dir
++property will be spared, much as the I<svn:ignore> property works for B<svn
++status>.
+ 
+ If no file or directory is given, B<svn-clean> defaults to the current directory
+ (".").
--- subversion-1.6.17dfsg.orig/debian/patches/commit-email
+++ subversion-1.6.17dfsg/debian/patches/commit-email
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## commit-email.dpatch by <peter@p12n.org>
+##
+## DP: Select the 'sendmail' interface for commit-email.pl by default,
+## DP: which works better than the 'smtp_server' feature.
+
+@DPATCH@
+--- a/contrib/hook-scripts/commit-email.pl.in
++++ b/contrib/hook-scripts/commit-email.pl.in
+@@ -57,8 +57,8 @@
+ # leaving the other commented out, to select which method of sending
+ # email should be used.
+ # Using --stdout on the command line overrides both.
+-#$sendmail = "/usr/sbin/sendmail";
+-$smtp_server = "127.0.0.1";
++$sendmail = "/usr/sbin/sendmail";
++#$smtp_server = "127.0.0.1";
+ 
+ # Svnlook path.
+ my $svnlook = "@SVN_BINDIR@/svnlook";
--- subversion-1.6.17dfsg.orig/debian/patches/no-extra-libs-2
+++ subversion-1.6.17dfsg/debian/patches/no-extra-libs-2
@@ -0,0 +1,106 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## no-extra-libs-2 by <peter@p12n.org>
+##
+## DP: Eliminate several unneeded inter-library linkages.
+## DP: This saves us one package dependency (subversion -> libneon).
+
+@DPATCH@
+--- a/build.conf
++++ b/build.conf
+@@ -149,7 +149,7 @@
+ type = exe
+ path = subversion/svn
+ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
+-       apriconv apr neon
++       apriconv apr
+ manpages = subversion/svn/svn.1
+ install = bin
+ 
+@@ -194,7 +194,7 @@
+ description = Subversion repository replicator
+ type = exe
+ path = subversion/svnsync
+-libs = libsvn_ra libsvn_delta libsvn_subr apr neon
++libs = libsvn_ra libsvn_delta libsvn_subr apr
+ install = bin
+ manpages = subversion/svnsync/svnsync.1
+ 
+@@ -543,7 +543,7 @@
+ type = lib
+ path = subversion/bindings/javahl/native
+ libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff 
+-       libsvn_subr libsvn_fs aprutil apriconv apr neon
++       libsvn_subr libsvn_fs apriconv apr
+ sources = *.cpp *.c
+ add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS)
+ install = javahl-lib
+@@ -905,7 +905,7 @@
+ 
+ [apriconv]
+ type = lib
+-external-lib = $(SVN_APRUTIL_LIBS)
++external-lib = $(SVN_APR_LIBS)
+ 
+ [bdb]
+ type = lib
+@@ -1033,14 +1033,14 @@
+ path = contrib/client-side/svn-push
+ sources = svn-push.c
+ install = contrib
+-libs = libsvn_ra libsvn_delta libsvn_subr apriconv apr neon
++libs = libsvn_ra libsvn_delta libsvn_subr apriconv apr
+ 
+ [svnmucc]
+ type = exe
+ path = tools/client-side/svnmucc
+ sources = svnmucc.c
+ install = tools
+-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
++libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
+ 
+ [diff]
+ type = exe
+--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
++++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
+@@ -25,7 +25,12 @@
+                                                                       fs_base
+                                                                       fs_util
+                                                                       fs_fs/));
+-my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
++sub libs_line {
++   return join(' ', $apr_ldflags,
++               (map {$_ = abs_path($_); "-L$_"} @ldpaths),
++               (map {"-lsvn_$_-1"} @_),
++               '-lsvn_swig_perl-1', `$swig -perl -ldflags`);
++}
+ 
+ my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
+ my $cppflags = '@CPPFLAGS@';
+@@ -50,10 +55,6 @@
+                  " -I$svnlib_builddir",
+                  " -I$swig_srcdir -g"),
+     OBJECT => q/$(O_FILES)/,
+-    LIBS => [join(' ', $apr_ldflags,
+-                  (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+-                  @ldmodules, '-lsvn_swig_perl-1',
+-                  `$swig -perl -ldflags`)],
+     test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+ 
+@@ -63,6 +64,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") }
+@@ -77,6 +79,7 @@
+        );
+ 
+ for (@modules) {
++    $config{LIBS} = [libs_line($_, 'subr')];
+     WriteMakefile(%config,
+       MAKEFILE=> "Makefile.$_",
+       NAME    => "SVN::_".perlish($_),
--- subversion-1.6.17dfsg.orig/debian/patches/CVE-2013-1968.patch
+++ subversion-1.6.17dfsg/debian/patches/CVE-2013-1968.patch
@@ -0,0 +1,125 @@
+Description: Fix CVE-2013-1968
+ Subversion FSFS repositories can be corrupted by newline characters in
+ filenames.
+Origin: upstream, http://subversion.apache.org/security/CVE-2013-1968-advisory.txt
+Bug-Debian: http://bugs.debian.org/711033
+Forwarded: not-needed
+Author: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2013-06-05
+
+--- a/subversion/libsvn_fs_fs/tree.c
++++ b/subversion/libsvn_fs_fs/tree.c
+@@ -43,6 +43,7 @@
+ #include "svn_mergeinfo.h"
+ #include "svn_fs.h"
+ #include "svn_props.h"
++#include "svn_ctype.h"
+ 
+ #include "fs.h"
+ #include "err.h"
+@@ -1837,6 +1838,78 @@
+   return svn_fs_fs__dag_dir_entries(table_p, node, pool, pool);
+ }
+ 
++/* Return a copy of PATH, allocated from POOL, for which control
++   characters have been escaped using the form \NNN (where NNN is the
++   octal representation of the byte's ordinal value).  */
++static const char *
++illegal_path_escape(const char *path, apr_pool_t *pool)
++{
++  svn_stringbuf_t *retstr;
++  apr_size_t i, copied = 0;
++  int c;
++
++  /* At least one control character:
++      strlen - 1 (control) + \ + N + N + N + null . */
++  retstr = svn_stringbuf_create_ensure(strlen(path) + 4, pool);
++  for (i = 0; path[i]; i++)
++    {
++      c = (unsigned char)path[i];
++      if (! svn_ctype_iscntrl(c))
++        continue;
++
++      /* If we got here, we're looking at a character that isn't
++         supported by the (or at least, our) URI encoding scheme.  We
++         need to escape this character.  */
++
++      /* First things first, copy all the good stuff that we haven't
++         yet copied into our output buffer. */
++      if (i - copied)
++        svn_stringbuf_appendbytes(retstr, path + copied,
++                                  i - copied);
++
++      /* Make sure buffer is big enough for '\' 'N' 'N' 'N' (and NUL) */
++      svn_stringbuf_ensure(retstr, retstr->len + 5);
++      /*### The backslash separator doesn't work too great with Windows,
++         but it's what we'll use for consistency with invalid utf8
++         formatting (until someone has a better idea) */
++      apr_snprintf(retstr->data + retstr->len, 5, "\\%03o", (unsigned char)c);
++      retstr->len += 4;
++
++      /* Finally, update our copy counter. */
++      copied = i + 1;
++    }
++
++  /* If we didn't encode anything, we don't need to duplicate the string. */
++  if (retstr->len == 0)
++    return path;
++
++  /* Anything left to copy? */
++  if (i - copied)
++    svn_stringbuf_appendbytes(retstr, path + copied, i - copied);
++
++  /* retstr is null-terminated either by apr_snprintf or the svn_stringbuf
++     functions. */
++
++  return retstr->data;
++}
++
++/* Raise an error if PATH contains a newline because FSFS cannot handle
++ * such paths. See issue #4340. */
++static svn_error_t *
++check_newline(const char *path, apr_pool_t *pool)
++{
++  const char *c;
++
++  for (c = path; *c; c++)
++    {
++      if (*c == '\n')
++        return svn_error_createf(SVN_ERR_FS_PATH_SYNTAX, NULL,
++           _("Invalid control character '0x%02x' in path '%s'"),
++           (unsigned char)*c, illegal_path_escape(path, pool));
++    }
++
++  return SVN_NO_ERROR;
++}
+ 
+ /* Create a new directory named PATH in ROOT.  The new directory has
+    no entries, and no properties.  ROOT must be the root of a
+@@ -1851,6 +1924,8 @@
+   dag_node_t *sub_dir;
+   const char *txn_id = root->txn;
+ 
++  SVN_ERR(check_newline(path, pool));
++
+   SVN_ERR(open_path(&parent_path, root, path, open_path_last_optional,
+                     txn_id, pool));
+ 
+@@ -2113,6 +2188,8 @@
+         const char *to_path,
+         apr_pool_t *pool)
+ {
++  SVN_ERR(check_newline(to_path, pool));
++
+   return copy_helper(from_root, from_path, to_root, to_path, TRUE, pool);
+ }
+ 
+@@ -2203,6 +2280,8 @@
+   dag_node_t *child;
+   const char *txn_id = root->txn;
+ 
++  SVN_ERR(check_newline(path, pool));
++
+   SVN_ERR(open_path(&parent_path, root, path, open_path_last_optional,
+                     txn_id, pool));
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/apr-abi
+++ subversion-1.6.17dfsg/debian/patches/apr-abi
@@ -0,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## apr-abi.dpatch by <peter@p12n.org>
+##
+## DP: Use libtool -version-info to express library SONAMEs, and make it
+## DP: sensitive to libapr ABI w/r/t 64-bit file offsets.
+## DP: 
+## DP: Patch has been submitted upstream.
+
+@DPATCH@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -106,6 +106,7 @@
+ LTFLAGS = --tag=CC --silent
+ LTCXXFLAGS = --tag=CXX --silent
+ LT_LDFLAGS = @LT_LDFLAGS@
++LT_SOVERSION = @SVN_LT_SOVERSION@
+ LT_NO_UNDEFINED = @LT_NO_UNDEFINED@
+ LT_CXX_LIBADD = @LT_CXX_LIBADD@
+ 
+@@ -185,8 +186,8 @@
+ COMPILE_JAVAHL_JAVAH = $(JAVAH)
+ 
+ LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+-LINK_LIB = $(LINK) -rpath $(libdir)
++LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) $(LT_SOVERSION)
++LINK_LIB = $(LINK) -rpath $(libdir) $(LT_SOVERSION)
+ 
+ # special link rule for mod_dav_svn
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
+--- a/build/ac-macros/apr.m4
++++ b/build/ac-macros/apr.m4
+@@ -85,11 +85,31 @@
+     AC_MSG_ERROR([apr-config --shlib-path-var failed])
+   fi
+ 
++  dnl Determine whether or not we will be using the 64-bit apr_off_t ABI.
++  dnl This necessarily changes the SONAME of libsvn_*.
++if test `expr $apr_version : 0` -ne 0; then
++  SVN_LT_SOVERSION="-version-info 0"
++else
++  SVN_LT_SOVERSION="-version-info 1"
++fi
++  dnl   oldcppflags=$CPPFLAGS
++  dnl   CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
++  dnl   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++  dnl #include <apr.h>
++  dnl #if APR_HAS_LARGE_FILES
++  dnl # error Large file ABI required
++  dnl #endif
++  dnl     ]])], [apr_lfs_abi=0], [apr_lfs_abi=1])
++  dnl   CPPFLAGS=$oldcppflags
++  dnl
++  dnl SVN_LT_SOVERSION="-version-info $apr_lfs_abi"
++
+   AC_SUBST(SVN_APR_PREFIX)
+   AC_SUBST(SVN_APR_INCLUDES)
+   AC_SUBST(SVN_APR_LIBS)
+   AC_SUBST(SVN_APR_EXPORT_LIBS)
+   AC_SUBST(SVN_APR_SHLIB_PATH_VAR)
++  AC_SUBST(SVN_LT_SOVERSION)
+ ])
+ 
+ dnl SVN_DOWNLOAD_APR()
+--- a/subversion/libsvn_fs/fs-loader.c
++++ b/subversion/libsvn_fs/fs-loader.c
+@@ -92,7 +92,7 @@
+     const char *funcname;
+     apr_status_t status;
+ 
+-    libname = apr_psprintf(pool, "libsvn_fs_%s-%d.so.0",
++    libname = apr_psprintf(pool, "libsvn_fs_%s-%d.so.1",
+                            name, SVN_VER_MAJOR);
+     funcname = apr_psprintf(pool, "svn_fs_%s__init", name);
+ 
+--- a/subversion/libsvn_ra/ra_loader.c
++++ b/subversion/libsvn_ra/ra_loader.c
+@@ -154,7 +154,7 @@
+     const char *compat_funcname;
+     apr_status_t status;
+ 
+-    libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0",
++    libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.1",
+                            ra_name, SVN_VER_MAJOR);
+     funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
+     compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
+--- a/subversion/libsvn_subr/auth.c
++++ b/subversion/libsvn_subr/auth.c
+@@ -393,7 +393,7 @@
+       const char *library_label, *library_name;
+       const char *provider_function_name, *version_function_name;
+       library_name = apr_psprintf(pool,
+-                                  "libsvn_auth_%s-%d.so.0",
++                                  "libsvn_auth_%s-%d.so.1",
+                                   provider_name,
+                                   SVN_VER_MAJOR);
+       library_label = apr_psprintf(pool, "svn_%s", provider_name);
--- subversion-1.6.17dfsg.orig/debian/patches/apache_module_dependency
+++ subversion-1.6.17dfsg/debian/patches/apache_module_dependency
@@ -0,0 +1,108 @@
+apache_module_dependency: Dynamically bind two mod_dav_svn functions in
+mod_authz_svn, so that it works even if mod_authz_svn is loaded first.
+
+This is related to splitting mod_authz_svn out of dav_svn.load into its
+own authz_svn.load.  Since a2enmod does not reorder modules based on
+dependencies, mod_authz_svn is loaded first.
+
+--- a/subversion/include/mod_dav_svn.h
++++ b/subversion/include/mod_dav_svn.h
+@@ -25,6 +25,7 @@
+ 
+ #include <httpd.h>
+ #include <mod_dav.h>
++#include <apr_optional.h>
+ 
+ 
+ #ifdef __cplusplus
+@@ -75,6 +76,15 @@ AP_MODULE_DECLARE(dav_error *) dav_svn_s
+                                                  const char **repos_name,
+                                                  const char **relative_path,
+                                                  const char **repos_path);
++APR_DECLARE_OPTIONAL_FN(dav_error *, dav_svn_split_uri,
++                        (request_rec *r,
++                         const char *uri,
++                         const char *root_path,
++                         const char **cleaned_uri,
++                         int *trailing_slash,
++                         const char **repos_name,
++                         const char **relative_path,
++                         const char **repos_path));
+ 
+ 
+ /* Given an apache request R and a ROOT_PATH to the svn location
+@@ -83,6 +93,10 @@ AP_MODULE_DECLARE(dav_error *) dav_svn_s
+ AP_MODULE_DECLARE(dav_error *) dav_svn_get_repos_path(request_rec *r,
+                                                       const char *root_path,
+                                                       const char **repos_path);
++APR_DECLARE_OPTIONAL_FN(dav_error *, dav_svn_get_repos_path,
++                        (request_rec *r,
++                         const char *root_path,
++                         const char **repos_path));
+ 
+ #ifdef __cplusplus
+ }
+--- a/subversion/mod_authz_svn/mod_authz_svn.c
++++ b/subversion/mod_authz_svn/mod_authz_svn.c
+@@ -17,7 +17,7 @@
+  * ====================================================================
+  */
+ 
+-
++#define DAV_SVN_LOAD_OPTIONAL 1
+ 
+ #include <httpd.h>
+ #include <http_config.h>
+@@ -50,6 +50,13 @@ typedef struct {
+   const char *force_username_case;
+ } authz_svn_config_rec;
+ 
++#if DAV_SVN_LOAD_OPTIONAL
++static APR_OPTIONAL_FN_TYPE(dav_svn_get_repos_path) *get_repos_path;
++static APR_OPTIONAL_FN_TYPE(dav_svn_split_uri) *split_uri;
++#define dav_svn_get_repos_path get_repos_path
++#define dav_svn_split_uri split_uri
++#endif
++
+ /*
+  * Configuration
+  */
+@@ -665,6 +672,16 @@ auth_checker(request_rec *r)
+   return OK;
+ }
+ 
++#if DAV_SVN_LOAD_OPTIONAL
++#undef dav_svn_get_repos_path
++#undef dav_svn_split_uri
++static void import_dav_svn(void)
++{
++  get_repos_path = APR_RETRIEVE_OPTIONAL_FN(dav_svn_get_repos_path);
++  split_uri = APR_RETRIEVE_OPTIONAL_FN(dav_svn_split_uri);
++}
++#endif
++
+ /*
+  * Module flesh
+  */
+@@ -685,6 +702,9 @@ register_hooks(apr_pool_t *p)
+                        AUTHZ_SVN__SUBREQ_BYPASS_PROV_NAME,
+                        AUTHZ_SVN__SUBREQ_BYPASS_PROV_VER,
+                        (void*)subreq_bypass);
++#if DAV_SVN_LOAD_OPTIONAL
++  ap_hook_optional_fn_retrieve(import_dav_svn,NULL,NULL,APR_HOOK_MIDDLE);
++#endif
+ }
+ 
+ module AP_MODULE_DECLARE_DATA authz_svn_module =
+--- a/subversion/mod_dav_svn/mod_dav_svn.c
++++ b/subversion/mod_dav_svn/mod_dav_svn.c
+@@ -749,6 +749,9 @@ static dav_provider provider =
+ static void
+ register_hooks(apr_pool_t *pconf)
+ {
++  APR_REGISTER_OPTIONAL_FN(dav_svn_get_repos_path);
++  APR_REGISTER_OPTIONAL_FN(dav_svn_split_uri);
++
+   ap_hook_pre_config(init_dso, NULL, NULL, APR_HOOK_REALLY_FIRST);
+   ap_hook_post_config(init, NULL, NULL, APR_HOOK_MIDDLE);
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/cve-2013-1846
+++ subversion-1.6.17dfsg/debian/patches/cve-2013-1846
@@ -0,0 +1,70 @@
+Author: Ben Reser <breser@tigris.org>
+Subject: Improve the logic in mod_dav_svn's implementation of LOCK
+
+Subversion's mod_dav_svn Apache HTTPD server module will crash in some
+circumstances when a LOCK request is made against activity URL or
+non-existent URL. The vulnerability can be triggered by doing a LOCK
+request against an activity URL.
+The vulnerability can also be triggered by doing a LOCK request against
+a URL for a path that does not exist in the repository or an invalid
+activity URL where authentication is not required for the LOCK
+method.
+
+Origin: upstream, commit:r1455352
+Bug-CVE: http://subversion.apache.org/security/CVE-2013-1846-advisory.txt
+Bug-CVE: http://subversion.apache.org/security/CVE-2013-1847-advisory.txt
+Bug-Debian: http://bugs.debian.org/704940
+Last-Update: 2013-04-16
+Applied-Upstream: commit:r1455352
+
+Index: subversion/mod_dav_svn/lock.c
+===================================================================
+--- a/subversion/mod_dav_svn/lock.c	(revision 1459696)
++++ b/subversion/mod_dav_svn/lock.c	(working copy)
+@@ -634,7 +634,20 @@ append_locks(dav_lockdb *lockdb,
+   svn_lock_t *slock;
+   svn_error_t *serr;
+   dav_error *derr;
++  dav_svn_repos *repos = resource->info->repos;
++      
++  /* We don't allow anonymous locks */
++  if (! repos->username)
++    return dav_new_error(resource->pool, HTTP_UNAUTHORIZED,
++                         DAV_ERR_LOCK_SAVE_LOCK,
++                         "Anonymous lock creation is not allowed.");
+ 
++  /* Not a path in the repository so can't lock it. */
++  if (! resource->info->repos_path)
++    return dav_new_error(resource->pool, HTTP_BAD_REQUEST,
++                         DAV_ERR_LOCK_SAVE_LOCK,
++                         "Attempted to lock path not in repository.");
++
+   /* If the resource's fs path is unreadable, we don't allow a lock to
+      be created on it. */
+   if (! dav_svn__allow_read_resource(resource, SVN_INVALID_REVNUM,
+@@ -657,7 +670,6 @@ append_locks(dav_lockdb *lockdb,
+       svn_fs_txn_t *txn;
+       svn_fs_root_t *txn_root;
+       const char *conflict_msg;
+-      dav_svn_repos *repos = resource->info->repos;
+       apr_hash_t *revprop_table = apr_hash_make(resource->pool);
+       apr_hash_set(revprop_table, SVN_PROP_REVISION_AUTHOR,
+                    APR_HASH_KEY_STRING, svn_string_create(repos->username,
+@@ -734,7 +746,7 @@ append_locks(dav_lockdb *lockdb,
+ 
+   /* Convert the dav_lock into an svn_lock_t. */
+   derr = dav_lock_to_svn_lock(&slock, lock, resource->info->repos_path,
+-                              info, resource->info->repos->is_svn_client,
++                              info, repos->is_svn_client,
+                               resource->pool);
+   if (derr)
+     return derr;
+@@ -741,7 +753,7 @@ append_locks(dav_lockdb *lockdb,
+ 
+   /* Now use the svn_lock_t to actually perform the lock. */
+   serr = svn_repos_fs_lock(&slock,
+-                           resource->info->repos->repos,
++                           repos->repos,
+                            slock->path,
+                            slock->token,
+                            slock->comment,
--- subversion-1.6.17dfsg.orig/debian/patches/change-range
+++ subversion-1.6.17dfsg/debian/patches/change-range
@@ -0,0 +1,88 @@
+Support -cA-B syntax on command line, from upstream trunk r1004727,1004746.
+This is pure convenience.  -c12,15-20,25 is equivalent to -c12 -r14:20 -c25.
+
+
+--- a/subversion/svn/main.c
++++ b/subversion/svn/main.c
+@@ -1212,7 +1212,7 @@
+       case 'c':
+         {
+           char *end;
+-          svn_revnum_t changeno;
++          svn_revnum_t changeno, changeno_end;
+           svn_opt_revision_range_t *range;
+           apr_array_header_t *change_revs =
+             svn_cstring_split(opt_arg, ", \n\r\t\v", TRUE, pool);
+@@ -1236,7 +1236,22 @@
+                  ### "{DATE}" and the special words. */
+               while (*change_str == 'r')
+                 change_str++;
+-              changeno = strtol(change_str, &end, 10);
++              changeno = changeno_end = strtol(change_str, &end, 10);
++              if (end != change_str && *end == '-')
++                {
++                  if (changeno < 0)
++                    {
++                      err = svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
++                                              _("Negative number in range (%s)"
++                                                " not supported with -c"),
++                                              change_str);
++                      return svn_cmdline_handle_exit_error(err, pool, "svn: ");
++                    }
++                  change_str = end+1;
++                  while (*change_str == 'r')
++                    change_str++;
++                  changeno_end = strtol(change_str, &end, 10);
++                }
+               if (end == change_str || *end != '\0')
+                 {
+                   err = svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+@@ -1254,19 +1269,28 @@
+ 
+               /* Figure out the range:
+                     -c N  -> -r N-1:N
+-                    -c -N -> -r N:N-1 */
+-              range = apr_palloc(pool, sizeof(*range));
++                    -c -N -> -r N:N-1
++                    -c M-N -> -r M-1:N for M < N
++                    -c M-N -> -r M:N-1 for M > N
++                    -c -M-N -> error (too confusing/no valid use case)
++              */
+               if (changeno > 0)
+                 {
+-                  range->start.value.number = changeno - 1;
+-                  range->end.value.number = changeno;
++                  if (changeno <= changeno_end)
++                    changeno--;
++                  else
++                    changeno_end--;
+                 }
+               else
+                 {
+                   changeno = -changeno;
+-                  range->start.value.number = changeno;
+-                  range->end.value.number = changeno - 1;
++                  changeno_end = changeno - 1;
+                 }
++
++              range = apr_palloc(pool, sizeof(*range));
++              range->start.value.number = changeno;
++              range->end.value.number = changeno_end;
++
+               opt_state.used_change_arg = TRUE;
+               range->start.kind = svn_opt_revision_number;
+               range->end.kind = svn_opt_revision_number;
+--- a/subversion/svn/log-cmd.c
++++ b/subversion/svn/log-cmd.c
+@@ -481,9 +481,9 @@
+           range = APR_ARRAY_IDX(opt_state->revision_ranges, i,
+                                 svn_opt_revision_range_t *);
+           if (range->start.value.number < range->end.value.number)
+-            range->start = range->end;
++            range->start.value.number++;
+           else
+-            range->end = range->start;
++            range->end.value.number++;
+         }
+     }
+ 
--- subversion-1.6.17dfsg.orig/debian/patches/cve-2013-1849
+++ subversion-1.6.17dfsg/debian/patches/cve-2013-1849
@@ -0,0 +1,39 @@
+Author: Philip Martin <philip.martin@wandisco.com>
+Subject: Reject operations on prop if the resource is an activity
+
+Subversion's mod_dav_svn Apache HTTPD server module will crash when
+a PROPFIND request is made against activity URLs. The patch consists
+in rejecting operations on getcontentlength and getcontenttype
+properties if the resource is an activity.
+
+Origin: upstream, commit:r1453780
+Bug-CVE: http://subversion.apache.org/security/CVE-2013-1849-advisory.txt
+Bug-Debian: http://bugs.debian.org/704940
+Last-Update: 2013-04-16
+Applied-Upstream: commit:r1453780
+
+Index: subversion/mod_dav_svn/liveprops.c
+===================================================================
+--- a/subversion/mod_dav_svn/liveprops.c	(revision 1458455)
++++ b/subversion/mod_dav_svn/liveprops.c	(working copy)
+@@ -410,7 +410,8 @@ insert_prop_internal(const dav_resource *resource,
+         svn_filesize_t len = 0;
+ 
+         /* our property, but not defined on collection resources */
+-        if (resource->collection || resource->baselined)
++        if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY
++            || resource->collection || resource->baselined)
+           return DAV_PROP_INSERT_NOTSUPP;
+ 
+         serr = svn_fs_file_length(&len, resource->info->root.root,
+@@ -434,7 +435,9 @@ insert_prop_internal(const dav_resource *resource,
+         svn_string_t *pval;
+         const char *mime_type = NULL;
+ 
+-        if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
++        if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY
++            || (resource->baselined
++                && resource->type == DAV_RESOURCE_TYPE_VERSION))
+           return DAV_PROP_INSERT_NOTSUPP;
+ 
+         if (resource->type == DAV_RESOURCE_TYPE_PRIVATE
--- subversion-1.6.17dfsg.orig/debian/man/svn_load_dirs.1
+++ subversion-1.6.17dfsg/debian/man/svn_load_dirs.1
@@ -0,0 +1,127 @@
+.TH SVN_LOAD_DIRS 1
+
+.SH NAME
+svn_load_dirs - Load directories into a Subversion repository
+
+.SH SYNOPSIS
+.B svn_load_dirs
+[\fIoptions\fR] \fIsvn_url\fR \fIsvn_import_dir\fR [\fIdirectory\fR ...]
+
+.SH DESCRIPTION
+This tool can be used for importing one or more directories into a
+Subversion repository. The difference from "svn import" is that
+svn_load_dirs can update an existing directory tree, and tag it
+properly. Only changes from the previous version will be recorded in
+the revision, so that you can easily apply them on another branch.
+For example, this is very useful for managing the upstream source when
+maintaining Debian packages in Subversion.
+
+.SH OPTIONS
+.TP
+\fIsvn_url\fR
+The base Subversion URL.
+.TP
+\fIsvn_import_dir\fR
+The path relative to \fIsvn_url\fR where the directories are to be imported.
+.TP
+\fIdirectory ...\fR
+The directories to import. If they are not specified on the command line,
+they are read from standard input.
+.TP
+\fB\-no_user_input\fR
+Don't ask any questions. Assume that the answer is yes.
+.TP
+\fB\-p\fR \fIfilename\fR
+Apply the properties specified in the configuration file
+\fIfilename\fR to matching files. See below for a description of
+the configuration file format.
+.TP
+\fB\-svn_username\fR \fIusername\fR
+Username to use when committing to the repository.
+.TP
+\fB\-svn_password\fR \fIpassword\fR
+Password to use when committing to the repository.
+.TP
+\fB\-t\fR \fItag_dir\fR
+Create a tag copy in \fItag_dir\fR, relative to
+\fIsvn_url\fR. \fItag_dir\fR may contain a regular expression
+enclosed within '@' characters. It will be replaced by the matching part
+from the imported directory names.
+.TP
+\fB\-v\fR
+Be more verbose. Use multiple times for increased effect.
+.TP
+\fB\-wc\fR \fIpath\fR
+Use the already checked out working copy at \fIpath\fR instead of
+checking out a new working copy.
+
+.SH PROPERTY CONFIGURATION FILE FORMAT
+The property configuration file, which is specified by the \-p option,
+contains rules for applying properties to the imported files.
+It consists of lines of the following format:
+.PP
+.I regular_expression	control	property_name	property_value
+.PP
+The meaning of the fields are:
+.TP
+.I regular_expression
+A Perl-style regular expression matching the files to apply this rule to.
+.TP
+.I control
+Either "break" or "cont". If set to "break", processing of the current
+file will stop if this rule matches. If set to "cont", processing will
+continue. The latter can be used to set multiple properties for one
+file.
+.TP
+.I property_name
+(Optional) The name of the property to set.
+.TP
+.I property_value
+(Optional) Set the property to this value.
+.PP
+The last two fields may be omitted, in which case the rule will not
+set any properties. This is useful for excluding certain files from
+subsequent rules.
+.PP
+You need to quote the \fIregular_expression\fR, \fIproperty_name\fR
+and \fIproperty_value\fR fields with double quotes ('"') if you have
+whitespace in them. Single and double quotes can be escaped with
+backslash ('\\').
+
+.SH EXAMPLES
+For example, to import the contents of the foo\-1.3 directory into the
+upstream/current directory of the foo repository:
+.PP
+.HP
+svn_load_dirs svn+ssh://svn.example.org/svn/foo upstream/current foo\-1.3
+.PP
+A tag can also be added automatically using the \-t option:
+.PP
+.HP
+svn_load_dirs svn+ssh://svn.example.org/svn/foo \-t \'upstream/@\\d+\\.\\w+@\'
+upstream/current foo\-1.3
+.PP
+Here's an example of a property configuration file:
+.PP
+\\.doc$			break	svn:mime\-type	application/msword
+.br
+\\.ds(p|w)$		break	svn:eol\-style	CRLF
+.br
+\\.dos2unix\-eol\\.sh$	break
+.br
+\&.*\ \ \ 			break	svn:eol\-style	native
+.PP
+This example specifies that .doc files are to be treated as binary
+files, that .dsp and .dsw files have their line ending characters
+kept, and that all other files except dos2unix\-eol.sh have their line
+endings converted to the native style.
+
+.SH SEE ALSO
+/usr/share/doc/subversion\-tools/svn_load_dirs.README.gz
+.PP
+\fBsvn\fR(1)
+
+.SH AUTHOR
+This manual page was written by Per Olofsson <pelle@dsv.su.se> for the
+Debian distribution (but may be used by others). Some parts were taken
+from the README.
--- subversion-1.6.17dfsg.orig/debian/man/svnwrap.1
+++ subversion-1.6.17dfsg/debian/man/svnwrap.1
@@ -0,0 +1,98 @@
+.\" svnwrap.1
+.\" Copyright 2006 by Peter Samuelson
+.\" Permission is granted to everyone to use and distribute this work,
+.\" without limitation, modified or unmodified, in any way, for any purpose.
+.TH SVNWRAP 1 "2006-04-21"
+.\"
+.SH NAME
+svnwrap \- Umask wrapper for subversion client commands
+.\"
+.SH SYNOPSIS
+.B svnwrap
+.RB { program }
+.RI [ args... ]
+.\"
+.SH DESCRIPTION
+.B svnwrap
+is a simple shell script to work around permission problems when
+sharing Subversion repositories between multiple local users.
+.B svnwrap
+can be used either by specifying a particular
+.B subversion
+client command on the command line, or by invoking it by the same name
+as the desired client command, via a symlink.
+.PP
+.B svnwrap
+sets the
+.I umask
+to 002, then launches the appropriate
+.B subversion
+client command.  For complicated reasons, this is needed when using the
+clients with
+.IR BDB -format
+repositories, but not for
+.IR FSFS -format
+ones.
+.\"
+.SH EXAMPLES
+To create a new BDB-format shared repository (note that FSFS-format
+shared repositories should also be created this way):
+.PP
+svnwrap\ svnadmin\ create\ \-\-fs\-type=bdb
+.I /path/to/repo
+.br
+chgrp\ \-R
+.I shared_group\ /path/to/repo
+.PP
+The following line in
+.I /etc/inetd.conf
+can be used to serve
+.I svn://
+URLs:
+.PP
+svn\ stream\ tcp\ nowait
+.I my_svn_user
+/usr/bin/svnwrap\ svnserve\ svnserve\ \-i\ \-r
+.I /srv/svn
+.PP
+The following commands enable use of
+.B svnwrap
+for local
+.I file:///
+and remote
+.I svn+ssh://
+URLs:
+.PP
+ln\ \-s\ /usr/bin/svnwrap\ /usr/local/bin/svn
+.br
+ln\ \-s\ /usr/bin/svnwrap\ /usr/local/bin/svnserve
+.PP
+.B svn
+is used for local
+.I file:///
+URLs, and
+.B svnserve
+is invoked by remote users of
+.I svn+ssh://
+URLs.
+.SH BUGS
+If you symlink the
+.B svn
+binary to
+.BR svnwrap ,
+as shown in one of the examples,
+.I all local users' working copies will also use the new
+.IR umask .
+Be sure to warn your users about this, as security-related surprises
+are rarely pleasant.
+.\"
+.SH "SEE ALSO"
+.BR svnserve (8),
+.BR svn (1),
+.BR svnlook (1).
+.\"
+.SH AUTHOR
+.B svnwrap
+and this manual were written by Peter Samuelson
+.\" <peter@p12n.org>
+for the Debian Project (but may be used by others).
--- subversion-1.6.17dfsg.orig/debian/man/svn-backup-dumps.1
+++ subversion-1.6.17dfsg/debian/man/svn-backup-dumps.1
@@ -0,0 +1,168 @@
+.\" Process this file with
+.\" Copyright 2006 by Troy Heber - taken directly from svn-backup-dumps
+.\" Copyright (c) 2006 CollabNet.
+.\" Permission is granted to everyone to use and distribute this work,
+.\" without limitation, modified or unmodified, in any way, for any purpose.
+.\" groff -man -Tascii svn-backup-dumps.1
+.\"
+.TH svn\-backup\-dumps 1  "2006-11-09"
+.SH NAME
+svn\-backup\-dumps \- Create dumpfiles to backup a subversion repository.
+.SH SYNOPSIS
+.B svn\-backup\-dumps 
+.I <repos>
+.I <dumpdir>
+.SH DESCRIPTION
+.B svn\-backup\-dumps
+creates dumpfiles from a subversion repository.  It is intended for
+use in cron jobs and post-commit hooks.
+.PP
+The basic modes of operation are:
+.IP \(bu
+Create a full dump (revisions 0 to HEAD)
+.IP \(bu
+Create incremental dump containing at most N revisions.
+.IP \(bu
+Create incremental single-revision dumps (for use in post-commit).
+.PP
+Dumpfiles are named in the format
+.IR basename . rev .svndmp
+or
+.IR basename . rev . rev .svndmp,
+where
+.I basename
+is the repository directory name, and the
+.I rev
+arguments are the first and last revision numbers represented in the
+dumpfile, zero-padded to 6 digits.
+.PP
+Optionally,
+.B svn\-backup\-dumps
+can compress dumpfiles with
+.BR gzip " or " bzip2 ,
+and can transfer them to another host using FTP or SMB (using
+.BR smbclient ).
+.\"
+.SH OPTIONS
+.TP
+.B \-\-version
+Show program's version number and exit.
+.TP
+.BR \-h ", " \-\-help
+Show this help message and exit.
+.TP
+.B \-b
+Compress the dump using
+.BR bzip2 .
+.TP
+.B \-\-deltas
+This is passed through to
+.BR "svnadmin dump" .
+.TP
+.BI \-c " count"
+Maximum number of revisions per dumpfile.
+.TP
+.B \-o
+Overwrite files.
+.TP
+.B \-O
+Overwrite all files.
+.TP
+.B \-q
+Quiet.
+.TP
+.BI \-r " rev"
+Specify a single-revision dumpfile.
+.PP
+.RI "\fB\-t\fR ftp:" host : user : password : path
+.PD 0
+.TP
+.RI "\fB\-t\fR smb:" share : user : password : path
+.PD
+Transfer dumps to another machine using the FTP or SMB protocols.
+.I path
+is where to store the dumpfiles on the remote server; any occurrence of
+.I %r
+in the path is replaced by the repository name.  Support for "smb:"
+requires the
+.B smbclient
+program.
+.TP
+.B \-z
+Compress the dump using
+.BR gzip .
+.\"
+.SH EXAMPLES
+To create a full dump of all revisions of a repository
+.IR /srv/svn/foo " in the directory " /var/backup/svn :
+.PP
+svn\-backup\-dumps /srv/svn/foo /var/backup/svn
+.PP
+The dumpfile will be named
+.I src.000000-NNNNNN.svndmp.gz
+where
+.I NNNNNN
+is the head revision number.
+.\"
+.PP
+To create incremental dumps containing at most 1000 revisions:
+.PP
+svn\-backup\-dumps \-\-deltas \-z \-c 1000 /srv/svn/foo /var/backup/svn
+.PP
+If the youngest revision is 2923, it creates the following files:
+.IP
+.PD 0
+foo.000000-000999.svndmp.gz
+.IP
+foo.001000-001999.svndmp.gz
+.IP
+foo.002000-002923.svndmp.gz
+.PD
+.PP
+If run again, later, when the youngest revision is 3045, it creates
+these two files:
+.IP
+.PD 0
+foo.002000-002999.svndmp.gz
+.IP
+foo.003000-003045.svndmp.gz
+.PD
+.PP
+Note that it does not remove the redundant file
+foo.002000-002923.svndmp.gz.
+.\"
+.PP
+To create incremental single-revision dumps from a post-commit hook:
+.PP
+svn\-backup\-dumps \-r $rev $repos /var/backups/svn
+.PP
+where
+.IR $rev " and " $repos
+are variables previously set in the post-commit script from its command
+line.  The dumpfile name will be in the form
+.IR foo.000352.svndmp .
+.\"
+.PP
+To send the dumpfiles to the SMB share
+.I \\\\\\\\ERNEST\\\\BACKUPS
+in a directory
+.I \\\\svn\\\\foo
+with user
+.I svnuser
+and password
+.IR w0rth1ng :
+.IP
+svn\-backup\-dumps \-t "smb://ERNEST/BACKUPS:svnuser:w0rth1ng:svn/%r
+/srv/svn/foo /tmp/tmpbackup
+.PP
+Note that the
+.I %r
+in the path is replaced by the repository name
+.BR foo .
+Note also that a local backup directory is required, at present, even
+when using the
+.B \-t
+option.
+.\"
+.SH AUTHOR
+Voluntary contributions made by many individuals.  Copyright \(co 2006 CollabNet.
--- subversion-1.6.17dfsg.orig/debian/man/svn-hot-backup.1
+++ subversion-1.6.17dfsg/debian/man/svn-hot-backup.1
@@ -0,0 +1,40 @@
+.\" Process this file with
+.\" Copyright 2006 by Troy Heber - taken directly from svn-hot-backup
+.\" Copyright (c) 2006 CollabNet.
+.\" Permission is granted to everyone to use and distribute this work,
+.\" without limitation, modified or unmodified, in any way, for any purpose.
+.\" groff -man -Tascii svn-hot-backup.1
+.\"
+.TH svn\-hot\-backup 1  "2006-11-09"
+.SH NAME
+svn\-hot\-backup \- perform a "hot" backup of a Berkeley DB repository.
+.SH SYNOPSIS
+.B svn\-hot\-backup 
+.RB [ \-\-archive-type=\fItype\fR ]
+.I repos_path
+.I backup_dir
+.PP
+.\"
+.SH DESCRIPTION
+.B svn\-hot\-backup
+performs a "hot" backup of a Subversion BDB repository, and cleans old
+logfiles after the backup completes.
+.\"
+.SH OPTIONS
+.TP
+.PD 0
+.B \-\-archive\-type=gz
+.TP
+.BI \-\-archive\-type=bz2
+.TP
+.BI \-\-archive\-type=zip
+.PD
+Create a compressed archive of the backup, in
+.IR .tar.gz ", " .tar.bz2 ", or " .zip
+format respectively.
+.TP
+.BR \-h ", " \-\-help
+Print this help message and exit.
+.\"
+.SH AUTHOR
+Voluntary contributions made by many individuals.  Copyright \(co 2006 CollabNet.
--- subversion-1.6.17dfsg.orig/debian/man/svn-fast-backup.1
+++ subversion-1.6.17dfsg/debian/man/svn-fast-backup.1
@@ -0,0 +1,78 @@
+.\" Process this file with
+.\" Copyright 2006 by Troy Heber - taken directly from svn-fast-backup
+.\" Copyright (c) 2006 CollabNet.
+.\" Permission is granted to everyone to use and distribute this work,
+.\" without limitation, modified or unmodified, in any way, for any purpose.
+.\" groff -man -Tascii svn-fast-backup.1
+.\"
+.TH svn\-fast\-backup 1  "2006-11-09"
+.SH NAME
+svn\-fast\-backup \- very fast backup for Subversion fsfs repositories.
+.SH SYNOPSIS
+.B svn\-fast\-backup 
+.RB [ \-q ]
+.RB [ \-k {\fIN\fR|\fIall\fR}]
+.RB [ \-f ]
+.RB [ \-t ]
+.RB [ \-s ]
+.I repos_path
+.I backup_dir
+.\"
+.SH DESCRIPTION
+.B svn\-fast\-backup
+uses
+.B rsync
+snapshots for very fast backup of a Subversion
+.B fsfs
+repository at
+.I repos_path
+to
+.IR backup_dir / repos-rev ,
+the latest revision number in the repository.  Multiple
+.B fsfs
+backups share data via hardlinks, so old backups are almost free, since
+a newer revision of a repository is almost a complete superset of an
+older revision.
+.PP
+This is good for replacing incremental log-dump+restore-style backups
+because it is just as space-conserving and even faster; there is no
+inter-backup state (old backups are essentially caches); each backup
+directory is self-contained.  It has the same command-line interface as
+.BR svn\-hot\-backup (1)
+(if you use 
+.BR \-\-force ),
+but only works for
+.B fsfs
+repositories.
+.PP
+.B svn\-fast\-backup
+keeps 64 backups by default and deletes backups older than these; this
+can be adjusted with the
+.B \-k
+option.
+.\"
+.SH OPTIONS
+.TP
+.BR \-h ", " \-\-help
+Shows some brief help text.
+.TP
+.BR \-q ", " \-\-quiet
+Quieter-than-usual operation.
+.TP
+.BR \-k ", " \-\-keep=\fIN\fR
+Keep a specified number of backups; the default is to keep 64.
+.TP
+.BR \-k ", " \-\-keep=all
+Do not delete any old backups at all.
+.TP
+.BR \-f ", " \-\-force
+Make a new backup even if one with the current revision exists.
+.TP
+.BR \-t ", " \-\-trace
+Show actions.
+.TP
+.BR \-s ", " \-\-simulate
+Don't perform actions.
+.\"
+.SH AUTHOR
+Voluntary contributions made by many individuals.  Copyright \(co 2006 CollabNet.
--- subversion-1.6.17dfsg.orig/debian/man/svn-bisect.1
+++ subversion-1.6.17dfsg/debian/man/svn-bisect.1
@@ -0,0 +1,121 @@
+.\" svn-bisect.1
+.\" Copyright 2009 by Peter Samuelson
+.\" Permission is granted to everyone to use and distribute this work,
+.\" without limitation, modified or unmodified, in any way, for any purpose.
+.TH SVN-BISECT 1 "2009-10-22"
+.\"
+.SH NAME
+svn\-bisect \- Bisect Subversion revisions to find a regression
+.\"
+.SH SYNOPSIS
+.B svn\-bisect start
+.RI [ good_rev " [" bad_rev ]]
+.PP
+.BR svn\-bisect " {" good | bad "} "
+.RI [ rev ]
+.PP
+.B svn\-bisect run
+.I command
+.PP
+.B svn\-bisect reset
+.PP
+.B svn\-bisect status
+.\"
+.SH DESCRIPTION
+.B svn\-bisect
+helps to automate finding a bug or behavior change in a
+.B Subversion
+working copy.  Given an initial \(lqgood\(rq revision, with the desired
+or original behavior, and a newer \(lqbad\(rq revision, with the
+undesired or modified behavior,
+.B svn\-bisect
+will do a binary search through the revision range to find which
+revision caused the change.
+.PP
+.B svn\-bisect
+must be initialized in a working copy, with
+.BR "svn\-bisect start" .
+It also needs to be given at least one
+.IR good
+revision (the baseline) and one
+.I bad
+revision (known modified behavior) revision.
+.PP
+Sub-commands:
+.TP
+.B start
+Initializes or reinitializes
+.BR svn\-bisect ;
+optionally takes
+.IR good " and " bad
+revision parameters.
+.TP
+.BI good " rev"
+.TP
+.BI bad " rev"
+Tells
+.B svn\-bisect
+that a revision is
+.IR good " or " bad ,
+defining or narrowing the search space.  If not specified,
+.I revision
+defaults to the current revision in the working copy.
+.B svn\-bisect
+will then update to a revision halfway between the new
+.IR good " and " bad
+boundaries.  If this update crosses a point where a branch was created,
+it switches in or out of the branch.
+.TP
+.B reset
+Resets the working copy to the revision and branch where
+.B svn\-bisect start
+was run.  In the simple case this is equivalent to
+.BR "rm -r .svn-bisect; svn update" ,
+but not if it has crossed branches, and not if you did not start at the
+.B HEAD
+revision.  In any case,
+.B svn\-bisect
+never keeps track of mixed-revision working copies, so do not use
+.B svn\-bisect
+in a working copy that will need to be restored to mixed revisions.
+.TP
+.B status
+Prints a brief status message.
+.TP
+.BI run " command"
+Runs the bisection in a loop.  You must have already defined initial
+.IR good " and " bad
+boundary conditions.  Each iteration through the loop runs
+.I command
+as a shell command (a single argument, quoted if necessary) on the
+chosen revision, then marks the revision as
+.IR good " or " bad ,
+based on the exit status of
+.IR command .
+.\"
+.SH EXAMPLES
+Assume you are trying to find which revision between 1250 and 1400
+caused the
+.B make check
+command to fail.
+.PP
+    svn\-bisect start 1250 1400
+    svn\-bisect run \(aqmake check\(aq
+    svn\-bisect reset
+.\"
+.SH ENVIRONMENT
+.IP SVN
+The Subversion command-line program to call (default
+.BR svn ).
+.SH FILES
+.IP \.svn\-bisect
+The directory containing state information, removed after a successful
+bisection.
+.\"
+.SH "SEE ALSO"
+.BR git\-bisect (1).
+.\"
+.SH AUTHOR
+.\" <rmh@aybabtu.com>, <peter@p12n.org>
+Written by Robert Millan and Peter Samuelson, for the Debian Project
+(but may be used by others).
