Bug#666794: subversion: diff for NMU version 1.6.17dfsg-4.1

[Julien Cristau]

Hi,

as the sid version of subversion doesn't look like it wants to migrate
soon, I'm going to upload the attached patch to tpu.

Cheers,
Julien

diff -u subversion-1.6.17dfsg/debian/control subversion-1.6.17dfsg/debian/control
--- subversion-1.6.17dfsg/debian/control
+++ subversion-1.6.17dfsg/debian/control
@@ -6,7 +6,7 @@
            Guilherme de S. Pastore <gpast...@debian.org>
 Build-Depends: debhelper, libneon27-gnutls-dev, zlib1g-dev,
                libapr1-dev, libaprutil1-dev, libdb5.1-dev,
-               libsasl2-dev, apache2-threaded-dev,
+               libsasl2-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,
@@ -69,17 +69,6 @@
  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
diff -u subversion-1.6.17dfsg/debian/changelog subversion-1.6.17dfsg/debian/changelog
--- subversion-1.6.17dfsg/debian/changelog
+++ subversion-1.6.17dfsg/debian/changelog
@@ -1,3 +1,10 @@
+subversion (1.6.17dfsg-4.1) jessie; urgency=low
+
+  * Non-maintainer upload.
+  * Stop building libapache2-svn (closes: #712004, #666794).
+
+ -- Julien Cristau <jcris...@debian.org>  Tue, 16 Jul 2013 19:51:34 +0200
+
 subversion (1.6.17dfsg-4+deb7u3) wheezy-security; urgency=high
 
   * Non-maintainer upload by the Security Team.
diff -u subversion-1.6.17dfsg/debian/rules subversion-1.6.17dfsg/debian/rules
--- subversion-1.6.17dfsg/debian/rules
+++ subversion-1.6.17dfsg/debian/rules
@@ -29,7 +29,7 @@
 endif
 
 # We may need to disable libapache2-svn and/or libsvn-ruby*.
-ENABLE_APACHE        := yes
+ENABLE_APACHE        := no
 ENABLE_RUBY          := yes
 
 DEB_BUILDDIR     := BUILD

signature.asc
Description: Digital signature