[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-11-g3770f98
Arno Töll
arno at debian.org
Sun May 12 15:55:45 UTC 2013
The following commit has been merged in the next branch:
commit b554e17a59b69c610f8831f2297d49347de651dd
Author: Arno Töll <arno at debian.org>
Date: Sun May 12 13:37:00 2013 +0200
Properly retrieve the site/conf status when queried from a2query
diff --git a/debian/a2query.in b/debian/a2query.in
index a907fc5..b958b6c 100755
--- a/debian/a2query.in
+++ b/debian/a2query.in
@@ -235,6 +235,7 @@ sub load_conf
{
my $file = $_;
next if $file !~ m/\.conf$/;
+ $file =~ s/\.conf$//;
push @CONFS, $file;
}
closedir(DIR);
@@ -253,6 +254,7 @@ sub load_sites
{
my $file = $_;
next if $file !~ m/\.conf$/;
+ $file =~ s/\.conf$//;
push @SITES, $file;
}
closedir(DIR);
diff --git a/debian/changelog b/debian/changelog
index fd9e3e1..74678db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,13 +11,15 @@ apache2 (2.4.4-3) UNRELEASED; urgency=low
* Fix "don't assume apache2 is running 24 hours a day when rotating
logs": Only restart the webserver when it was previously running
(Closes: #707892)
+ * Properly return the conf/site configuration fragments enabled for Apache
+ when queried from a2query (Closes: #683212)
[ Stefan Fritsch ]
* Remove paragraph about MaxMemFree in README.Debian. The issue should be
fixed in 2.4.
* Enable mod_authn_core when upgrading from wheezy (Closes: #702866)
- -- Arno Töll <arno at debian.org> Sun, 12 May 2013 13:19:28 +0200
+ -- Arno Töll <arno at debian.org> Sun, 12 May 2013 13:35:39 +0200
apache2 (2.4.4-2) experimental; urgency=low
--
Debian packaging for apache2
More information about the Pkg-apache-commits
mailing list