[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:32 UTC 2013


The following commit has been merged in the master branch:
commit f21d77817fb0873b7958d5eae7526c1cbe6c4018
Author: Arno Töll <arno at debian.org>
Date:   Fri Jun 7 12:43:49 2013 +0200

    Strip file extension from arguments to a2enmod

diff --git a/debian/a2enmod b/debian/a2enmod
index 123b646..2ccefee 100755
--- a/debian/a2enmod
+++ b/debian/a2enmod
@@ -88,6 +88,7 @@ if ( !scalar @ARGV ) {
 
 my @objs;
 foreach my $arg (@ARGV) {
+    $arg =~ s/${sffx}$//;
     my @glob = myglob($arg);
     if ( !@glob ) {
         error("No $obj found matching $arg!\n");
diff --git a/debian/changelog b/debian/changelog
index 2b84aff..650ee0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,13 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
   * Update the git VCS pointer to its canonical location for anonymous
     checkouts.
   * Boost the description for the LSB init script to appease Lintian.
-  * Fix spurious warnings in the Apache2 bug report script (Closes: 711121,
+  * Fix spurious warnings in the Apache2 bug report script (Closes: #711121,
     #711480)
+  * 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)
 
- -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 12:24:43 +0200
+ -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 12:40:11 +0200
 
 apache2 (2.4.4-5) unstable; urgency=low
 

-- 
Debian packaging for apache2



More information about the Pkg-apache-commits mailing list