[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. eec7d3d78f860179ec3d7c8f59ffa68de5b397d6

[Arno Töll]

The following commit has been merged in the next branch:
commit eec7d3d78f860179ec3d7c8f59ffa68de5b397d6
Author: Arno Töll <debian at toell.net>
Date:   Mon Mar 5 20:47:20 2012 +0100

    Tweak documentation installed along the packages
    
    * Install docs through dh_installdocs
    * Install changelogs in packages which can be installed autonomously from each
      other only
    * Install README.Debian and NEWS file in apache2 package only
    * Add an apache2-suexec transitional package, make dependencies appropriate in a
      way the apache2-suexec package is virtual, too
    * Add a mod_cache_disk note in postinst to be addressed later

diff --git a/debian/apache2-doc.examples b/debian/apache2-doc.examples
new file mode 100644
index 0000000..423eb1a
--- /dev/null
+++ b/debian/apache2-doc.examples
@@ -0,0 +1 @@
+debian/tmp/etc/apache2/
diff --git a/debian/NEWS b/debian/apache2.NEWS
similarity index 100%
rename from debian/NEWS
rename to debian/apache2.NEWS
diff --git a/debian/README.Debian b/debian/apache2.README.Debian
similarity index 100%
rename from debian/README.Debian
rename to debian/apache2.README.Debian
diff --git a/debian/apache2.docs b/debian/apache2.docs
index ca84f4d..abf45ce 100644
--- a/debian/apache2.docs
+++ b/debian/apache2.docs
@@ -1,3 +1,2 @@
 debian/README.backtrace
-debian/README.Debian
 debian/README.multiple-instances
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index dfce71f..8f48105 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -309,7 +309,8 @@ move_httpd_conf()
 
 migrate_data()
 {
-	#XXX enable mod_cache_disk?
+	#XXX: jimjag recommends purging the cache albeit it is probably not
+	#     technically required. 
 	if we_are_upgrading_from_squeeze $@ ; then
 		# /var/cache/apache2/mod_disk_cache -> /var/cache/apache2/mod_cache_disk
 		if [ -d /var/cache/apache2/mod_disk_cache ] && [ "$(ls -A /var/cache/apache2/mod_disk_cache)" ] ; then
diff --git a/debian/changelog b/debian/changelog
index 16226c8..2ccd2c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,8 @@ apache2 (2.4.1-1) experimental; urgency=low
   * Refresh patches but leave all hunks unchanged where possible. Notable
     changes are:
     + [AT] 202_suexec-custom: Keep functionality as is, but rewrite smaller
-      parts of the patch to build two binaries: suexec-pristine and suexec-custom
-      (see below)
+      parts of the patch to build two binaries: suexec-pristine and
+      suexec-custom (see below)
     + [AT] 201_build_suexec-custom: Patch the makefile to build
       "suexec-pristine" instead. Aside of that, refresh hunks.
     + [AT] 010_fhs_compliance: Drop config.layout patches. These have been
@@ -144,7 +144,7 @@ apache2 (2.4.1-1) experimental; urgency=low
   * Migrate patches to DEP-3 format. For particular changes see the summary
     above.
 
- -- Arno Töll <debian at toell.net>  Sun, 04 Mar 2012 23:38:59 +0100
+ -- Arno Töll <debian at toell.net>  Mon, 05 Mar 2012 17:54:39 +0100
 
 apache2 (2.2.22-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7e2ca5b..fb9935d 100644
--- a/debian/control
+++ b/debian/control
@@ -62,15 +62,16 @@ Description: Apache HTTP Server (binary files and modules)
  instance. Do not install this package unless you want to set-up the Apache
  HTTP server entirely on your own.
 
-Package: apache2-mpm-worker
-Provides: apache2-mpm-prefork, apache2-mpm-event
-Replaces: apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~)
-Breaks: apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~), apache2-mpm-itk (<< 2.3~)
+Package: apache2-mpm
+Provides: apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event
+Replaces: apache2-mpm-worker (<< 2.3~), apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~)
+Breaks: apache2-mpm-worker (<< 2.3~), apache2-mpm-prefork (<< 2.3~),
+ apache2-mpm-event (<< 2.3~), apache2-mpm-itk (<< 2.3~)
 Architecture: any
 Section: oldlibs
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (= ${binary:Version})
-Description: Transitional package for apache2
+Description: transitional package for apache2
  This is a transitional package for apache2, and can be safely removed
  after the installation is complete.
 
@@ -102,12 +103,22 @@ 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
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ apache2-suexec-pristine (= ${binary:Version}) | apache2-suexec-custom (= ${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}
 #Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
-Replaces: apache2-suexec
-Conflicts: apache2-suexec
+Replaces: apache2-suexec (<< 2.3~)
+Breaks: apache2-suexec (<< 2.3~)
 Provides: apache2-suexec
 Description: Apache HTTP Server standard suexec program for mod_suexec
  Provides the standard suexec helper program for mod_suexec. This version is
@@ -119,8 +130,8 @@ Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 #Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
-Replaces: apache2-suexec
-Conflicts: apache2-suexec
+Replaces: apache2-suexec (<< 2.3~)
+Breaks: apache2-suexec (<< 2.3~)
 Provides: apache2-suexec
 Description: Apache HTTP Server configurable suexec program for mod_suexec
  Provides a customizable version of the suexec helper program for mod_suexec.
diff --git a/debian/rules b/debian/rules
index f614a3a..fcad191 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,23 +81,15 @@ override_dh_installinit:
 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 --link-doc=apache2 -papache2 -papache2-dev -papache2-dbg
 	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
-#	cp debian/mpm-itk/README debian/apache2.2-common/usr/share/doc/apache2.2-common/README.mpm-itk
-#	cp debian/mpm-itk/CHANGES debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk
-#	cp debian/mpm-itk/debian/changelog debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk.Debian
-#	for p in apache2-prefork-dev apache2-threaded-dev apache2-mpm-prefork apache2-mpm-event \
-#		apache2-mpm-worker apache2-mpm-itk apache2; \
-#	do \
-#		rm -rf debian/$$p/usr/share/doc/$$p ;\
-#		ln -s apache2.2-common debian/$$p/usr/share/doc/$$p ;\
-#	done
-#	rm -rf debian/apache2-dbg/usr/share/doc/apache2-dbg
-#	ln -s apache2.2-bin debian/apache2-dbg/usr/share/doc/apache2-dbg
-#
+
+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.2-bin -Napache2-suexec -Napache2-mpm -Napache2-data
 
 override_dh_installman:
 	mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)