Here's a new bunch of patch:
0001-Add-apxs2.1-manual-link-to-apxs.1 quiets lintian a bit
0002-Added-Close-657492-in-changelogjust a missing Closes:
0003-Drop-patch-004.patch obsolete patch
0004-Drop-patch-009.patch obsolete patch
0005-Refresh-patches-to-use-DEP-3.-Reactivated-patches.patch
From d0d9f8d903a07c352345aa545c8e38a914c7c6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= jmv_...@nirgal.com
Date: Sat, 25 Feb 2012 11:19:18 +0100
Subject: [PATCH 1/5] Add apxs2.1 manual: link to apxs.1
Thanks lintian
---
debian/apache2-dev.manpages |1 +
debian/manpages/apxs2.1 |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 debian/manpages/apxs2.1
diff --git a/debian/apache2-dev.manpages b/debian/apache2-dev.manpages
index 6293760..a626a72 100644
--- a/debian/apache2-dev.manpages
+++ b/debian/apache2-dev.manpages
@@ -1 +1,2 @@
debian/tmp/usr/share/man/man1/apxs.1
+debian/manpages/apxs2.1
diff --git a/debian/manpages/apxs2.1 b/debian/manpages/apxs2.1
new file mode 100644
index 000..e41678b
--- /dev/null
+++ b/debian/manpages/apxs2.1
@@ -0,0 +1 @@
+.so man1/apxs.1
--
1.7.9
From b437062584eef87f0026df43a4b24b006c3755bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= jmv_...@nirgal.com
Date: Sat, 25 Feb 2012 13:03:03 +0100
Subject: [PATCH 2/5] Added Close #657492 in changelog
---
debian/changelog |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fd72530..5a0aef2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,7 +109,8 @@ apache2 (2.4.1-1) experimental; urgency=low
[ Jean-Michel Vourgère ]
- * Update bash completion functions to reflect the new site setup.
+ * Update bash completion functions to reflect the new site setup. (Closes:
+#657492)
-- Arno Töll deb...@toell.net Sat, 25 Feb 2012 03:07:24 +0100
--
1.7.9
From fabf7590137d1b81e1953816c5f429c946723b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= jmv_...@nirgal.com
Date: Sat, 25 Feb 2012 13:29:14 +0100
Subject: [PATCH 3/5] Drop patch 004
Source file no longer calls /usr/local/bin/perl
---
debian/patches/004_usr_bin_perl_0wnz_j00 | 15 ---
debian/patches/series|1 -
2 files changed, 0 insertions(+), 16 deletions(-)
delete mode 100755 debian/patches/004_usr_bin_perl_0wnz_j00
diff --git a/debian/patches/004_usr_bin_perl_0wnz_j00 b/debian/patches/004_usr_bin_perl_0wnz_j00
deleted file mode 100755
index ffabf4c..000
--- a/debian/patches/004_usr_bin_perl_0wnz_j00
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 004_usr_bin_perl_0wnz_j00 by Adam Conrad adcon...@0c3.net
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Call /usr/bin/perl in printenv, not /usr/local/bin/perl
-
-@DPATCH@
a/docs/cgi-examples/printenv
-+++ b/docs/cgi-examples/printenv
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- ##
- ## printenv -- demo CGI program which just prints its environment
- ##
diff --git a/debian/patches/series b/debian/patches/series
index e21cd2c..c4ba807 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-#004_usr_bin_perl_0wnz_j00
#008_make_include_safe
#009_apache2_has_dso
010_fhs_compliance
--
1.7.9
From c83f48cfd3396bc43fa703fb8a2f7875921f0751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= jmv_...@nirgal.com
Date: Sat, 25 Feb 2012 14:17:08 +0100
Subject: [PATCH 4/5] Drop patch 009
Upstream is no longer testing DSO is available.
So we don't need to remove that test anymore.
---
debian/patches/009_apache2_has_dso | 40
debian/patches/series |1 -
2 files changed, 0 insertions(+), 41 deletions(-)
delete mode 100755 debian/patches/009_apache2_has_dso
diff --git a/debian/patches/009_apache2_has_dso b/debian/patches/009_apache2_has_dso
deleted file mode 100755
index 24b2cd3..000
--- a/debian/patches/009_apache2_has_dso
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 009_apache2_has_dso by Adam Conrad adcon...@0c3.net
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make apxs usable without having apache2 installed.
-
-@DPATCH@
a/support/apxs.in
-+++ b/support/apxs.in
-@@ -198,18 +198,19 @@
- ($httpd = $0) =~ s:support/apxs$::;
- }
-
--unless (-x $httpd) {
-- error($httpd not found or not executable);
-- exit 1;
--}
-+#commented out for Debian GNU/Linux. We know that apache2 has dso support
-+#unless (-x $httpd) {
-+# error($httpd not found or not executable);
-+# exit 1;
-+#}
-
--unless (grep /mod_so/, `. $envvars $httpd -l`) {
--error(Sorry, no shared object support for Apache);
--error(available under your platform. Make sure);
--error(the Apache module mod_so is
