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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit d88214f1bcbc9e020862ddd9e9aed5192e33e606
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Feb 6 23:00:25 2012 +0100

    one more obsolete patch

diff --git a/debian/patches/047_fix_usage_message b/debian/patches/047_fix_usage_message
deleted file mode 100755
index d1d9ef6..0000000
--- a/debian/patches/047_fix_usage_message
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 047_fix_usage_message.dpatch by Stefan Fritsch <sf at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add -X to the help message
-
- at DPATCH@
---- a/server/main.c
-+++ b/server/main.c
-@@ -353,7 +353,7 @@
- #endif /* AP_MPM_WANT_SET_GRACEFUL_SHUTDOWN */
- #endif
-     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
--                 "       %*s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S]",
-+                 "       %*s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S] [-X]",
-                  pad_len, " ");
-     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                  "Options:");
-@@ -435,6 +435,8 @@
-                  "  -t                 : run syntax check for config files");
-     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                 "  -T                 : start without DocumentRoot(s) check");
-+    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-+                "  -X                 : debug mode (only one worker, do not detach)");
- 
-     destroy_and_exit_process(process, 1);
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9b1ddea..e62c565 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@
 #033_dbm_read_hash_or_btree
 #034_apxs2_libtool_fixtastic
 #038_no_LD_LIBRARY_PATH
-#047_fix_usage_message
 #052_logresolve_linelength
 #058_suexec-CVE-2007-1742
 #076_apxs2_a2enmod

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