[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-110-g0bf4833
Arno Töll
arno at debian.org
Sun Jun 2 18:14:29 UTC 2013
The following commit has been merged in the master branch:
commit 4a5ea5b364b056199f8ebdca541e9530c6b4217c
Author: Arno Töll <arno at debian.org>
Date: Sun Jun 2 19:44:08 2013 +0200
Fix spelling errors, push standards, use canonical git location
diff --git a/debian/changelog b/debian/changelog
index 3569886..f9dd0c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,12 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
have a fixed version in the works. That makes Gnome installable again.
* Update our gbp.conf for our big merge next -> master. The eagle has
landed, 2.4 is here.
+ * Push Standards version to 3.9.4 - no changes needed.
+ * Fix spelling errors in man pages.
+ * Update the git VCS pointer to its canonical location for anonymous
+ checkouts.
- -- Arno Töll <arno at debian.org> Sun, 02 Jun 2013 18:27:39 +0200
+ -- Arno Töll <arno at debian.org> Sun, 02 Jun 2013 19:42:57 +0200
apache2 (2.4.4-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f195356..5030349 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 8.9.7~), lsb-release, dpkg-dev (>= 1.16.1~),
libssl-dev (>= 0.9.8m), libcap-dev [linux-any], perl,
liblua5.1-0-dev, libxml2-dev, autotools-dev, gawk | awk
Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apache2.git
-Vcs-Git: git://git.debian.org/git/pkg-apache/apache2.git
+Vcs-Git: git://anonscm.debian.org/pkg-apache/apache2.git
Homepage: http://httpd.apache.org/
Package: apache2
diff --git a/debian/manpages/a2enconf.8 b/debian/manpages/a2enconf.8
index 57336c7..8106ab7 100644
--- a/debian/manpages/a2enconf.8
+++ b/debian/manpages/a2enconf.8
@@ -53,7 +53,7 @@ being installed and manged by reverse dependencies (e.g. web scripts).
Don't show informative messages.
.TP
.B \-m, \-\-maintmode
-Enables the maintainer mode, that is the program invokation is effectuated
+Enables the maintainer mode, that is the program invocation is effectuated
automatically by a maintainer script. This switch should not be used by end
users.
.B \-p, \-\-purge
diff --git a/debian/manpages/a2enmod.8 b/debian/manpages/a2enmod.8
index dadd4bc..4e35c84 100644
--- a/debian/manpages/a2enmod.8
+++ b/debian/manpages/a2enmod.8
@@ -53,7 +53,7 @@ directives in the .conf file as directives into the main server context of
Don't show informative messages.
.TP
.B \-m, \-\-maintmode
-Enables the maintainer mode, that is the program invokation is effectuated
+Enables the maintainer mode, that is the program invocation is effectuated
automatically by a maintainer script. This switch should not be used by end
users.
.B \-p, \-\-purge
diff --git a/debian/manpages/a2ensite.8 b/debian/manpages/a2ensite.8
index b115d98..c2e21d0 100644
--- a/debian/manpages/a2ensite.8
+++ b/debian/manpages/a2ensite.8
@@ -53,7 +53,7 @@ in order to sort before the remaining hosts to be loaded first.
Don't show informative messages.
.TP
.B \-m, \-\-maintmode
-Enables the maintainer mode, that is the program invokation is effectuated
+Enables the maintainer mode, that is the program invocation is effectuated
automatically by a maintainer script. This switch should not be used by end
users.
.B \-p, \-\-purge
--
Debian packaging for apache2
More information about the Pkg-apache-commits
mailing list