[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 85f85e0c0897ceb2e3c6d1ce1e8fece033ae48ac
Arno Töll
debian at toell.net
Wed Feb 29 02:47:55 UTC 2012
The following commit has been merged in the next branch:
commit 689f3d06e84f1b1ad4d6ab45b90dbf59ca4ea20a
Author: Arno Töll <debian at toell.net>
Date: Wed Feb 29 02:32:21 2012 +0100
Do a proper transition of apache2-doc, cleanup rules
* Do a transition of /etc/apache2/conf.d/apache2-doc -> conf-available/apache2-doc.conf
* Move Debian specific manpages from the apache2-data package to apache2
(despite of being arch:all :/)
* Cleanup debian/rules, remove obsolete stuff
* Re-enable special permission handling in /var/log/apache2
diff --git a/debian/apache2-doc.install b/debian/apache2-doc.install
index 1c427a5..28c1f30 100644
--- a/debian/apache2-doc.install
+++ b/debian/apache2-doc.install
@@ -1,4 +1,4 @@
/usr/share/apache2/default-site/htdocs/manual /usr/share/doc/apache2-doc
/usr/lib/cgi-bin/printenv /usr/share/doc/apache2-doc/cgi-examples
/usr/lib/cgi-bin/test-cgi /usr/share/doc/apache2-doc/cgi-examples
-debian/apache2-doc.conf /etc/apache2/conf.d/
+debian/apache2-doc.conf /etc/apache2/conf-available/
diff --git a/debian/apache2-doc.maintscript b/debian/apache2-doc.maintscript
new file mode 100644
index 0000000..75d87c9
--- /dev/null
+++ b/debian/apache2-doc.maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/apache2/conf.d/apache2-doc /etc/apache2/conf-available/apache2-doc.conf
diff --git a/debian/apache2-doc.postinst b/debian/apache2-doc.postinst
new file mode 100644
index 0000000..f506468
--- /dev/null
+++ b/debian/apache2-doc.postinst
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+set -e
+
+# conffiles be moved before invoking rc.d
+#DEBHELPER#
+
+# This code should use dh_apache2 once it is available as build dependency
+
+if [ "$1" = "configure" ] ; then
+ if [ -x "/usr/sbin/a2enconf" ] ; then
+ for S in apache2-doc ; do
+ /usr/sbin/a2enconf -q $S || true
+ done
+
+ if [ -x "/etc/init.d/apache2" ]; then
+ invoke-rc.d apache2 restart || true
+ fi
+
+ fi
+fi
+
+exit 0
+
diff --git a/debian/apache2-doc.postrm b/debian/apache2-doc.postrm
new file mode 100644
index 0000000..567d86c
--- /dev/null
+++ b/debian/apache2-doc.postrm
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+set -e
+
+# This code should use dh_apache2 once it is available as build dependency
+
+if [ "$1" = "purge" ] ; then
+ if [ -x "/usr/sbin/a2disconf" ] ; then
+ for S in apache2-doc ; do
+ /usr/sbin/a2disconf -q $S || true
+ done
+
+ if [ -x "/etc/init.d/apache2" ]; then
+ invoke-rc.d apache2 restart || true
+ fi
+
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/apache2.dirs b/debian/apache2.dirs
index 01b06e5..f32ae51 100644
--- a/debian/apache2.dirs
+++ b/debian/apache2.dirs
@@ -4,7 +4,6 @@ etc/apache2/sites-enabled
etc/logrotate.d
usr/lib/cgi-bin
usr/share/apache2
-usr/share/apache2/build
usr/share/apache2/default-site
usr/share/lintian/overrides
var/cache/apache2
diff --git a/debian/apache2-data.manpages b/debian/apache2.manpages
similarity index 100%
rename from debian/apache2-data.manpages
rename to debian/apache2.manpages
diff --git a/debian/control b/debian/control
index 791bb11..1be7a8f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,8 @@ Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
Replaces: apache2.2-common (<< 2.3~)
Breaks: apache2.2-common (<< 2.3~)
Recommends: ssl-cert
-Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
+Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom,
+ apache2-utils
Description: Apache HTTP Server
The Apache Software Foundation's goal is to build a secure, efficient and
extensible HTTP server as standards-compliant open source software. The
@@ -33,7 +34,6 @@ Description: Apache HTTP Server
Package: apache2-data
Architecture: all
-#Depends: ${misc:Depends}, apache2-bin (= ${binary:Version}), apache2-utils, mime-support, lsb-base, procps [!hurd-i386], perl
Depends: ${misc:Depends}
Replaces: apache2.2-common
Description: Apache HTTP Server common files
@@ -106,7 +106,6 @@ Package: apache2-suexec-pristine
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
#Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
-#Conflicts: apache2-suexec
Replaces: apache2-suexec
Conflicts: apache2-suexec
Provides: apache2-suexec
@@ -135,6 +134,8 @@ Description: Configurable suexec program for Apache 2 mod_suexec
Package: apache2-doc
Section: doc
Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
+Recommends: apache2
Depends: ${misc:Depends}
Description: Apache HTTP Server documentation
This package provides the documentation for Apache 2. For more details
@@ -145,7 +146,9 @@ Package: apache2-dev
Architecture: any
Depends: ${misc:Depends}, apache2 (= ${binary:Version}), openssl, libaprutil1-dev
Priority: extra
+Provides: apache2-prefork-dev, apache2-threaded-dev
Replaces: apache2-prefork-dev, apache2-threaded-dev
+Conflicts: apache2-prefork-dev, apache2-threaded-dev
Description: Apache development headers
This package provides the development headers and apxs2 binary for
threaded versions of apache2; see the apache2 package description
diff --git a/debian/rules b/debian/rules
index 43378c9..6b493fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,62 +5,15 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
-#
LSB_RELEASE := $(shell lsb_release -i -s)
-#AP2_worker_CONFARGS = --enable-authn-alias=shared --enable-authnz-ldap=shared \
-# --enable-disk-cache=shared --enable-cache=shared \
-# --enable-mem-cache=shared --enable-file-cache=shared \
-# --enable-cern-meta=shared --enable-dumpio=shared --enable-ext-filter=shared \
-# --enable-charset-lite=shared --enable-cgi=shared \
-# --enable-dav-lock=shared --enable-log-forensic=shared \
-# --enable-ldap=shared --enable-proxy=shared \
-# --enable-proxy-connect=shared --enable-proxy-ftp=shared \
-# --enable-proxy-http=shared --enable-proxy-ajp=shared \
-# --enable-proxy-scgi=shared \
-# --enable-proxy-balancer=shared --enable-ssl=shared \
-# --enable-authn-dbm=shared --enable-authn-anon=shared \
-# --enable-authn-dbd=shared --enable-authn-file=shared \
-# --enable-authn-default=shared --enable-authz-host=shared \
-# --enable-authz-groupfile=shared --enable-authz-user=shared \
-# --enable-authz-dbm=shared --enable-authz-owner=shared \
-# --enable-authnz-ldap=shared --enable-authz-default=shared \
-# --enable-auth-basic=shared --enable-auth-digest=shared \
-# --enable-dbd=shared --enable-deflate=shared \
-# --enable-include=shared --enable-filter=shared \
-# --enable-env=shared --enable-mime-magic=shared \
-# --enable-expires=shared --enable-headers=shared \
-# --enable-ident=shared --enable-usertrack=shared \
-# --enable-unique-id=shared --enable-setenvif=shared \
-# --enable-version=shared --enable-status=shared \
-# --enable-autoindex=shared --enable-asis=shared \
-# --enable-info=shared --enable-cgid=shared \
-# --enable-dav=shared --enable-dav-fs=shared \
-# --enable-vhost-alias=shared --enable-negotiation=shared \
-# --enable-dir=shared --enable-imagemap=shared \
-# --enable-actions=shared --enable-speling=shared \
-# --enable-userdir=shared --enable-alias=shared \
-# --enable-rewrite=shared --enable-mime=shared \
-# --enable-substitute=shared --enable-reqtimeout=shared
-#AP2_prefork_CONFARGS=--enable-modules=none
-#AP2_event_CONFARGS=$(AP2_prefork_CONFARGS)
-#AP2_itk_CONFARGS=$(AP2_prefork_CONFARGS)
-#
AP2_CFLAGS = -pipe $(shell dpkg-buildflags --get CFLAGS)
AP2_LDFLAGS = -Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS)
AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' $(shell dpkg-buildflags --get CPPFLAGS)
+# TODO: This flag used to be appended to the configure line. Is it still needed?
#CONFFLAGS += ac_cv_prog_LYNX_PATH=www-browser
-#
-#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-#DEB_BUILD_STRIP = yes
-#endif
-#
-#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-# BUILDMAKEFLAGS = -j$(NUMJOBS)
-#endif
-#
+
prepare-custom-suexec:
cp support/suexec.c support/suexec-custom.c
patch -p1 < debian/patches/202_suexec-custom
@@ -117,47 +70,6 @@ override_dh_auto_configure: prepare-custom-suexec suexec-maintainer-scripts
override_dh_install: clean-config-vars
dh_install --list-missing
-#override_dh_auto_configure: prepare-custom-suexec $(patsubst %, mpm-%-maintainer-scripts, $(MPMS))
-# mkdir $(BUILD_DIR)
-# mkdir $(INSTALL_DIR)
-#
-#
-#override_dh_auto_build override_dh_auto_install:
-#
-#override_dh_install-arch:
-# $(MAKE) $(BUILDMAKEFLAGS) -f $(CURDIR)/debian/rules $(patsubst %, build-%, $(MPMS)) install-dev
-# for mpm in $(filter-out worker, $(MPMS)) ; do \
-# if ! diff -u $(BUILD_DIR)/$$mpm/mods.list $(BUILD_DIR)/worker/mods.list ; then \
-# echo Different modules built into httpd binaries, will not proceed ;\
-# exit 1 ;\
-# fi \
-# done
-# cd debian && ln -s $(INSTALL_DIR_RELATIVE)/worker tmp
-# for m in logresolve ab; do d=debian/tmp/usr/share/man/ ;\
-# perl -p -e 's/^([.]TH.*?) 8 (.*)/$$1 1 $$2/' < $$d/man8/$$m.8 > $$d/man1/$$m.1 ;\
-# done
-# #cleanup of death
-# rm -rf $(DEFAULT_MPM)/etc/apache2/original
-# rm -rf $(DEFAULT_MPM)/usr/include
-# rm -rf $(DEFAULT_MPM)/usr/share/apache2/build
-# rm -f $(DEFAULT_MPM)/usr/share/man/man8/httpd.8 # We install our own
-# rm -f $(DEFAULT_MPM)/usr/sbin/apxs $(DEFAULT_MPM)/usr/sbin/apache2 debian/tmp/usr/sbin/apachectl
-# mv $(DEFAULT_MPM)/usr/share/man/man8/apxs.8 $(DEFAULT_MPM)/usr/share/man/man8/apxs2.8
-# mv $(DEFAULT_MPM)/usr/share/man/man8/apachectl.8 $(DEFAULT_MPM)/usr/share/man/man8/apache2ctl.8
-# dh_install -a --list-missing
-# # DO NOT FALL FOR THE TEMPTATION TO MV INTO PACKAGES OR DOOM
-# # WILL FIND YOU. Use dh_install, this is just because dh_install
-# # can't rename files
-# cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
-# cp debian/bash_completion debian/apache2.2-common/etc/bash_completion.d/apache2.2-common
-#
-#
-#override_dh_install-indep:
-# dh_install -i --list-missing
-# cp debian/apache2-doc.conf debian/apache2-doc/etc/apache2/conf.d/apache2-doc
-# perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
-#
-
override_dh_fixperms:
# standard suexec
chmod 4754 debian/apache2-suexec-pristine/usr/lib/apache2/suexec-pristine
@@ -166,20 +78,19 @@ override_dh_fixperms:
chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec-custom
chgrp www-data debian/apache2-suexec-custom/usr/lib/apache2/suexec-custom
dh_fixperms -Xusr/lib/apache2/suexec
-# chown -R www-data:www-data debian/apache2.2-common/var/cache/apache2
-# chown root:adm debian/apache2.2-common/var/log/apache2
-# chmod o-rx debian/apache2.2-common/var/log/apache2
-#
+ chown -R www-data:www-data debian/apache2/var/cache/apache2
+ chown root:adm debian/apache2/var/log/apache2
+ chmod o-rx debian/apache2/var/log/apache2
override_dh_installinit:
dh_installinit --no-start --no-restart-on-upgrade -- defaults 91 09
override_dh_installdocs:
+ # TODO: So, did anyone check convert_docs needs an update? ;)
perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
dh_installdocs
-
-
+#TODO: Or that stuff
# dh_installdocs debian/README.backtrace -papache2.2-bin
# dh_installdocs debian/README.backtrace debian/README.multiple-instances -papache2.2-common
# dh_installdocs -Napache2.2-common -Napache2.2-bin
@@ -200,15 +111,9 @@ override_dh_installman:
mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8
dh_installman
-#override_dh_installchangelogs:
-# dh_installchangelogs CHANGES -Napache2-suexec -Napache2-suexec-custom -Napache2
-# dh_installchangelogs -papache2-suexec -papache2-suexec-custom -papache2
-# rm -f debian/apache2.2-bin/usr/share/doc/apache2.2-bin/NEWS.Debian
-# rm -f debian/apache2-utils/usr/share/doc/apache2-utils/NEWS.Debian
-#
override_dh_strip:
dh_strip --dbg-package=apache2-dbg
-# dh_strip --dbg-package=apache2-dbg -Napache2-dbg -Xusr/lib/apache2/mpm
+#TODO: Probably not needed anymore?
# set -e \
# if [ "$(LSB_RELEASE)" != "Ubuntu" ] && [ -n "$(DEB_BUILD_STRIP)" ] ; then \
# for i in $(MPMS); do \
@@ -231,11 +136,5 @@ override_dh_strip:
# dh_builddeb; \
# fi
#
-#override_dh_installlogrotate:
-# dh_installlogrotate --name=apache2
-#
-#override_dh_clean: $(patsubst %, undo-mpm-%-maintainer-scripts, $(MPMS))
-# dh_clean
-#
-#.PHONY: configure-% build-%-tree prepare-custom-suexec unapply-custom-suexec
+
.PHONY: prepare-custom-suexec suexec-maintainer-scripts clean-config-vars
--
Debian packaging for apache2 (Apache HTTPD 2.x)
More information about the Pkg-apache-commits
mailing list