tags 712004 + patch pending tags 725028 + patch pending thanks Dear maintainer,
I've prepared an NMU for subversion (versioned as 1.7.9-1+nmu5) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- James GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>
diffstat for subversion_1.7.9-1+nmu4 subversion_1.7.9-1+nmu5
debian/libapache2-mod-svn.README.Debian | 4 ++++
debian/libapache2-mod-svn.dirs | 1 +
debian/libapache2-mod-svn.examples | 1 +
debian/libapache2-mod-svn.install | 4 ++++
debian/libapache2-mod-svn.lintian-overrides | 2 ++
debian/libapache2-mod-svn.postinst | 16 ++++++++++++++++
debian/libapache2-mod-svn.preinst | 15 +++++++++++++++
debian/libapache2-svn.README.Debian | 4 ----
debian/libapache2-svn.dirs | 1 -
debian/libapache2-svn.examples | 1 -
debian/libapache2-svn.install | 4 ----
debian/libapache2-svn.lintian-overrides | 2 --
debian/libapache2-svn.postinst | 18 ------------------
debian/libapache2-svn.preinst | 15 ---------------
debian/libapache2-svn.prerm | 9 ---------
subversion-1.7.9/debian/changelog | 13 +++++++++++++
subversion-1.7.9/debian/control | 23 ++++++++++++++++++++++-
subversion-1.7.9/debian/rules | 9 +++++----
18 files changed, 83 insertions(+), 59 deletions(-)
diff -u subversion-1.7.9/debian/changelog subversion-1.7.9/debian/changelog
--- subversion-1.7.9/debian/changelog
+++ subversion-1.7.9/debian/changelog
@@ -1,3 +1,16 @@
+subversion (1.7.9-1+nmu5) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Re-enable libapache2-svn build (Closes: #725028)
+ * Adjust packaging for Apache 2.4 compatibility (Closes: #712004)
+ - Rename libapache2-svn to libapache2-mod-svn and add a transitional
+ package
+ - Add apache2-dev & dh-apache2 to Build-Depends
+ - Add apache2-api-20120211 as a Depends for libapache2-mod-svn
+ - Update maintainer scripts to use apache2-maintscript-helper
+
+ -- James McCoy <james...@debian.org> Mon, 30 Sep 2013 19:02:34 -0400
+
subversion (1.7.9-1+nmu4) unstable; urgency=low
* Non-maintainer upload.
diff -u subversion-1.7.9/debian/control subversion-1.7.9/debian/control
--- subversion-1.7.9/debian/control
+++ subversion-1.7.9/debian/control
@@ -6,7 +6,7 @@
Guilherme de S. Pastore <gpast...@debian.org>
Build-Depends: debhelper, libneon27-gnutls-dev, libserf-dev (>= 1), zlib1g-dev,
libapr1-dev, libaprutil1-dev, libdb5.1-dev,
- libsasl2-dev,
+ libsasl2-dev, apache2-dev, dh-apache2,
libsqlite3-dev (>= 3.4), libgnome-keyring-dev, libdbus-1-dev, kdelibs5-dev,
quilt, doxygen, autotools-dev, autoconf, libtool, swig,
python-all-dev, perl, libperl-dev, ruby1.8, ruby1.8-dev,
@@ -67,6 +67,27 @@
This package contains development (API) documentation for libsvn1, the
Apache Subversion libraries. See the 'libsvn1' package for more information.
+Package: libapache2-mod-svn
+Section: httpd
+Architecture: any
+Depends: apache2-api-20120211, ${shlibs:Depends}, ${misc:Depends}
+Suggests: db5.1-util
+Description: Apache Subversion server modules for Apache httpd
+ This package provides the mod_dav_svn and mod_authz_svn modules for
+ the Apache 2.4 web server. These modules provide Apache Subversion's WebDAV
+ server backend, to serve repositories over the http and https
+ protocols. See the 'subversion' package for more information.
+
+Package: libapache2-svn
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: libapache2-mod-svn, ${misc:Depends}
+Description: Apache Subversion server modules for Apache httpd (dummy package)
+ This is a transition package to install the Apache Subversion server
+ module for Apache httpd. You may remove this package if nothing depends
+ on it.
+
Package: python-subversion
Section: python
Architecture: any
reverted:
--- subversion-1.7.9/debian/libapache2-svn.README.Debian
+++ subversion-1.7.9.orig/debian/libapache2-svn.README.Debian
@@ -1,4 +0,0 @@
-This apache module is configured in /etc/apache2/mods-available/dav_svn.conf
-
-
- -- Guilherme de S. Pastore <gpast...@colband.com.br>, Sat Aug 20 19:56:07 2005
reverted:
--- subversion-1.7.9/debian/libapache2-svn.dirs
+++ subversion-1.7.9.orig/debian/libapache2-svn.dirs
@@ -1 +0,0 @@
-usr/share/doc/libapache2-svn
reverted:
--- subversion-1.7.9/debian/libapache2-svn.examples
+++ subversion-1.7.9.orig/debian/libapache2-svn.examples
@@ -1 +0,0 @@
-tools/xslt/svnindex.*
reverted:
--- subversion-1.7.9/debian/libapache2-svn.install
+++ subversion-1.7.9.orig/debian/libapache2-svn.install
@@ -1,4 +0,0 @@
-debian/tmp/usr/lib/apache2/modules/*_svn.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
reverted:
--- subversion-1.7.9/debian/libapache2-svn.lintian-overrides
+++ subversion-1.7.9.orig/debian/libapache2-svn.lintian-overrides
@@ -1,2 +0,0 @@
-# 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
reverted:
--- subversion-1.7.9/debian/libapache2-svn.postinst
+++ subversion-1.7.9.orig/debian/libapache2-svn.postinst
@@ -1,18 +0,0 @@
-#!/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#
reverted:
--- subversion-1.7.9/debian/libapache2-svn.preinst
+++ subversion-1.7.9.orig/debian/libapache2-svn.preinst
@@ -1,15 +0,0 @@
-#!/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
reverted:
--- subversion-1.7.9/debian/libapache2-svn.prerm
+++ subversion-1.7.9.orig/debian/libapache2-svn.prerm
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
- remove)
- a2dismod authz_svn dav_svn
- ;;
-esac
-
-#DEBHELPER#
diff -u subversion-1.7.9/debian/rules subversion-1.7.9/debian/rules
--- subversion-1.7.9/debian/rules
+++ subversion-1.7.9/debian/rules
@@ -25,8 +25,8 @@
ENABLE_JAVAHL :=
endif
-# We may need to disable libapache2-svn and/or libsvn-ruby*.
-ENABLE_APACHE := no
+# We may need to disable libapache2-mod-svn and/or libsvn-ruby*.
+ENABLE_APACHE := yes
ENABLE_RUBY := yes
DEB_BUILDDIR := BUILD
@@ -109,7 +109,7 @@
confflags += --with-apxs=/usr/bin/apxs2 --disable-mod-activation
else
confflags += --without-apxs
- DH_OPTIONS += -Nlibapache2-svn
+ DH_OPTIONS += -Nlibapache2-mod-svn -Nlibapache2-svn
endif
ifdef DEB_OPT_WITH_RUBY
@@ -359,9 +359,10 @@
install -m644 tools/client-side/bash_completion \
debian/subversion/etc/bash_completion.d/subversion
+ dh_apache2 -s
ifdef DEB_OPT_WITH_APACHE
install subversion/mod_authz_svn/INSTALL \
- debian/libapache2-svn/usr/share/doc/libapache2-svn/INSTALL.authz
+ debian/libapache2-mod-svn/usr/share/doc/libapache2-mod-svn/INSTALL.authz
endif
cp tools/examples/svnshell.py debian/python-subversion/usr/bin/svnshell
only in patch2:
unchanged:
--- subversion-1.7.9.orig/debian/libapache2-mod-svn.README.Debian
+++ subversion-1.7.9/debian/libapache2-mod-svn.README.Debian
@@ -0,0 +1,4 @@
+This apache module is configured in /etc/apache2/mods-available/dav_svn.conf
+
+
+ -- Guilherme de S. Pastore <gpast...@colband.com.br>, Sat Aug 20 19:56:07 2005
only in patch2:
unchanged:
--- subversion-1.7.9.orig/debian/libapache2-mod-svn.dirs
+++ subversion-1.7.9/debian/libapache2-mod-svn.dirs
@@ -0,0 +1 @@
+usr/share/doc/libapache2-mod-svn
only in patch2:
unchanged:
--- subversion-1.7.9.orig/debian/libapache2-mod-svn.examples
+++ subversion-1.7.9/debian/libapache2-mod-svn.examples
@@ -0,0 +1 @@
+tools/xslt/svnindex.*
only in patch2:
unchanged:
--- subversion-1.7.9.orig/debian/libapache2-mod-svn.install
+++ subversion-1.7.9/debian/libapache2-mod-svn.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/apache2/modules/*_svn.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
only in patch2:
unchanged:
--- subversion-1.7.9.orig/debian/libapache2-mod-svn.lintian-overrides
+++ subversion-1.7.9/debian/libapache2-mod-svn.lintian-overrides
@@ -0,0 +1,2 @@
+# this is config documentation, not "how to build the package"
+libapache2-mod-svn: package-contains-upstream-install-documentation usr/share/doc/libapache2-mod-svn/INSTALL.authz.gz
only in patch2:
unchanged:
--- subversion-1.7.9.orig/debian/libapache2-mod-svn.postinst
+++ subversion-1.7.9/debian/libapache2-mod-svn.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+case "$1" in
+ configure)
+ if [ -f '/etc/apache2/#enable_authz_svn#' ]; then
+ # Enable on upgrades where this used to be implied by dav_svn.load
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke enmod authz_svn
+ rm -f '/etc/apache2/#enable_authz_svn#'
+ fi
+ fi
+ ;;
+esac
+
+#DEBHELPER#
only in patch2:
unchanged:
--- subversion-1.7.9.orig/debian/libapache2-mod-svn.preinst
+++ subversion-1.7.9/debian/libapache2-mod-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
signature.asc
Description: Digital signature
