[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-6-39-ge0a41c4

[Arno Töll]

The following commit has been merged in the master branch:
commit 8a19f05d13f67373ab79d60b90a291e840895f67
Author: Arno Töll <arno at debian.org>
Date:   Sun Jul 21 18:45:55 2013 +0200

    Add mod-macro transitional package

diff --git a/debian/changelog b/debian/changelog
index af152a7..fd951f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,4 @@
-apache2 (2.4.6-1) UNRELEASED; urgency=low
-
-TODO XXX add macro.load, add mod_macro transitional package XXX TODO
+apache2 (2.4.6-1) unstable; urgency=low
 
   New upstream release:
   * CVE-2013-1896: mod_dav: Fix a denial of service via MERGE request
@@ -26,6 +24,8 @@ TODO XXX add macro.load, add mod_macro transitional package XXX TODO
   * Fix "dh_apache2 ignores alternative httpd on conf files" by correctly
     checking the supplied arguments, we were off by one (Closes: #717299).
   * Reinstall index.html also on upgrades as it is removed during upgrades.
+  * Add mod_macro transitional package as it was promoted to core and does not
+    exist as individual package anymore (Closes: #706962)
 
   [ Stefan Fritsch ]
   * Don't fail package upgrade or removal just because the configuration is in
@@ -33,7 +33,7 @@ TODO XXX add macro.load, add mod_macro transitional package XXX TODO
   * Improve error output of init script.
   * Fix broken dependency information in several *.load files.
 
- -- Arno Töll <arno at debian.org>  Sat, 20 Jul 2013 13:50:41 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 21 Jul 2013 18:44:42 +0200
 
 apache2 (2.4.4-6) unstable; urgency=low
 
diff --git a/debian/config-dir/mods-available/macro.load b/debian/config-dir/mods-available/macro.load
new file mode 100644
index 0000000..3a72864
--- /dev/null
+++ b/debian/config-dir/mods-available/macro.load
@@ -0,0 +1 @@
+LoadModule macro_module /usr/lib/apache2/modules/mod_macro.so
diff --git a/debian/control b/debian/control
index 5030349..e353302 100644
--- a/debian/control
+++ b/debian/control
@@ -50,8 +50,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 # MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
 Provides: ${apache2:API}, httpd, httpd-cgi
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
-Replaces: apache2.2-bin (<< 2.3~), apache2.2-common, apache2-mpm-prefork (<< 2.3~), apache2-mpm-itk (<< 2.3~), apache2-mpm-worker (<< 2.3~), apache2-mpm-event (<< 2.3~)
+Replaces: apache2.2-bin (<< 2.3~), apache2.2-common, apache2-mpm-prefork (<< 2.3~),
+ apache2-mpm-itk (<< 2.3~), apache2-mpm-worker (<< 2.3~), apache2-mpm-event (<< 2.3~),
+ libapache2-mod-proxy-html (<< 1:2.4.4-2), libapache2-mod-macro (<< 1:2.4.6-1)
 Conflicts: apache2.2-bin (<< 2.3~), apache2.2-common
+Breaks: libapache2-mod-proxy-html (<< 1:2.4.4-2), libapache2-mod-macro (<< 1:2.4.6-1)
 Description: Apache HTTP Server (binary files and modules)
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The
@@ -117,6 +120,16 @@ 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
+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
diff --git a/debian/libapache2-mod-proxy-html.postinst b/debian/libapache2-mod-macro.postinst
similarity index 80%
copy from debian/libapache2-mod-proxy-html.postinst
copy to debian/libapache2-mod-macro.postinst
index 1985977..daa079c 100644
--- a/debian/libapache2-mod-proxy-html.postinst
+++ b/debian/libapache2-mod-macro.postinst
@@ -1,5 +1,5 @@
 #! /bin/bash
-# postinst script for libapache2-mod-proxy-html
+# postinst script for libapache2-mod-macro
 #
 # see: dh_installdeb(1)
 
@@ -20,12 +20,12 @@ set -e
 
 case "$1" in
     configure)
-        if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1:2.4.4-2" ; then
-                if [ -d /usr/share/doc/libapache2-mod-proxy-html ] ; then
+        if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1:2.4.6-1" ; then
+                if [ -d /usr/share/doc/libapache2-mod-macro ] ; then
                         RET=0
-                        rmdir /usr/share/doc/libapache2-mod-proxy-html > /dev/null 2>&1|| RET=$?
+                        rmdir /usr/share/doc/libapache2-mod-macro > /dev/null 2>&1|| RET=$?
                         if [ $RET = 0 ] ; then
-                                ln -s /usr/share/doc/apache2 /usr/share/doc/libapache2-mod-proxy-html
+                                ln -s /usr/share/doc/apache2 /usr/share/doc/libapache2-mod-macro
                         fi
                 fi
         fi
diff --git a/debian/rules b/debian/rules
index e31c543..0ad8ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,7 +135,7 @@ override_dh_installdocs-arch:
 	dh_installdocs --link-doc=apache2 -papache2 -papache2-dbg \
 		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event \
 		-papache2-mpm-itk -plibapache2-mod-proxy-html \
-		-plibapache2-mod-proxy-html
+		-plibapache2-mod-macro
 	dh_installdocs --link-doc=apache2-bin -papache2.2-bin
 	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
 	dh_installdocs -a
@@ -147,7 +147,8 @@ override_dh_installchangelogs:
 	# 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
+		-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
@@ -170,6 +171,7 @@ override_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

-- 
Debian packaging for apache2