[Pkg-apache-commits] r1118 - in /trunk/apache2: apache2-utils.install changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Sat Jan  9 12:26:19 2010
New Revision: 1118

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1118
Log:
Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061

Modified:
    trunk/apache2/apache2-utils.install
    trunk/apache2/changelog
    trunk/apache2/rules

Modified: trunk/apache2/apache2-utils.install
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2-utils.install?rev=1118&op=diff
==============================================================================
--- trunk/apache2/apache2-utils.install (original)
+++ trunk/apache2/apache2-utils.install Sat Jan  9 12:26:19 2010
@@ -1,5 +1,5 @@
-usr/sbin/ab
-usr/share/man/man8/ab.8
+usr/sbin/ab /usr/bin
+usr/share/man/man1/ab.1
 usr/sbin/checkgid
 usr/sbin/dbmmanage usr/bin/
 usr/share/man/man1/dbmmanage.1
@@ -9,8 +9,8 @@
 usr/share/man/man1/htdigest.1
 usr/sbin/htpasswd usr/bin/
 usr/share/man/man1/htpasswd.1
-usr/sbin/logresolve
-usr/share/man/man8/logresolve.8
+usr/sbin/logresolve /usr/bin
+usr/share/man/man1/logresolve.1
 usr/sbin/rotatelogs
 usr/share/man/man8/rotatelogs.8
 usr/sbin/htcacheclean

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1118&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Jan  9 12:26:19 2010
@@ -1,3 +1,9 @@
+apache2 (2.2.14-6) UNRELEASED; urgency=low
+
+  * Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 09 Jan 2010 13:11:11 +0100
+
 apache2 (2.2.14-5) unstable; urgency=low
 
   * Security: Further mitigation for the TLS renegotation attack

Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1118&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Sat Jan  9 12:26:19 2010
@@ -160,6 +160,9 @@
 	dh_testroot
 	cd $(BUILD)/worker ;\
 	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp install
+	for m in logresolve ab; do d=$(REALCURDIR)/debian/tmp/usr/share/man/ ;\
+	    perl -p -e 's/^([.]TH.*?) 8 (.*)/$$1 1 $$2/' < $$d/man8/$$m.8 > $$d/man1/$$m.1 ;\
+	done
 	ln -sf tmp debian/tmp-worker
 
 install-prefork: mpm-prefork