[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 9ab7c89a2f83bae78e2ad16d5e75b181ffb25467

Arno Töll debian at toell.net
Wed Feb 29 17:02:32 UTC 2012 

The following commit has been merged in the next branch:
commit 885e97ba24e875e5d5ecbaf033987fb647bd8e24
Author: Arno Töll <debian at toell.net>
Date:   Wed Feb 29 17:42:38 2012 +0100

    * Provide a man page link from apxs2 to apxs
    * Create the index.html directory in apache2-data where the file is actually
      installed (but keep the postinst handler to activate it in apache2.postinst.
      Find out whether I am totally insane now)
    * Rework package descriptions and synopsis lines
    * Make the init script Lintian happy
    * Write a Lintian override for our unusual permissions

diff --git a/debian/apache2-data.dirs b/debian/apache2-data.dirs
new file mode 100644
index 0000000..349950b
--- /dev/null
+++ b/debian/apache2-data.dirs
@@ -0,0 +1 @@
+usr/share/apache2/default-site
diff --git a/debian/apache2-dev.manpages b/debian/apache2-dev.manpages
index 6293760..a626a72 100644
--- a/debian/apache2-dev.manpages
+++ b/debian/apache2-dev.manpages
@@ -1 +1,2 @@
 debian/tmp/usr/share/man/man1/apxs.1
+debian/manpages/apxs2.1
diff --git a/debian/apache2.dirs b/debian/apache2.dirs
index f32ae51..0332cb5 100644
--- a/debian/apache2.dirs
+++ b/debian/apache2.dirs
@@ -4,7 +4,6 @@ etc/apache2/sites-enabled
 etc/logrotate.d
 usr/lib/cgi-bin
 usr/share/apache2
-usr/share/apache2/default-site
 usr/share/lintian/overrides
 var/cache/apache2
 var/cache/apache2/mod_cache_disk
diff --git a/debian/apache2.init b/debian/apache2.init
index d31677f..c3f4985 100644
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -7,6 +7,8 @@
 # Default-Stop:      0 1 6
 # X-Interactive:     true
 # Short-Description: Start/stop apache2 web server
+# Description:       Start, stop and test configuration of the Apache 2 HTTP web
+#                    server
 ### END INIT INFO
 
 set -e
diff --git a/debian/apache2.links b/debian/apache2.links
index ec9d92e..d780b14 100644
--- a/debian/apache2.links
+++ b/debian/apache2.links
@@ -1,4 +1,4 @@
-usr/share/bug/apache2-common/script	usr/share/bug/apache2/script
+usr/share/bug/apache2-data/script	usr/share/bug/apache2/script
 usr/sbin/a2enmod 			usr/sbin/a2dismod
 usr/sbin/a2enmod 			usr/sbin/a2ensite
 usr/sbin/a2enmod 			usr/sbin/a2dissite
diff --git a/debian/config-dir/mods-available/filter.load b/debian/apache2.lintian-overrides
similarity index 81%
copy from debian/config-dir/mods-available/filter.load
copy to debian/apache2.lintian-overrides
index 94c4270..b6d86b3 100644
--- a/debian/config-dir/mods-available/filter.load
+++ b/debian/apache2.lintian-overrides
@@ -1 +1 @@
-LoadModule filter_module /usr/lib/apache2/modules/mod_filter.so
+non-standard-dir-perm var/log/apache2/ 0750 != 0755
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 3b60f49..476ac9e 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -208,6 +208,8 @@ install_default_site()
 	fi
 }
 
+# XXX: This site is installed in the apache2-data package. Should the postinst
+# scriptlet move there too? 
 install_default_files()
 {
 	if [ ! -e /var/www/index.html ] ; then
diff --git a/debian/changelog b/debian/changelog
index d2a620a..8e2f6bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,11 +73,12 @@ apache2 (2.4.1-1) experimental; urgency=low
       Users can just load and unload MPMs like other modules, enable the worker
       MPM by default
     + Move per-site global configuration from conf.d to conf-available and
-      manage it similar to modules and sites. To do so, the new tools "a2enconf"
-      and "a2disconf" are provided. Moreover, such configuration files need  to
-      have a .conf suffix now. The following configuration files are enabled
-      bydefault: charset localized-error-pages other-vhosts-access-log  security.
-      These were enabled by default previously, too (Closes: #620347).
+      manage it similar to modules and sites. To do so, the new tools
+      "a2enconf" and "a2disconf" are provided. Moreover, such configuration
+      files need  to have a .conf suffix now. The following configuration
+      files are enabled by default: charset localized-error-pages
+      other-vhosts-access-log  security.  These were enabled by default
+      previously, too (Closes: #620347).
     + Give site configuration a .conf suffix, too. For example the default vhost
       is called default.conf. Moreover, files without .conf suffix are ignored
       upon startup. Please update your site links and confs. Also rename the
@@ -92,7 +93,8 @@ apache2 (2.4.1-1) experimental; urgency=low
       also configuration changes).
     + Expect a .conf suffix for sites-enabled/sites-available configurations.
     + Remove the default vhost special handling. Instead, we expect the default
-      host to be named appropripriately (e.g. 000-default.conf; Closes: #605535).
+      host to be named appropripriately (for example 000-default.conf;
+      Closes: #605535).
   * The following modules and associated configuration files were removed:
     + mod_authz_default and mod_authn_default: Please use a proper
       authentication module instead
@@ -104,8 +106,9 @@ apache2 (2.4.1-1) experimental; urgency=low
     remoteip, request, session, session_cookie, session_crypto, session_dbd
     (Closes: #400881)
   * Provide a dh_apache2 debhelper which can be used by reverse dependencies to
-    install modules, module configuration files, site configuration files and global
-    configuration files which need to be registered to the Apache web server.
+    install modules, module configuration files, site configuration files and
+    global configuration files which need to be registered to the Apache web
+    server.
     Thus, dh_apache2 can be used for Apache web server modules and web
     applications providing configuration files for Apache.
 
@@ -113,7 +116,8 @@ apache2 (2.4.1-1) experimental; urgency=low
 
   * Use "dh --with autotools_dev" instead of patching config.sub/config.guess.
   * Only include conf.d/*.conf, not conf.d/*.
-  * Don't create httpd.conf anymore. (Closes: #639383)
+  * Don't create httpd.conf anymore. Also, do a proper transition of existing
+    httpd.conf files to /etc/apache2/conf-available (Closes: #639383)
   * Add "AddCharset" for .brf files in default mod_mime config.
     (Closes: #402567)
   * Update the README.Debian file
@@ -122,7 +126,7 @@ apache2 (2.4.1-1) experimental; urgency=low
 
   * Update bash completion functions to reflect the new site setup.
 
- -- Arno Töll <debian at toell.net>  Sat, 25 Feb 2012 21:34:50 +0100
+ -- arno <arno at build.fritz.box>  Wed, 29 Feb 2012 15:44:04 +0100
 
 apache2 (2.2.22-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1be7a8f..9f34d7a 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Package: apache2-data
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: apache2.2-common
-Description: Apache HTTP Server common files
+Description: Apache HTTP Server (common files)
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The
  result has long been the number one web server on the Internet.
@@ -52,7 +52,7 @@ Provides: apache2-api-20111203
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
 Replaces: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~),
 Breaks: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~),
-Description: Apache HTTP Server common binary files
+Description: Apache HTTP Server (binary files and modules)
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The
  result has long been the number one web server on the Internet.
@@ -64,8 +64,8 @@ Description: Apache HTTP Server common binary files
 
 Package: apache2-mpm-worker
 Provides: apache2-mpm-prefork, apache2-mpm-event
-Replaces: apache2-mpm-worker (<< 2.3~), apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~)
-Breaks: apache2-mpm-worker (<< 2.3~), apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~), apache2-mpm-itk (<< 2.3~)
+Replaces: apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~)
+Breaks: apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~), apache2-mpm-itk (<< 2.3~)
 Architecture: any
 Section: oldlibs
 Priority: extra
@@ -86,8 +86,8 @@ Description: Transitional package for apache2-bin
 Package: apache2-utils
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: utility programs for webservers
- Provides some add-on programs useful for any webserver.  These include:
+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)
   - fcgistarter (Start a FastCGI program)
   - logresolve (Resolve IP addresses to hostname in logfiles)
@@ -109,7 +109,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: apache2-suexec
 Conflicts: apache2-suexec
 Provides: apache2-suexec
-Description: Standard suexec program for Apache 2 mod_suexec
+Description: Apache HTTP Server standard suexec program for mod_suexec
  Provides the standard suexec helper program for mod_suexec. This version is
  compiled with document root /var/www and userdir suffix public_html. If you
  need different settings, use the package apache2-suexec-custom.
@@ -122,7 +122,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: apache2-suexec
 Conflicts: apache2-suexec
 Provides: apache2-suexec
-Description: Configurable suexec program for Apache 2 mod_suexec
+Description: Apache HTTP Server configurable suexec program for mod_suexec
  Provides a customizable version of the suexec helper program for mod_suexec.
  This is not the version from upstream, but can be configured with a
  configuration file.
@@ -137,10 +137,14 @@ Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
 Recommends: apache2
 Depends: ${misc:Depends}
-Description: Apache HTTP Server documentation
- This package provides the documentation for Apache 2. For more details
- see the apache2 package description. The documentation is shipped in HTML
- format an can be accessed from a local running Apache HTTP server instance.
+Description: Apache HTTP Server (on-site documentation)
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package provides the documentation for the Apache 2 HTTP server. The
+ documentation is shipped in HTML format an can be accessed from a local running
+ Apache HTTP server instance or by browsing the file system directly.
 
 Package: apache2-dev
 Architecture: any
@@ -149,10 +153,14 @@ Priority: extra
 Provides: apache2-prefork-dev, apache2-threaded-dev
 Replaces: apache2-prefork-dev, apache2-threaded-dev
 Conflicts: apache2-prefork-dev, apache2-threaded-dev
-Description: Apache development headers
- This package provides the development headers and apxs2 binary for
- threaded versions of apache2; see the apache2 package description
- for more details.
+Description: Apache HTTP Server (development headers)
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package provides development headers and the apxs2 binary for the Apache 2
+ HTTP server useful to develop and link third party additions to the Debian
+ Apache HTTP server package.
 
 Package: apache2-dbg
 Section: debug
@@ -160,5 +168,10 @@ Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, apache2 (= ${binary:Version})
 Description: Apache debugging symbols
- This package includes the debugging symbols for Apache 2.
- See /usr/share/doc/apache2/README.backtrace for more information.
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package includes the debugging symbols. It can be used to debug
+ crashing server instances and modules.  See
+ /usr/share/doc/apache2/README.backtrace for more information.
diff --git a/debian/manpages/apxs2.1 b/debian/manpages/apxs2.1
new file mode 100644
index 0000000..e41678b
--- /dev/null
+++ b/debian/manpages/apxs2.1
@@ -0,0 +1 @@
+.so man1/apxs.1

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)

More information about the Pkg-apache-commits mailing list