← Back to branch summary

~ubuntu-branches/debian/stretch/subversion/stretch

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2013-10-18 23:23:06 UTC
  • mfrom: (17.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20131018232306-etbd7h4i0stghrd5
Tags: 1.7.13-2
http://bugs.debian.org/726717
Remove unnecessary libapache2-svn.prem.  (Closes: #726717)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
25
25
  ENABLE_JAVAHL :=
26
26
endif
27
27
 
28
 
# We may need to disable libapache2-svn and/or libsvn-ruby*.
29
 
ENABLE_APACHE        := no
 
28
# We may need to disable libapache2-mod-svn and/or libsvn-ruby*.
 
29
ENABLE_APACHE        := yes
30
30
ENABLE_RUBY          := yes
31
31
 
32
32
DEB_BUILDDIR     := BUILD
109
109
  confflags += --with-apxs=/usr/bin/apxs2 --disable-mod-activation
110
110
else
111
111
  confflags += --without-apxs
112
 
  DH_OPTIONS += -Nlibapache2-svn
 
112
  DH_OPTIONS += -Nlibapache2-mod-svn -Nlibapache2-svn
113
113
endif
114
114
 
115
115
ifdef DEB_OPT_WITH_RUBY
359
359
        install -m644 tools/client-side/bash_completion \
360
360
                debian/subversion/etc/bash_completion.d/subversion
361
361
 
 
362
        dh_apache2 -s
362
363
ifdef DEB_OPT_WITH_APACHE
363
364
        install subversion/mod_authz_svn/INSTALL \
364
 
                debian/libapache2-svn/usr/share/doc/libapache2-svn/INSTALL.authz
 
365
                debian/libapache2-mod-svn/usr/share/doc/libapache2-mod-svn/INSTALL.authz
365
366
endif
366
367
 
367
368
        cp tools/examples/svnshell.py debian/python-subversion/usr/bin/svnshell