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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit dc8809bb59c7e4c4933c6f5b52d113b561e8be60
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Mar 18 00:00:21 2012 +0100

    Rename PROGRAMMING -> PACKAGING

diff --git a/debian/PROGRAMMING b/debian/PACKAGING
similarity index 100%
rename from debian/PROGRAMMING
rename to debian/PACKAGING
diff --git a/debian/apache2.README.Debian b/debian/apache2.README.Debian
index 68075c4..232b0f4 100644
--- a/debian/apache2.README.Debian
+++ b/debian/apache2.README.Debian
@@ -422,5 +422,5 @@ For Developers
 
 The Apache 2 web server package provides several helpers to assist
 packagers to interact with the web server for both, build and installation
-time. Please refer to the PROGRAMMING file in the apache2-dev package for
+time. Please refer to the PACKAGING file in the apache2 package for
 detailed information.
diff --git a/debian/apache2.docs b/debian/apache2.docs
index 0a89e29..6de9747 100644
--- a/debian/apache2.docs
+++ b/debian/apache2.docs
@@ -1,3 +1,3 @@
 debian/README.backtrace
 debian/README.multiple-instances
-debian/PROGRAMMING
+debian/PACKAGING
diff --git a/debian/changelog b/debian/changelog
index a9c97da..c02cf10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -133,7 +133,7 @@ apache2 (2.4.1-1) experimental; urgency=low
     reliable way with the Apache 2 web server in maintainer scripts
   * Document programming hints how to interface with the Apache 2 web server for
   * packagers of web applications and module maintainer in
-    /usr/share/doc/apache2/PROGRAMMING.
+    /usr/share/doc/apache2/PACKAGING.gz.
   * Fix the watch file, thanks to Jean-Michel Vourgère for pointing out the
     problem.
   * Update debian/copyright and switch it to the copyright-format 1.0 (formerly
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index c57c10a..48f5816 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -89,7 +89,7 @@ apache2_switch_mpm()
 #	arguments - A variable number or arguments (e.g. modules) which shall be
 #		enabled or disabled respectively. Do not enable module
 #		dependencies that way, instead use module dependencies as
-#		documented in </usr/share/doc/apache2/PROGRAMMING>.
+#		documented in </usr/share/doc/apache2/PACKAGING>.
 # Returns:
 #	0 if the changes could be activated
 #	1 otherwise

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