[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-121-gdf90ce1
Arno Töll
arno at debian.org
Fri Jun 7 16:45:33 UTC 2013
The following commit has been merged in the master branch:
commit 83d39d37b578d5fd7586e18e4dde80a5c1471fc0
Author: Arno Töll <arno at debian.org>
Date: Fri Jun 7 14:04:31 2013 +0200
Remove the .suffix from maintainer script actions installed by dh_apache2 when using no *.apache2 file
diff --git a/debian/changelog b/debian/changelog
index 650ee0b..74e0e84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,11 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
* Strip off file extensions from arguments to a2(en|dis)(site|conf|mod) so
that "a2ensite 000-default.conf" works, as well as "a2ensite 000-default"
(Closes: #711494)
+ * Fix "apache2-dev: dh-apache2 does not strip .conf extension" for modules
+ relying on the install heuristic, instead of writing an *.apache2 conf
+ file (Closes: #711483)
- -- Arno Töll <arno at debian.org> Fri, 07 Jun 2013 12:40:11 +0200
+ -- Arno Töll <arno at debian.org> Fri, 07 Jun 2013 14:02:14 +0200
apache2 (2.4.4-5) unstable; urgency=low
diff --git a/debian/debhelper/dh_apache2.in b/debian/debhelper/dh_apache2.in
index a81ecbb..a93a44e 100755
--- a/debian/debhelper/dh_apache2.in
+++ b/debian/debhelper/dh_apache2.in
@@ -423,21 +423,24 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
wanted => sub
{
my ($dir, $file) = (dirname($File::Find::name), basename($File::Find::name));
+ # remove extension
+ my $conf_name = $file;
+ $conf_name =~ s/\.[^.]+$//;
if ($dir =~ m#etc/apache2/mods-available# and $file =~ m#.(load|conf)$#)
{
verbose_print("package $package appears to be a web server module\n");
- push @{$PACKAGE_TYPE{'has_a_module'}}, $file if $file =~ m/\.load/;
+ push @{$PACKAGE_TYPE{'has_a_module'}}, $conf_name if $file =~ m/\.load/;
}
if ($dir =~ m#etc/apache2/sites-available# and $file =~ m#.conf$#)
{
verbose_print("package $package appears to contain a virtual host confoguration\n");
- push @{$PACKAGE_TYPE{'has_a_site_conf'}}, $file;
+ push @{$PACKAGE_TYPE{'has_a_site_conf'}}, $conf_name;
}
if ($dir =~ m#etc/apache2/conf-available# and $file =~ m#.conf$#)
{
- verbose_print("package $package appears to contaqin a global configuration file \n");
- push @{$PACKAGE_TYPE{'has_a_conf_file'}}, $file;
+ verbose_print("package $package appears to contain a global configuration file \n");
+ push @{$PACKAGE_TYPE{'has_a_conf_file'}}, $conf_name;
}
--
Debian packaging for apache2
More information about the Pkg-apache-commits
mailing list