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

[Arno Töll]

The following commit has been merged in the master branch:
commit be9b031d01240d901c6721d6bb8e9a0895674c13
Author: Arno Töll <debian at toell.net>
Date:   Wed Apr 4 00:14:10 2012 +0200

    * Rename our internal targets not to clash with official rules targets
    * Push standards
    * Drop apache2-dev virtual packages. This clashes with our experimental work

diff --git a/debian/changelog b/debian/changelog
index 6d4f8c3..416d493 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apache2 (2.2.22-3) unstable; urgency=low
+
+  * Fix "FTBFS: mkdir: cannot create directory `debian/build-tree/arch':
+    No such file or directory". Do not use internal rules targets which clash
+    with build target names ... (Closes: #667069)
+  * Drop apache2-dev virtual package. This had virtually no users but breaks our
+    experimental package in some cases (e.g. #666793)
+  * Push Standards version - no further changes
+
+ -- Arno Töll <arno at debian.org>  Wed, 04 Apr 2012 00:05:28 +0200
+
 apache2 (2.2.22-2) unstable; urgency=low
 
   [ Arno Töll ]
diff --git a/debian/control b/debian/control
index 89eaff1..d4f1a5e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Arno Töll <debian at toell.net>
 Build-Depends: debhelper (>= 8.9.7~), lsb-release, libaprutil1-dev (>= 1.3.4), libapr1-dev, openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev (>= 0.9.8m), sharutils, libcap-dev [linux-any], autoconf
 Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apache2.git
 Vcs-Git: git://git.debian.org/git/pkg-apache/apache2.git
 Homepage: http://httpd.apache.org/
@@ -185,7 +185,6 @@ Package: apache2-threaded-dev
 Architecture: any
 Depends: ${misc:Depends}, apache2.2-common (= ${binary:Version}), openssl, libaprutil1-dev
 Conflicts: apache2-prefork-dev
-Provides: apache2-dev
 Priority: extra
 Description: Apache development headers - threaded MPM
  This package provides the development headers and apxs2 binary for
diff --git a/debian/rules b/debian/rules
index edcc226..7331d89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,7 +118,7 @@ override_dh_auto_clean: unapply-custom-suexec
 	rm -rf $(INSTALL_DIR)
 	rm -f debian/tmp
 
-build-%:
+mpm-build-%:
 	mkdir "$(BUILD_DIR)/$*"
 	cp -a `find . -maxdepth 1 -mindepth 1 -not -name debian` $(BUILD_DIR)/$*
 	set -ex	;										\
@@ -148,7 +148,7 @@ build-%:
 	install -m 755 $(BUILD_DIR)/$*/apache2 debian/apache2.2-bin/usr/lib/apache2/mpm-$*/apache2
 
 
-install-dev: build-worker build-prefork
+install-dev: mpm-build-worker mpm-build-prefork
 	set -ex ; \
 	for i in worker prefork; do \
 		if [ "$$i" = "prefork" ]; then \
@@ -197,7 +197,7 @@ override_dh_auto_configure: prepare-custom-suexec $(patsubst %, mpm-%-maintainer
 override_dh_auto_build override_dh_auto_install:
 
 override_dh_install-arch:
-	$(MAKE) $(BUILDMAKEFLAGS) -f $(CURDIR)/debian/rules $(patsubst %, build-%, $(MPMS)) install-dev
+	$(MAKE) $(BUILDMAKEFLAGS) -f $(CURDIR)/debian/rules $(patsubst %, mpm-build-%, $(MPMS)) install-dev
 	for mpm in $(filter-out worker, $(MPMS)) ; do \
 		if ! diff -u $(BUILD_DIR)/$$mpm/mods.list $(BUILD_DIR)/worker/mods.list ; then \
 			echo Different modules built into httpd binaries, will not proceed ;\
@@ -298,4 +298,4 @@ override_dh_installlogrotate:
 override_dh_clean: $(patsubst %, undo-mpm-%-maintainer-scripts, $(MPMS))
 	dh_clean
 
-.PHONY: configure-% build-%-tree prepare-custom-suexec unapply-custom-suexec
+.PHONY: configure-% mpm-build-% prepare-custom-suexec unapply-custom-suexec

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