[apache2] 01/03: Run wrap-and-sort -a to canonicalize the debian/ directory
Ondřej Surý
ondrej at debian.org
Sun Jan 14 11:10:30 UTC 2018
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch master
in repository apache2.
commit 43b8331d7909d5288ef9127d73df308c2359aeae
Author: Ondřej Surý <ondrej at sury.org>
Date: Sun Jan 14 10:57:02 2018 +0000
Run wrap-and-sort -a to canonicalize the debian/ directory
---
debian/apache2-data.install | 4 +-
debian/apache2-dev.install | 6 +--
debian/apache2-dev.manpages | 2 +-
debian/apache2-doc.install | 2 +-
debian/apache2-utils.install | 12 +++---
debian/apache2-utils.manpages | 16 ++++----
debian/apache2.dirs | 6 +--
debian/apache2.docs | 2 +-
debian/apache2.examples | 4 +-
debian/apache2.install | 12 +++---
debian/apache2.links | 18 ++++-----
debian/apache2.maintscript | 2 +-
debian/apache2.manpages | 12 +++---
debian/control | 88 +++++++++++++++++++++++++++++++------------
debian/copyright | 1 -
15 files changed, 112 insertions(+), 75 deletions(-)
diff --git a/debian/apache2-data.install b/debian/apache2-data.install
index 332da2e..c529419 100644
--- a/debian/apache2-data.install
+++ b/debian/apache2-data.install
@@ -1,5 +1,5 @@
-/usr/share/apache2/icons/
+/usr/sbin/envvars-std /usr/share/apache2/build
/usr/share/apache2/error/
+/usr/share/apache2/icons/
debian/icons/*.png /usr/share/apache2/icons
-/usr/sbin/envvars-std /usr/share/apache2/build
debian/index.html /usr/share/apache2/default-site/
diff --git a/debian/apache2-dev.install b/debian/apache2-dev.install
index eacb880..0dd64f7 100644
--- a/debian/apache2-dev.install
+++ b/debian/apache2-dev.install
@@ -1,8 +1,8 @@
+/usr/bin/apxs
/usr/include/apache2
/usr/share/apache2/build
-/usr/bin/apxs
-debian/debhelper/dh_apache2 /usr/bin
debian/debhelper/apache2.pm /usr/share/perl5/Debian/Debhelper/Sequence/
+debian/debhelper/dh_apache2 /usr/bin
debian/debhelper/postinst-apache2 /usr/share/debhelper/autoscripts/
-debian/debhelper/prerm-apache2 /usr/share/debhelper/autoscripts/
debian/debhelper/postrm-apache2 /usr/share/debhelper/autoscripts/
+debian/debhelper/prerm-apache2 /usr/share/debhelper/autoscripts/
diff --git a/debian/apache2-dev.manpages b/debian/apache2-dev.manpages
index a177177..c1877d7 100644
--- a/debian/apache2-dev.manpages
+++ b/debian/apache2-dev.manpages
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/man/man1/apxs.1
debian/manpages/apxs2.1
debian/manpages/dh_apache2.1
+debian/tmp/usr/share/man/man1/apxs.1
diff --git a/debian/apache2-doc.install b/debian/apache2-doc.install
index 28c1f30..3974a92 100644
--- a/debian/apache2-doc.install
+++ b/debian/apache2-doc.install
@@ -1,4 +1,4 @@
-/usr/share/apache2/default-site/htdocs/manual /usr/share/doc/apache2-doc
/usr/lib/cgi-bin/printenv /usr/share/doc/apache2-doc/cgi-examples
/usr/lib/cgi-bin/test-cgi /usr/share/doc/apache2-doc/cgi-examples
+/usr/share/apache2/default-site/htdocs/manual /usr/share/doc/apache2-doc
debian/apache2-doc.conf /etc/apache2/conf-available/
diff --git a/debian/apache2-utils.install b/debian/apache2-utils.install
index 2d4b7c3..0e5d6b6 100644
--- a/debian/apache2-utils.install
+++ b/debian/apache2-utils.install
@@ -1,12 +1,12 @@
/usr/bin/ab /usr/bin
-/usr/sbin/fcgistarter /usr/bin
-/usr/bin/logresolve /usr/bin
/usr/bin/htdbm /usr/bin
-/usr/bin/htpasswd /usr/bin
/usr/bin/htdigest /usr/bin
-/usr/sbin/rotatelogs /usr/bin
-/usr/sbin/htcacheclean /usr/bin
-/usr/sbin/checkgid /usr/bin
+/usr/bin/htpasswd /usr/bin
/usr/bin/httxt2dbm /usr/sbin
+/usr/bin/logresolve /usr/bin
+/usr/sbin/checkgid /usr/bin
+/usr/sbin/fcgistarter /usr/bin
+/usr/sbin/htcacheclean /usr/bin
+/usr/sbin/rotatelogs /usr/bin
support/check_forensic /usr/sbin
support/split-logfile /usr/sbin
diff --git a/debian/apache2-utils.manpages b/debian/apache2-utils.manpages
index f95fd77..d53a9ac 100644
--- a/debian/apache2-utils.manpages
+++ b/debian/apache2-utils.manpages
@@ -1,12 +1,12 @@
-debian/tmp/usr/share/man/man1/logresolve.1
-debian/tmp/usr/share/man/man8/htcacheclean.8
-debian/tmp/usr/share/man/man8/fcgistarter.8
-debian/tmp/usr/share/man/man8/rotatelogs.8
+debian/manpages/check_forensic.8
+debian/manpages/checkgid.8
+debian/manpages/split-logfile.8
debian/tmp/usr/share/man/man1/ab.1
-debian/tmp/usr/share/man/man1/htdigest.1
debian/tmp/usr/share/man/man1/htdbm.1
+debian/tmp/usr/share/man/man1/htdigest.1
debian/tmp/usr/share/man/man1/htpasswd.1
debian/tmp/usr/share/man/man1/httxt2dbm.1
-debian/manpages/check_forensic.8
-debian/manpages/checkgid.8
-debian/manpages/split-logfile.8
+debian/tmp/usr/share/man/man1/logresolve.1
+debian/tmp/usr/share/man/man8/fcgistarter.8
+debian/tmp/usr/share/man/man8/htcacheclean.8
+debian/tmp/usr/share/man/man8/rotatelogs.8
diff --git a/debian/apache2.dirs b/debian/apache2.dirs
index 531c08f..6089013 100644
--- a/debian/apache2.dirs
+++ b/debian/apache2.dirs
@@ -1,12 +1,12 @@
-etc/apache2/mods-enabled
etc/apache2/conf-enabled
+etc/apache2/mods-enabled
etc/apache2/sites-enabled
etc/logrotate.d
usr/lib/cgi-bin
-var/lib/apache2
+usr/share/bug/apache2
usr/share/lintian/overrides
var/cache/apache2
var/cache/apache2/mod_cache_disk
+var/lib/apache2
var/log/apache2
var/www/html
-usr/share/bug/apache2
diff --git a/debian/apache2.docs b/debian/apache2.docs
index 6de9747..44a5c6c 100644
--- a/debian/apache2.docs
+++ b/debian/apache2.docs
@@ -1,3 +1,3 @@
+debian/PACKAGING
debian/README.backtrace
debian/README.multiple-instances
-debian/PACKAGING
diff --git a/debian/apache2.examples b/debian/apache2.examples
index 0438c13..944a00f 100644
--- a/debian/apache2.examples
+++ b/debian/apache2.examples
@@ -1,3 +1,3 @@
-debian/setup-instance
-debian/secondary-init-script
debian/apache2.monit
+debian/secondary-init-script
+debian/setup-instance
diff --git a/debian/apache2.install b/debian/apache2.install
index 798d2f0..b6ad789 100644
--- a/debian/apache2.install
+++ b/debian/apache2.install
@@ -1,10 +1,10 @@
-debian/bash_completion/a2enmod /usr/share/bash-completion/completions/
-debian/config-dir/*.conf /etc/apache2
-debian/config-dir/*-available /etc/apache2
-debian/config-dir/magic /etc/apache2
-debian/config-dir/envvars /etc/apache2
debian/a2enmod /usr/sbin
-debian/apache2ctl /usr/sbin
debian/a2query /usr/sbin
+debian/apache2ctl /usr/sbin
debian/ask-for-passphrase /usr/share/apache2/
+debian/bash_completion/a2enmod /usr/share/bash-completion/completions/
+debian/config-dir/*-available /etc/apache2
+debian/config-dir/*.conf /etc/apache2
+debian/config-dir/envvars /etc/apache2
+debian/config-dir/magic /etc/apache2
debian/debhelper/apache2-maintscript-helper /usr/share/apache2/
diff --git a/debian/apache2.links b/debian/apache2.links
index 3e38af8..3170ada 100644
--- a/debian/apache2.links
+++ b/debian/apache2.links
@@ -1,13 +1,13 @@
-usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2dismod
-usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2ensite
-usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2dissite
-usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2enconf
-usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2disconf
-usr/share/bug/apache2-bin/script usr/share/bug/apache2/script
-usr/share/bug/apache2-bin/control usr/share/bug/apache2/control
+usr/sbin/a2enmod usr/sbin/a2disconf
usr/sbin/a2enmod usr/sbin/a2dismod
-usr/sbin/a2enmod usr/sbin/a2ensite
usr/sbin/a2enmod usr/sbin/a2dissite
usr/sbin/a2enmod usr/sbin/a2enconf
-usr/sbin/a2enmod usr/sbin/a2disconf
+usr/sbin/a2enmod usr/sbin/a2ensite
usr/sbin/apache2ctl usr/sbin/apachectl
+usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2disconf
+usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2dismod
+usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2dissite
+usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2enconf
+usr/share/bash-completion/completions/a2enmod usr/share/bash-completion/completions/a2ensite
+usr/share/bug/apache2-bin/control usr/share/bug/apache2/control
+usr/share/bug/apache2-bin/script usr/share/bug/apache2/script
diff --git a/debian/apache2.maintscript b/debian/apache2.maintscript
index b878131..d698ef2 100644
--- a/debian/apache2.maintscript
+++ b/debian/apache2.maintscript
@@ -1,2 +1,2 @@
-rm_conffile /etc/bash_completion.d/apache2 2.4.12-3~
mv_conffile /etc/default/apache2 /etc/default/apache-htcacheclean 2.4.18-2~
+rm_conffile /etc/bash_completion.d/apache2 2.4.12-3~
diff --git a/debian/apache2.manpages b/debian/apache2.manpages
index cd9ece6..836c08b 100644
--- a/debian/apache2.manpages
+++ b/debian/apache2.manpages
@@ -1,9 +1,9 @@
-debian/manpages/apache2ctl.8
-debian/manpages/apachectl.8
-debian/manpages/a2enmod.8
-debian/manpages/a2dissite.8
+debian/manpages/a2disconf.8
debian/manpages/a2dismod.8
-debian/manpages/a2ensite.8
+debian/manpages/a2dissite.8
debian/manpages/a2enconf.8
-debian/manpages/a2disconf.8
+debian/manpages/a2enmod.8
+debian/manpages/a2ensite.8
debian/manpages/a2query.8
+debian/manpages/apache2ctl.8
+debian/manpages/apachectl.8
diff --git a/debian/control b/debian/control
index 7706af8..52fba12 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,23 @@ Source: apache2
Section: httpd
Priority: optional
Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
-Uploaders: Stefan Fritsch <sf at debian.org>, Arno Töll <arno at debian.org>, Ondřej Surý <ondrej at debian.org>
-Build-Depends: debhelper (>= 9.20160709~), lsb-release, dpkg-dev (>= 1.16.1~),
- libaprutil1-dev (>= 1.6.0), libapr1-dev (>= 1.6.0), libpcre3-dev, zlib1g-dev,
- libnghttp2-dev, libssl-dev (>= 1.1), perl,
- liblua5.2-dev, libxml2-dev, autotools-dev, gawk | awk
+Uploaders: Stefan Fritsch <sf at debian.org>,
+ Arno Töll <arno at debian.org>,
+ Ondřej Surý <ondrej at debian.org>
+Build-Depends: autotools-dev,
+ debhelper (>= 9.20160709~),
+ dpkg-dev (>= 1.16.1~),
+ gawk | awk,
+ libapr1-dev (>= 1.6.0),
+ libaprutil1-dev (>= 1.6.0),
+ liblua5.2-dev,
+ libnghttp2-dev,
+ libpcre3-dev,
+ libssl-dev (>= 1.1),
+ libxml2-dev,
+ lsb-release,
+ perl,
+ zlib1g-dev
Build-Conflicts: autoconf2.13
Standards-Version: 4.1.0
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-apache/apache2.git/
@@ -16,15 +28,25 @@ Homepage: http://httpd.apache.org/
Package: apache2
Architecture: any
Pre-Depends: dpkg (>= 1.17.14)
-Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
- perl, mime-support, apache2-bin (= ${binary:Version}),
- apache2-utils (= ${binary:Version}), apache2-data (= ${source:Version}),
- ${perl:Depends}
-Provides: httpd, httpd-cgi
+Depends: apache2-bin (= ${binary:Version}),
+ apache2-data (= ${source:Version}),
+ apache2-utils (= ${binary:Version}),
+ lsb-base,
+ mime-support,
+ perl,
+ procps [!hurd-i386],
+ ${misc:Depends},
+ ${perl:Depends}
+Provides: httpd,
+ httpd-cgi
Recommends: ssl-cert
-Conflicts: apache2.2-common, apache2.2-bin
-Replaces: apache2.2-common, apache2.2-bin
-Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
+Conflicts: apache2.2-bin,
+ apache2.2-common
+Replaces: apache2.2-bin,
+ apache2.2-common
+Suggests: apache2-doc,
+ apache2-suexec-pristine | apache2-suexec-custom,
+ www-browser
Description: Apache HTTP Server
The Apache HTTP Server Project's goal is to build a secure, efficient and
extensible HTTP server as standards-compliant open source software. The
@@ -47,11 +69,15 @@ Description: Apache HTTP Server (common files)
Package: apache2-bin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-# MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
+Depends: ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends}
Provides: ${apache2:API}
-Breaks: gridsite (<< 3.0.0~20170225gitd51b2fd-1~), libapache2-mod-dacs (<= 1.4.38a-2)
-Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
+Breaks: gridsite (<< 3.0.0~20170225gitd51b2fd-1~),
+ libapache2-mod-dacs (<= 1.4.38a-2)
+Suggests: apache2-doc,
+ apache2-suexec-pristine | apache2-suexec-custom,
+ www-browser
Description: Apache HTTP Server (modules and other binary files)
The Apache HTTP Server Project's goal is to build a secure, efficient and
extensible HTTP server as standards-compliant open source software. The
@@ -64,7 +90,9 @@ Description: Apache HTTP Server (modules and other binary files)
Package: apache2-utils
Architecture: any
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}
+Depends: ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends}
Description: Apache HTTP Server (utility programs for web servers)
Provides some add-on programs useful for any web server. These include:
- ab (Apache benchmark tool)
@@ -82,7 +110,9 @@ Description: Apache HTTP Server (utility programs for web servers)
Package: apache2-suexec-pristine
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, apache2-bin
+Depends: apache2-bin,
+ ${misc:Depends},
+ ${shlibs:Depends}
Provides: apache2-suexec
Description: Apache HTTP Server standard suexec program for mod_suexec
Provides the standard suexec helper program for mod_suexec. This version is
@@ -91,7 +121,9 @@ Description: Apache HTTP Server standard suexec program for mod_suexec
Package: apache2-suexec-custom
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, apache2-bin
+Depends: apache2-bin,
+ ${misc:Depends},
+ ${shlibs:Depends}
Provides: apache2-suexec
Description: Apache HTTP Server configurable suexec program for mod_suexec
Provides a customizable version of the suexec helper program for mod_suexec.
@@ -119,8 +151,12 @@ Description: Apache HTTP Server (on-site documentation)
Package: apache2-dev
Architecture: any
-Depends: ${misc:Depends}, openssl, libapr1-dev, libaprutil1-dev,
- debhelper (>= 9), ${perl:Depends}
+Depends: debhelper (>= 9),
+ libapr1-dev,
+ libaprutil1-dev,
+ openssl,
+ ${misc:Depends},
+ ${perl:Depends}
Provides: dh-apache2
Description: Apache HTTP Server (development headers)
The Apache HTTP Server Project's goal is to build a secure, efficient and
@@ -139,8 +175,9 @@ Description: Apache HTTP Server (development headers)
Package: apache2-ssl-dev
Architecture: any
-Depends: ${misc:Depends}, apache2-dev (= ${binary:Version}),
- libssl-dev (>= 1.1)
+Depends: apache2-dev (= ${binary:Version}),
+ libssl-dev (>= 1.1),
+ ${misc:Depends}
Description: Apache HTTP Server (mod_ssl development headers)
The Apache HTTP Server Project's goal is to build a secure, efficient and
extensible HTTP server as standards-compliant open source software. The
@@ -152,7 +189,8 @@ Description: Apache HTTP Server (mod_ssl development headers)
Package: apache2-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, apache2-bin (= ${binary:Version})
+Depends: apache2-bin (= ${binary:Version}),
+ ${misc:Depends}
Description: Apache debugging symbols
The Apache HTTP Server Project's goal is to build a secure, efficient and
extensible HTTP server as standards-compliant open source software. The
diff --git a/debian/copyright b/debian/copyright
index 097be01..54527ab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -446,4 +446,3 @@ License: MIT
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git
More information about the Pkg-apache-commits
mailing list