diff options
author | Stefan Fritsch <sf@sfritsch.de> | 2015-05-10 21:52:18 +0200 |
---|---|---|
committer | Stefan Fritsch <sf@sfritsch.de> | 2015-05-10 21:59:31 +0200 |
commit | 97e88a21911e95dcaaab756a2dbc1a2966fec738 (patch) | |
tree | a8f20b7cda11eab81543138cc5dfebc202d1c455 | |
parent | b652aec0fed7c52a8cd9c69b102f23a0f0fa2efa (diff) | |
download | apache2-97e88a21911e95dcaaab756a2dbc1a2966fec738.tar.gz |
Remove all transitional packages
This works around the recent debhelper issue #784803, too.
Also remove the not-yet-released changelog entries that deal with
transitional packages.
Remaining todo is to remove all the obsolete breaks/replaces from
the non-transitional packages and a good deal of the 2.2 to 2.4
upgrade logic.
-rw-r--r-- | debian/apache2-mpm.postinst.in | 49 | ||||
-rw-r--r-- | debian/apache2-suexec.maintscript | 1 | ||||
-rw-r--r-- | debian/apache2-suexec.postinst | 50 | ||||
-rw-r--r-- | debian/apache2.2-bin.maintscript | 1 | ||||
-rw-r--r-- | debian/apache2.2-bin.postinst | 49 | ||||
-rw-r--r-- | debian/apache2.2-common.maintscript | 11 | ||||
-rw-r--r-- | debian/changelog | 10 | ||||
-rw-r--r-- | debian/control | 180 | ||||
-rw-r--r-- | debian/libapache2-mod-macro.maintscript | 1 | ||||
-rw-r--r-- | debian/libapache2-mod-proxy-html.maintscript | 1 | ||||
-rwxr-xr-x | debian/rules | 39 |
11 files changed, 8 insertions, 384 deletions
diff --git a/debian/apache2-mpm.postinst.in b/debian/apache2-mpm.postinst.in deleted file mode 100644 index 562f8460..00000000 --- a/debian/apache2-mpm.postinst.in +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/bash -# postinst script for apache2-mpm-__TYPE__ -# -# see: dh_installdeb(1) - -set -e - - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - configure) - if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.4.4-4" ; then - if [ -d /usr/share/doc/apache2-mpm-__TYPE__ ] ; then - RET=0 - rmdir /usr/share/doc/apache2-mpm-__TYPE__ > /dev/null 2>&1|| RET=$? - if [ $RET = 0 ] ; then - ln -s /usr/share/doc/apache2 /usr/share/doc/apache2-mpm-__TYPE__ - fi - fi - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/apache2-suexec.maintscript b/debian/apache2-suexec.maintscript deleted file mode 100644 index b071ff67..00000000 --- a/debian/apache2-suexec.maintscript +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/apache2-suexec apache2-suexec-pristine 2.4.1-1~ diff --git a/debian/apache2-suexec.postinst b/debian/apache2-suexec.postinst deleted file mode 100644 index ac1e8314..00000000 --- a/debian/apache2-suexec.postinst +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/bash -# postinst script for apache2 -# -# see: dh_installdeb(1) - -set -e - - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - configure) - if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.4.3" ; then - if [ -d /usr/share/doc/apache2-suexec/ ] ; then - RET=0 - rmdir /usr/share/doc/apache2-suexec/ > /dev/null 2>&1|| RET=$? - if [ $RET = 0 ] ; then - ln -s /usr/share/doc/apache2-suexec-pristine /usr/share/doc/apache2-suexec - fi - fi - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - diff --git a/debian/apache2.2-bin.maintscript b/debian/apache2.2-bin.maintscript deleted file mode 100644 index 665f9d3e..00000000 --- a/debian/apache2.2-bin.maintscript +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/apache2.2-bin apache2-bin 2.4.4-1~ diff --git a/debian/apache2.2-bin.postinst b/debian/apache2.2-bin.postinst deleted file mode 100644 index 27a551bf..00000000 --- a/debian/apache2.2-bin.postinst +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/bash -# postinst script for apache2.2-bin -# -# see: dh_installdeb(1) - -set -e - - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - configure) - if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.4.4-5" ; then - if [ -d /usr/share/doc/apache2.2-bin ] ; then - RET=0 - rmdir /usr/share/doc/apache2.2-bin > /dev/null 2>&1|| RET=$? - if [ $RET = 0 ] ; then - ln -s /usr/share/doc/apache2-bin /usr/share/doc/apache2.2-bin - fi - fi - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/apache2.2-common.maintscript b/debian/apache2.2-common.maintscript deleted file mode 100644 index 75601b35..00000000 --- a/debian/apache2.2-common.maintscript +++ /dev/null @@ -1,11 +0,0 @@ -rm_conffile /etc/apache2/mods-available/disk_cache.conf 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/authz_default.load 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/authn_default.load 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/mem_cache.load 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/mem_cache.conf 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/authn_alias.load 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/cern_meta.load 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/disk_cache.load 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/disk_cache.conf 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/imagemap.load 2.4.10-6~ -rm_conffile /etc/apache2/mods-available/version.load 2.4.10-6~ diff --git a/debian/changelog b/debian/changelog index 0a4134ea..b14211f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ apache2 (2.4.12-2) UNRELEASED; urgency=medium + [ Jean-Michel Nirgal Vourgère ] * d/control: + Update Vcs-Browser. - + Factorize apache2.2-common breaks libapache2-modsecurity. * 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. + + [ Stefan Fritsch ] + * Remove all the transitional packages: + apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event, + apache2-mpm-itk, apache2.2-bin, apache2.2-common, + libapache2-mod-proxy-html, libapache2-mod-macro, apache2-suexec -- Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com> Wed, 29 Apr 2015 12:12:38 +0200 diff --git a/debian/control b/debian/control index d447b974..95b3a9da 100644 --- a/debian/control +++ b/debian/control @@ -67,175 +67,6 @@ Description: Apache HTTP Server (modules and other binary files) web-server instance. Install the "apache2" package to get a fully working instance. -Package: apache2-mpm-worker -Architecture: any -Section: oldlibs -Priority: extra -Provides: httpd, httpd-cgi -Depends: ${misc:Depends}, apache2 (= ${binary:Version}) -Description: transitional worker MPM package for apache2 - This is a transitional package to apache2 for users of apache2-mpm-worker and - can be safely removed after the installation is complete. - -Package: apache2-mpm-prefork -Architecture: any -Section: oldlibs -Priority: extra -Provides: httpd, httpd-cgi -Depends: ${misc:Depends}, apache2 (= ${binary:Version}) -Description: transitional prefork MPM package for apache2 - This is a transitional package to apache2 for users of apache2-mpm-prefork and - can be safely removed after the installation is complete. - -Package: apache2-mpm-event -Architecture: any -Section: oldlibs -Priority: extra -Provides: httpd, httpd-cgi -Depends: ${misc:Depends}, apache2 (= ${binary:Version}) -Description: transitional event MPM package for apache2 - This is a transitional package to apache2 for users of apache2-mpm-event and - can be safely removed after the installation is complete. - -Package: apache2-mpm-itk -Architecture: any -Section: oldlibs -Priority: extra -Provides: httpd, httpd-cgi -Depends: ${misc:Depends}, apache2 (= ${binary:Version}), libapache2-mpm-itk -Description: transitional itk MPM package for apache2 - This is a transitional package to apache2 for users of apache2-mpm-itk and - can be safely removed after the installation is complete. - -Package: apache2.2-bin -Architecture: any -Section: oldlibs -Priority: extra -Breaks: gnome-user-share (<< 3.8.0-2~), libapache2-mod-dnssd (<< 0.6-3.1~) -Pre-Depends: dpkg (>= 1.17.14) -Depends: ${misc:Depends}, apache2-bin (>= 2.3~) -Description: Transitional package for apache2-bin - This is a transitional package for apache2-bin, and can be safely removed - after the installation is complete. - -Package: apache2.2-common -Architecture: any -Section: oldlibs -Priority: extra -Depends: ${misc:Depends}, apache2 (>= 2.3~) -Description: Transitional package for apache2 - This is a transitional package for apache2-bin, and can be safely removed - after the installation is complete. -Breaks: libapache2-mod-apparmor (<< 2.8.0-1), - libapache2-mod-auth-pam (<< 1.1.1-9+deb8), - libapache2-mod-auth-sys-group (<< 1.1.1-9+deb8), - libapache2-mod-layout (<< 5.1-1+deb8), - libapache2-mod-random (<< 2.1-1+deb8), - libapache2-mod-speedycgi (<< 2.22-13+deb8), - libapache2-mod-vhost-hash-alias (<< 1.0-2+deb8), - libapache2-mod-spamhaus (<< 0.7-1.1), - libapache2-mod-auth-mysql (<< 4.3.9-13.1+deb8), - libapache2-mod-scgi (<< 1.13-1.1), - libapache2-mod-auth-pgsql (<< 2.0.3-6), - libapache2-mod-php5 (<< 5.5.0~beta4-3), - libapache2-mod-php5filter (<< 5.5.0~beta4-3), - libapache2-mod-encoding (<< 20040616-5.2), - libapache2-mod-perl2 (<< 2.0.8+httpd24-r1449661-2), - libapache2-mod-auth-ntlm-winbind (<< 0.0.0.lorikeet+svn+801-2), - libapache-singleton-perl (<< 0.15-2), - libapache2-mod-fastcgi (<< 2.4.7~0910052141-1.1), - libapache2-mod-authn-yubikey (<< 1.0-1.1), - libapache2-mod-neko (<< 2.0.0-1), - libapache2-mod-authz-unixgroup (<< 1.1.0-0.1), - libapache2-mod-auth-openid (<< 0.7-1), - libapache2-mod-python (<< 3.3.1-11), - libapache2-mod-fcgid (<< 1:2.3.6-1.3), - libapache2-mod-gnutls (<< 0.5.10-2), - libapache2-mod-auth-pubtkt (<< 0.8-2), - libapache2-mod-auth-plain (<< 2.0.52), - libapache2-mod-wsgi (<< 3.4-2), - libapache2-mod-wsgi-py3 (<< 3.4-2), - libapache2-mod-jk (<< 1:1.2.37-2), - libapache2-mod-uwsgi (<< 1.9.13-1), - libapache2-mod-ruwsgi (<< 1.9.13-1), - libapache2-mod-authnz-external (<< 3.3.1-0.1), - libapache2-svn (<< 1.7.9-1+nmu3), - libapache2-mod-vhost-ldap (<< 2.4.0-1), - libapache2-mod-nss (<< 1.0.8-3), - libapache2-mod-rpaf (<< 0.6-11), - libapache2-mod-lisp (<< 1.3.1-1.3), - gridsite (<< 1.7.21-2), - libapache2-mod-suphp (<< 0.7.1-3.1+deb8), - libapache2-mod-rivet (<< 2.1.1-3), - libapache2-mod-authn-sasl (<< 1.2-2), - libapache2-mod-auth-radius (<< 1.5.8-1.2), - libapache2-mod-auth-memcookie (<< 1.0.2-8), - libapache2-reload-perl (<< 0.12-2), - libapache2-mod-macro (<< 1.2.1-1), - libapache2-mod-ruid2 (<< 0.9.8-3), - libapache2-mod-auth-cas (<< 1.0.9.1-3), - libapache2-mod-geoip (<< 1.2.8-1), - libapache2-mod-authn-webid (<< 0~20110301-2), - libapache2-mod-upload-progress (<< 0.2-1), - libapache-authenhook-perl (<< 2.00-04+pristine-5), - libapache2-authcookie-perl (<< 3.19-2), - libapache2-mod-shib2 (<< 2.5.2+dfsg-2), - libapache2-mod-removeip (<< 1.0b-5.1), - libapache2-mod-bw (<< 0.92-9), - libapache2-mod-log-sql (<< 1.100-15), - libapache2-mod-xsendfile (<< 0.12-2), - libapache2-mod-qos (<< 10.15-3), - libapache2-mod-musicindex (<< 1.4.1-1), - libapache2-mod-apreq2 (<< 2.13-2), - libapache2-request-perl (<< 2.13-2), - libapache2-mod-parser3 (<< 3.4.2-7), - libapache2-mod-evasive (<< 1.10.1-2), - libapache2-mod-auth-kerb (<< 5.4-2.1), - libapache2-mod-dacs (<< 1.4.28b-2), - libapache2-mod-auth-tkt (<< 2.1.0-7), - libapache2-webauth (<< 4.2.0-1), - libapache2-webkdc (<< 4.2.0-1), - libapache2-mod-dnssd (<< 0.6-3.1~), - ikiwiki-hosting-web (<< 0.20140419), - libapache2-mod-passenger (<< 3.0.13debian-1.1), - libapache2-mod-mono (<< 2.11+git20130708.6b73e85-2), - libapache2-mod-mime-xattr (<< 0.4-5), - libapache2-mod-defensible (<< 1.4-3.1), - libapache2-mod-ldap-userdir (<< 1.1.19-2), - libapache2-mod-ocamlnet (<< 3.5.1-1+deb8), - libapache2-mod-proxy-html (<< 1:2.4.9-2), - libapache2-mod-ruby (<< 1.2.6-2+deb8), - libapache2-mod-axis2c (<< 1.6.0-6), - libapache2-modsecurity (<< 2.8.0-1), - libapache2-mod-chroot (<< 0.5-7+deb8), - libapache2-mod-annodex (<< 0.2.2-6+deb8), - libapache2-mod-line-edit (<< 1.0.0-1+deb8) -Conflicts: libapache2-mod-bt, - libapache2-mod-cband, - libapache2-mod-php4, - libapache2-mod-shib - -Package: libapache2-mod-proxy-html -Architecture: any -Section: oldlibs -Priority: extra -Pre-Depends: dpkg (>= 1.17.14) -Depends: ${misc:Depends}, apache2-bin (>= 2.3~) -Description: Transitional package for apache2-bin - This is a transitional package for apache2-bin, and can be safely removed - after the installation is complete. - -Package: libapache2-mod-macro -Architecture: any -Section: oldlibs -Priority: extra -Pre-Depends: dpkg (>= 1.17.14) -Depends: ${misc:Depends}, apache2-bin (>= 2.3~) -Description: Transitional package for apache2-bin - This is a transitional package for apache2-bin, and can be safely removed - after the installation is complete. - - Package: apache2-utils Architecture: any Multi-Arch: foreign @@ -255,17 +86,6 @@ Description: Apache HTTP Server (utility programs for web servers) - check_forensic (Extract mod_log_forensic output from Apache log files) - httxt2dbm (Generate dbm files for use with RewriteMap) -Package: apache2-suexec -Architecture: any -Section: oldlibs -Priority: extra -Pre-Depends: dpkg (>= 1.17.14) -Depends: ${misc:Depends}, - apache2-suexec-pristine (= ${binary:Version}) -Description: transitional package for apache2-suexec-pristine - This is a transitional package for apache2-suexec-pristine, and can be safely - removed after the installation is complete. - Package: apache2-suexec-pristine Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, apache2-bin diff --git a/debian/libapache2-mod-macro.maintscript b/debian/libapache2-mod-macro.maintscript deleted file mode 100644 index 4caa0d4e..00000000 --- a/debian/libapache2-mod-macro.maintscript +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/libapache2-mod-macro apache2-bin 1:2.4.6-1~ diff --git a/debian/libapache2-mod-proxy-html.maintscript b/debian/libapache2-mod-proxy-html.maintscript deleted file mode 100644 index cb28c1d7..00000000 --- a/debian/libapache2-mod-proxy-html.maintscript +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/libapache2-mod-proxy-html apache2-bin 1:2.4.4-3~ diff --git a/debian/rules b/debian/rules index 4085f1d0..81b7ada9 100755 --- a/debian/rules +++ b/debian/rules @@ -62,16 +62,6 @@ generate-maintainer-scripts: fi ;\ done ;\ done - set -e ; \ - for type in worker itk prefork event ; do \ - for f in postinst preinst prerm links dirs lintian-overrides postrm; do \ - if [ -e debian/apache2-mpm.$$f.in ] ; then \ - perl -pe "s{__TYPE__}{$$type}g" < debian/apache2-mpm.$$f.in > debian/apache2-mpm-$$type.$$f ;\ - chmod `/usr/bin/stat -c '%a' "debian/apache2-mpm.$$f.in"` debian/apache2-mpm-$$type.$$f ;\ - fi ;\ - done ;\ - done - clean build build-arch build-indep binary binary-arch binary-indep: %: dh $@ --parallel --with autotools_dev @@ -119,27 +109,8 @@ override_dh_installdocs-indep: dh_installdocs -i override_dh_installdocs-arch: - dh_installdocs --link-doc=apache2 -papache2 -papache2-dbg \ - -papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event \ - -papache2-mpm-itk - dh_installdocs --link-doc=apache2-bin -papache2.2-bin -plibapache2-mod-proxy-html \ - -plibapache2-mod-macro - dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec + dh_installdocs --link-doc=apache2 -papache2 -papache2-dbg 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 - # package not to trash the disk at the installation site. Together with - # dh_installdocs this means that changelogs are installed in a few - # packages only. - dh_installchangelogs -Napache2-suexec -Napache2-mpm-worker \ - -Napache2-mpm-prefork -Napache2-mpm-event -Napache2-mpm-itk \ - -Napache2-data -Nlibapache2-mod-proxy-html -Napache2.2-bin \ - -Nlibapache2-mod-macro override_dh_installman: mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8 @@ -156,13 +127,5 @@ override_dh_auto_install: override_dh_builddeb: dh_builddeb -- -Zxz -override_dh_auto_clean: - dh_auto_clean - -override_dh_gencontrol: - dh_gencontrol -p libapache2-mod-proxy-html -- -v1:$(DEBIAN_VERSION) - dh_gencontrol -p libapache2-mod-macro -- -v1:$(DEBIAN_VERSION) - dh_gencontrol --remaining-packages - .PHONY: generate-maintainer-scripts clean-config-vars prepare-scripts prebuild-checks .PHONY: clean build build-arch build-indep binary binary-arch binary-indep |