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

[Stefan Fritsch]

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

    Merge dh-apache2 into apache2-dev

diff --git a/debian/apache2-dev.install b/debian/apache2-dev.install
index f5d2707..785dd5b 100644
--- a/debian/apache2-dev.install
+++ b/debian/apache2-dev.install
@@ -1,3 +1,7 @@
 /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/postinst-apache2	/usr/share/debhelper/autoscripts/
+debian/debhelper/postrm-apache2		/usr/share/debhelper/autoscripts/
diff --git a/debian/apache2-dev.manpages b/debian/apache2-dev.manpages
index a626a72..a177177 100644
--- a/debian/apache2-dev.manpages
+++ b/debian/apache2-dev.manpages
@@ -1,2 +1,3 @@
 debian/tmp/usr/share/man/man1/apxs.1
 debian/manpages/apxs2.1
+debian/manpages/dh_apache2.1
diff --git a/debian/control b/debian/control
index 3b5188a..c8b1a96 100644
--- a/debian/control
+++ b/debian/control
@@ -177,9 +177,8 @@ Description: Apache HTTP Server (on-site documentation)
 Package: apache2-dev
 Architecture: any
 Depends: ${misc:Depends}, apache2 (= ${binary:Version}), openssl,
- libaprutil1-dev, dh-apache2
-Priority: extra
-Provides: apache2-prefork-dev, apache2-threaded-dev
+ libapr1-dev, libaprutil1-dev, debhelper (>= 7.0.50~)
+Provides: apache2-prefork-dev, apache2-threaded-dev, dh-apache2
 Replaces: apache2-prefork-dev, apache2-threaded-dev
 Conflicts: apache2-prefork-dev, apache2-threaded-dev
 Description: Apache HTTP Server (development headers)
@@ -190,6 +189,12 @@ Description: Apache HTTP Server (development headers)
  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.
+ .
+ It also provides dh_apache2 and dh sequence addons useful to install various
+ Debian Apache2 extensions with debhelper. It supports
+  - Apache 2 module configurations and shared objects
+  - Site configuration files
+  - Global configuration files
 
 Package: apache2-dbg
 Section: debug
@@ -204,15 +209,3 @@ Description: Apache debugging symbols
  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.
-
-Package: dh-apache2
-Section: devel
-Architecture: all
-Depends: debhelper (>= 7.0.50~), ${misc:Depends}
-Description: Apache debhelper utilities
- The Apache debhelper provides dh_apache2 and dh sequence addons useful to
- install various Debian Apache2 extensions. It supports
-  - Apache 2 module configurations and shared objects
-  - Site configuration files
-  - Global configuration files
-
diff --git a/debian/dh-apache2.install b/debian/dh-apache2.install
deleted file mode 100644
index 89a0a4a..0000000
--- a/debian/dh-apache2.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/debhelper/dh_apache2		/usr/bin
-debian/debhelper/apache2.pm		/usr/share/perl5/Debian/Debhelper/Sequence/
-debian/debhelper/postinst-apache2	/usr/share/debhelper/autoscripts/
-debian/debhelper/postrm-apache2		/usr/share/debhelper/autoscripts/
diff --git a/debian/dh-apache2.manpages b/debian/dh-apache2.manpages
deleted file mode 100644
index 50d1a54..0000000
--- a/debian/dh-apache2.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/manpages/dh_apache2.1
diff --git a/debian/rules b/debian/rules
index 441f0f3..2fdb2e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,10 @@ clean-config-vars:
 	printf "EXTRA_CFLAGS = \n" >> tmp_config_vars.mk ; \
 	mv tmp_config_vars.mk config_vars.mk ) ;
 
-prepare-a2query:
-	sed 's#__SERVER_VERSION__#$(SERVER_VERSION)#; s#__MODULE_DIR__#$(MODULE_DIR)#; s#__API__#$(API)#;' debian/a2query.in > debian/a2query
+%: %.in
+	sed 's#__SERVER_VERSION__#$(SERVER_VERSION)#; s#__MODULE_DIR__#$(MODULE_DIR)#; s#__API__#$(API)#;' $< > $@
+
+prepare-a2query: debian/a2query
 	(grep -s -v apache2:API debian/apache2-bin.substvars; echo apache2:API=apache2-api-$(API)) > debian/apache2-bin.substvars.new
 	mv debian/apache2-bin.substvars.new debian/apache2-bin.substvars
 

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