[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.2-2-53-g3e97253

[Arno Töll]

The following commit has been merged in the next branch:
commit 3e97253d179adcbca814f0057e9213228833d000
Author: Arno Töll <arno at debian.org>
Date:   Thu Jan 31 23:24:06 2013 +0100

    Give noshadow credit for his work, also bring back some comments
    and do tiny fixes in the rules file

diff --git a/debian/changelog b/debian/changelog
index fbc7b57..e7ac43e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,15 @@ apache2 (2.4.3-1) UNRELEASED; urgency=low
     manually when necessary in postinst (Closes: #691440)
   * Document APACHE_ARGUMENTS in envvars (ported from our 2.2 branch, reported as #693299)
 
- -- Arno Töll <arno at debian.org>  Fri, 16 Nov 2012 01:09:36 +0100
+  [ Bernhard R. Link ]
+
+  * Rearrane patches: Move all the patches or parts of patches touching non-itk
+    specific files (i.e. those from the upstream tarball) directly in the
+    debian/patches/series series.  While this seperates the itk patches into two
+    heaps, it makes both more visible what changes happen to the general code (and
+    thus are also done to the other servers generated)
+
+ -- Arno Töll <arno at debian.org>  Thu, 31 Jan 2013 23:20:20 +0100
 
 apache2 (2.4.2-2) experimental; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index a04b4f4..cfc43c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,13 @@ no_LD_LIBRARY_PATH.patch
 suexec-CVE-2007-1742.patch
 customize_apxs.patch
 build_suexec-custom.patch
-# some changed to the core needed for itk:
+# The patch below must not be applied by quilt at extraction time.  It depends
+# on some script-fu to be executed before. Have a look
+# to debian/rules' prepare-custom-suexec target.
+# If you're aware of that you can uncomment it at any time later and work on it
+# as you wish. However, it must be shipped commented out in the final package.
+#suexec-custom.patch
+# some changes to the core needed for itk:
 add-itk-to-build-system.patch
 itk-hook-just-after-merging-perdir-config.patch
 itk-fix-htaccess-reads-for-persistent-connections.patch
diff --git a/debian/rules b/debian/rules
index 38ca0de..9e73e57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,6 @@ generate-maintainer-scripts:
 		done ;\
 	done
 
-.PHONY: clean build build-arch build-indep binary binary-arch binary-indep
 clean build build-arch build-indep binary binary-arch binary-indep: %:
 	dh $@ --parallel --with autotools_dev
 
@@ -149,3 +148,4 @@ override_dh_auto_clean:
 	if test -d server/mpm/itk ; then rm -r server/mpm/itk ; fi
 
 .PHONY: generate-maintainer-scripts clean-config-vars prepare-scripts prebuild-checks
+.PHONY: clean build build-arch build-indep binary binary-arch binary-indep

-- 
Debian packaging for apache2