* Move Debian manpages to debian/manpages

* Install docs and directories apache2.2-common used to install in apache2 now

21 files changed, 11 insertions, 14 deletions

diff --git a/debian/old-apache2.2-common.links b/debian/apache2-bin.links
index e6ca51fc..e6ca51fc 100644
--- a/debian/old-apache2.2-common.links
+++ b/debian/apache2-bin.links
diff --git a/debian/apache2-bin.manpages b/debian/apache2-bin.manpages
index c5731e38..14ad0acf 100644
--- a/debian/apache2-bin.manpages
+++ b/debian/apache2-bin.manpages
@@ -1,4 +1,7 @@
-debian/apache2.8
-debian/apache2ctl.8
-debian/apachectl.8
-debian/httxt2dbm.8
+debian/manpages/apache2.8
+debian/manpages/apache2ctl.8
+debian/manpages/apachectl.8
+debian/manpages/httxt2dbm.8
+debian/manpages/a2enmod.8
+debian/manpages/a2dissite.8
+debian/manpages/a2dismod.8
diff --git a/debian/apache2-suexec-custom.manpages b/debian/apache2-suexec-custom.manpages
index 4d6f6df4..d80cdb59 100644
--- a/debian/apache2-suexec-custom.manpages
+++ b/debian/apache2-suexec-custom.manpages
@@ -1 +1 @@
-debian/suexec-custom.8
+debian/manpages/suexec-custom.8
diff --git a/debian/old-apache2.2-common.dirs b/debian/apache2.dirs
index 5fe7b363..5fe7b363 100644
--- a/debian/old-apache2.2-common.dirs
+++ b/debian/apache2.dirs
diff --git a/debian/old-apache2.2-bin.docs b/debian/apache2.docs
index 4f84bf90..4f84bf90 100644
--- a/debian/old-apache2.2-bin.docs
+++ b/debian/apache2.docs
diff --git a/debian/changelog b/debian/changelog
index 4df013a0..a4b8e8b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
 
   * Package the coming up 2.4 branch of Apache by packaging the current
     development release 2.3.16.
-  * Rewrite most parts of debian/rules.
+  * Rewrite most parts of debian/rules / debhelper configuration.
     + move cronjob and init script to debhelper configuration files
       (apache2.cron.daily and apache2.init respectively)
+    + move man pages to debian/manpages
   * Refactor binary packages, now as things simplified. MPMs are simple
     modules now, they can be bundled into the same binary package which do not
     need to conflict with each other. Thus, Apache now primarily consists of the
@@ -32,7 +33,7 @@ apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
     This change is transparent to users at runtime and does not need any
     configuration changes.
 
- -- Arno Töll <debian@toell.net>  Tue, 17 Jan 2012 02:03:52 +0100
+ -- Arno Töll <debian@toell.net>  Tue, 17 Jan 2012 02:58:05 +0100
 
 apache2 (2.2.21-6) UNRELEASED; urgency=low
 
diff --git a/debian/a2dismod.8 b/debian/manpages/a2dismod.8
index 302eac1b..302eac1b 100644
--- a/debian/a2dismod.8
+++ b/debian/manpages/a2dismod.8
diff --git a/debian/a2dissite.8 b/debian/manpages/a2dissite.8
index dfe1f1e9..dfe1f1e9 100644
--- a/debian/a2dissite.8
+++ b/debian/manpages/a2dissite.8
diff --git a/debian/a2enmod.8 b/debian/manpages/a2enmod.8
index 2ad11ddc..2ad11ddc 100644
--- a/debian/a2enmod.8
+++ b/debian/manpages/a2enmod.8
diff --git a/debian/a2ensite.8 b/debian/manpages/a2ensite.8
index 2c2c63b5..2c2c63b5 100644
--- a/debian/a2ensite.8
+++ b/debian/manpages/a2ensite.8
diff --git a/debian/apache2.8 b/debian/manpages/apache2.8
index 5c2a91ab..5c2a91ab 100644
--- a/debian/apache2.8
+++ b/debian/manpages/apache2.8
diff --git a/debian/apache2ctl.8 b/debian/manpages/apache2ctl.8
index fd05aa01..fd05aa01 100644
--- a/debian/apache2ctl.8
+++ b/debian/manpages/apache2ctl.8
diff --git a/debian/apachectl.8 b/debian/manpages/apachectl.8
index f80e645d..f80e645d 100644
--- a/debian/apachectl.8
+++ b/debian/manpages/apachectl.8
diff --git a/debian/check_forensic.8 b/debian/manpages/check_forensic.8
index 6771a9e2..6771a9e2 100644
--- a/debian/check_forensic.8
+++ b/debian/manpages/check_forensic.8
diff --git a/debian/checkgid.8 b/debian/manpages/checkgid.8
index a0b74922..a0b74922 100644
--- a/debian/checkgid.8
+++ b/debian/manpages/checkgid.8
diff --git a/debian/httxt2dbm.8 b/debian/manpages/httxt2dbm.8
index 74dd5670..74dd5670 100644
--- a/debian/httxt2dbm.8
+++ b/debian/manpages/httxt2dbm.8
diff --git a/debian/split-logfile.8 b/debian/manpages/split-logfile.8
index b4879f93..b4879f93 100644
--- a/debian/split-logfile.8
+++ b/debian/manpages/split-logfile.8
diff --git a/debian/suexec-custom.8 b/debian/manpages/suexec-custom.8
index 8f1477c9..8f1477c9 100644
--- a/debian/suexec-custom.8
+++ b/debian/manpages/suexec-custom.8
diff --git a/debian/old-apache2.2-bin.dirs b/debian/old-apache2.2-bin.dirs
deleted file mode 100644
index 57ced466..00000000
--- a/debian/old-apache2.2-bin.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/apache2/mpm-worker
-usr/lib/apache2/mpm-prefork
-usr/lib/apache2/mpm-event
-usr/lib/apache2/mpm-itk
diff --git a/debian/old-apache2.2-bin.install b/debian/old-apache2.2-bin.install
deleted file mode 100644
index c5638cab..00000000
--- a/debian/old-apache2.2-bin.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/apache2/modules
-usr/sbin/httxt2dbm
diff --git a/debian/old-apache2.2-bin.manpages b/debian/old-apache2.2-bin.manpages
deleted file mode 100644
index b5db557b..00000000
--- a/debian/old-apache2.2-bin.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/httxt2dbm.8