updates for 2.4.1

6 files changed, 17 insertions, 17 deletions

diff --git a/debian/apache2-dev.install b/debian/apache2-dev.install
index 56d9c6ab..eaa2a168 100644
--- a/debian/apache2-dev.install
+++ b/debian/apache2-dev.install
@@ -1,5 +1,5 @@
 /usr/include/apache2
 /usr/share/apache2/build
-/usr/sbin/apxs				/usr/bin/
+/usr/bin/apxs
 debian/debhelper/dh_apache2		/usr/bin/
 debian/debhelper/apache2		/usr/share/debhelper/autoscripts/
diff --git a/debian/apache2-dev.manpages b/debian/apache2-dev.manpages
index 4be6c092..62937608 100644
--- a/debian/apache2-dev.manpages
+++ b/debian/apache2-dev.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man8/apxs.8
+debian/tmp/usr/share/man/man1/apxs.1
diff --git a/debian/apache2-utils.install b/debian/apache2-utils.install
index 7aaa198e..432170ad 100644
--- a/debian/apache2-utils.install
+++ b/debian/apache2-utils.install
@@ -1,13 +1,13 @@
-/usr/sbin/ab		/usr/bin
+/usr/bin/ab		/usr/bin
 /usr/sbin/fcgistarter	/usr/bin
-/usr/sbin/logresolve	/usr/bin
-/usr/sbin/htdbm		/usr/bin
-/usr/sbin/dbmmanage	/usr/bin
-/usr/sbin/htpasswd	/usr/bin
-/usr/sbin/htdigest	/usr/bin
+/usr/bin/logresolve	/usr/bin
+/usr/bin/htdbm		/usr/bin
+/usr/bin/dbmmanage	/usr/bin
+/usr/bin/htpasswd	/usr/bin
+/usr/bin/htdigest	/usr/bin
 /usr/sbin/rotatelogs	/usr/bin
 /usr/sbin/htcacheclean	/usr/bin
 /usr/sbin/checkgid	/usr/bin
-/usr/sbin/httxt2dbm	/usr/sbin
+/usr/bin/httxt2dbm	/usr/sbin
 support/check_forensic  /usr/sbin
 support/split-logfile	/usr/sbin
diff --git a/debian/apache2-utils.manpages b/debian/apache2-utils.manpages
index 2f4ae908..f6deeebc 100644
--- a/debian/apache2-utils.manpages
+++ b/debian/apache2-utils.manpages
@@ -1,7 +1,7 @@
-debian/tmp/usr/share/man/man8/logresolve.8
+debian/tmp/usr/share/man/man1/logresolve.1
 debian/tmp/usr/share/man/man8/htcacheclean.8
 debian/tmp/usr/share/man/man8/rotatelogs.8
-debian/tmp/usr/share/man/man8/ab.8
+debian/tmp/usr/share/man/man1/ab.1
 debian/tmp/usr/share/man/man1/htdigest.1
 debian/tmp/usr/share/man/man1/htdbm.1
 debian/tmp/usr/share/man/man1/htpasswd.1
diff --git a/debian/changelog b/debian/changelog
index aae2a432..d1af2edf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
+apache2 (2.4.1-1) experimental; urgency=low
 
   * Package the coming up 2.4 branch of Apache by packaging the current
-    development release 2.3.16.
+    release candidate 2.4.1.
     + Fix "IndexIgnore only allowes to add in vhost context, not replace"
      (Closes: #296886)
     + Fix "mod_status stats are wrong." (Closes: #519322)
diff --git a/debian/patches/201_build_suexec-custom b/debian/patches/201_build_suexec-custom
index fd2e33d0..1c94adb9 100644
--- a/debian/patches/201_build_suexec-custom
+++ b/debian/patches/201_build_suexec-custom
@@ -7,7 +7,7 @@
 @DPATCH@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -229,14 +229,16 @@
+@@ -237,14 +237,16 @@
  	fi
  
  install-suexec:
@@ -37,9 +37,9 @@
 -CLEAN_TARGETS = suexec
 +CLEAN_TARGETS = suexec-pristine suexec-custom
  
- PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
- TARGETS  = $(PROGRAMS)
-@@ -58,9 +58,13 @@
+ bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
+ sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
+@@ -65,9 +65,13 @@
  checkgid: $(checkgid_OBJECTS)
  	$(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD)