diff options
| author | Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com> | 2015-05-10 13:28:22 +0200 |
|---|---|---|
| committer | Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com> | 2015-05-10 13:28:22 +0200 |
| commit | b652aec0fed7c52a8cd9c69b102f23a0f0fa2efa (patch) | |
| tree | 6e3596ca12f59af0877218c5c27fcb308004b36d | |
| parent | 1db1e0abb4f4c5d6011ead60babd63f79978a6d2 (diff) | |
| download | apache2-b652aec0fed7c52a8cd9c69b102f23a0f0fa2efa.tar.gz | |
Fix dependency of mod-proxy-html and mod-macro
debhelper 9.20150501 changed the way it sets up Depends when using dh_installdocs --link-doc.
This resulted in unsatisfiable Depends: apache2-bin (= 1:2.4.12-1) for libapache2-mod-macro and libapache2-mod-proxy-html.
See #784803
That commit forces the use of the version number from the changelog file, without the 1: epoch prefix added in override_dh_gencontrol.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 47cf2c16..0a4134ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apache2 (2.4.12-2) UNRELEASED; urgency=medium * d/copyright: + Change d/debhelper/dh_apache2 to dh_apache2.in. + Drop paragraph about inexistant itk patches. + * d/rules: Fix dependency of mod-proxy-html and mod-macro over apache2- + bin to support debhelper>=9.20150501. -- Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com> Wed, 29 Apr 2015 12:12:38 +0200 diff --git a/debian/rules b/debian/rules index 24c5e9db..4085f1d0 100755 --- a/debian/rules +++ b/debian/rules @@ -126,6 +126,10 @@ override_dh_installdocs-arch: -plibapache2-mod-macro dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec dh_installdocs -a + # Fix Depends: so it does not contain epoch, see #784803 : + sed -i -e 's/apache2-bin (= $${binary:Version})/apache2-bin (= $(DEBIAN_VERSION))/' \ + debian/libapache2-mod-proxy-html.substvars \ + debian/libapache2-mod-macro.substvars override_dh_installchangelogs: # Do not install changelogs for transitional packages and the -data |