control: tags -1 patch
Hello Thomas
The obvious solution is to simply remove the 2 dependencies.
However, attached are 2 more intensive patches for apache2.4:
717472.control.diff is a small one that removes the obsolete
dependencies, but also remove references to apache 1.3 and apache 2.0 in
the control file, I mean the package description.
717472.dh_apache2.diff contains the previous patch but also contains the
use of dh_apache2 - already included within apache2-dev - that I think
you may want:
One of the basic idea behind the recent a2enmod changes is to preserve
the admin choice to disable a module by removing a symbolic links. Now
that action is memorized (internally somewhere in /var/lib/apache2/).
So the maintainer script must not call a2enmod dirrectly. You had a lot
of lintian warnings about that.
dh_apache2 is a nice wrapper that takes care of most of the work.
I created a 2-lines ".apache2" file per module, and added a dh_apache2
call in d/rules after dh_install.
This takes care of installing the .so and .load file in the current
location, and of the (pre|post)(rm|inst) scripts.
Additional information is available at:
https://wiki.debian.org/Apache/PackagingFor24
If you are using "patch -p 1" to apply, don't forget to remove the
"empty" files from the VCS. There are 15 of them.
I did not fully test the result. Only that the good files where copied
at the right location and that the maintscripts were there.
Enjoy! :)
--
Nirgal
--- libapache-mod-log-sql-1.100.NONMU/debian/control 2014-05-06 12:53:51.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/control 2015-05-28 14:20:01.013274217 +0200
@@ -13,13 +13,11 @@
Package: libapache2-mod-log-sql
Architecture: any
-Depends: apache2-mpm-prefork (>= 2.0.53) | apache2-mpm-itk,
- ${misc:Depends},
+Depends: ${misc:Depends},
${shlibs:Depends}
Recommends: perl
Description: Use SQL to store/write your Apache queries logs - Base
- mod_log_sql is a log module for Apache 1.3 and 2 which logs all requests to a
- database.
+ mod_log_sql is a log module for Apache which logs all requests to a database.
.
Base package.
.
@@ -33,12 +31,10 @@
${shlibs:Depends}
Recommends: libapache2-mod-log-sql-ssl
Description: Use SQL to store/write your Apache queries logs - MySQL interface
- mod_log_sql is a log module for Apache 1.3 and 2.0 which logs all requests to
- a MySQL database.
+ mod_log_sql is a log module for Apache which logs all requests to a MySQL
+ database.
.
MySQL interface.
- .
- Created for Apache 2. Use libapache-mod-log-sql-mysql for Apache 1.3.
Package: libapache2-mod-log-sql-dbi
Architecture: any
@@ -47,12 +43,10 @@
${shlibs:Depends}
Recommends: libapache2-mod-log-sql-ssl
Description: Use SQL to store/write your Apache queries logs - DBI interface
- mod_log_sql is a log module for Apache 1.3 and 2 which logs all requests to a
- MySQL database.
+ mod_log_sql is a log module for Apache 1which logs all requests to a MySQL
+ database.
.
DBI interface.
- .
- Created for Apache 2. Use libapache-mod-log-sql-dbi for Apache 1.3.
Package: libapache2-mod-log-sql-ssl
Architecture: any
@@ -61,7 +55,6 @@
${misc:Depends},
${shlibs:Depends}
Description: Use SQL to store/write your Apache queries logs - SSL extension
- mod_log_sql is a log module for Apache 1.3 and 2 which logs all requests to a
- database.
+ mod_log_sql is a log module for Apache which logs all requests to a database.
.
For logging SSL connection information (cipher, hash, etc.).
diff -Naur libapache-mod-log-sql-1.100.original/debian/control libapache-mod-log-sql-1.100/debian/control
--- libapache-mod-log-sql-1.100.original/debian/control 2014-05-06 12:53:51.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/control 2015-05-28 14:20:01.013274217 +0200
@@ -13,13 +13,11 @@
Package: libapache2-mod-log-sql
Architecture: any
-Depends: apache2-mpm-prefork (>= 2.0.53) | apache2-mpm-itk,
- ${misc:Depends},
+Depends: ${misc:Depends},
${shlibs:Depends}
Recommends: perl
Description: Use SQL to store/write your Apache queries logs - Base
- mod_log_sql is a log module for Apache 1.3 and 2 which logs all requests to a
- database.
+ mod_log_sql is a log module for Apache which logs all requests to a database.
.
Base package.
.
@@ -33,12 +31,10 @@
${shlibs:Depends}
Recommends: libapache2-mod-log-sql-ssl
Description: Use SQL to store/write your Apache queries logs - MySQL interface
- mod_log_sql is a log module for Apache 1.3 and 2.0 which logs all requests to
- a MySQL database.
+ mod_log_sql is a log module for Apache which logs all requests to a MySQL
+ database.
.
MySQL interface.
- .
- Created for Apache 2. Use libapache-mod-log-sql-mysql for Apache 1.3.
Package: libapache2-mod-log-sql-dbi
Architecture: any
@@ -47,12 +43,10 @@
${shlibs:Depends}
Recommends: libapache2-mod-log-sql-ssl
Description: Use SQL to store/write your Apache queries logs - DBI interface
- mod_log_sql is a log module for Apache 1.3 and 2 which logs all requests to a
- MySQL database.
+ mod_log_sql is a log module for Apache 1which logs all requests to a MySQL
+ database.
.
DBI interface.
- .
- Created for Apache 2. Use libapache-mod-log-sql-dbi for Apache 1.3.
Package: libapache2-mod-log-sql-ssl
Architecture: any
@@ -61,7 +55,6 @@
${misc:Depends},
${shlibs:Depends}
Description: Use SQL to store/write your Apache queries logs - SSL extension
- mod_log_sql is a log module for Apache 1.3 and 2 which logs all requests to a
- database.
+ mod_log_sql is a log module for Apache which logs all requests to a database.
.
For logging SSL connection information (cipher, hash, etc.).
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.apache2 libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.apache2
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.apache2 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.apache2 2015-05-28 14:32:32.985382611 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql.so
+mod debian/log_sql.load
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.apache2 libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.apache2
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.apache2 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.apache2 2015-05-28 14:29:13.144085634 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql_dbi.so
+mod debian/log_sql_dbi.load
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.dirs libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.dirs
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.dirs 2012-02-28 19:32:57.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/apache2/modules
-etc/apache2/mods-available
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.install libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.install
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.install 2013-07-10 07:48:42.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-.libs/mod_log_sql_dbi.so usr/lib/apache2/modules/
-debian/log_sql_dbi.load etc/apache2/mods-available/
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.postinst libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.postinst
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.postinst 2012-04-01 08:31:25.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- a2enmod log_sql_dbi || :
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.prerm libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.prerm
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-dbi.prerm 2012-04-01 08:30:46.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- a2dismod log_sql_dbi || :
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.dirs libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.dirs
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.dirs 2012-02-28 19:32:57.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.dirs 2015-05-28 14:31:54.108347052 +0200
@@ -1,3 +1 @@
usr/bin
-usr/lib/apache2/modules
-etc/apache2/mods-available
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.install libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.install
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.install 2013-07-10 07:48:42.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-.libs/mod_log_sql.so usr/lib/apache2/modules/
-debian/log_sql.load etc/apache2/mods-available/
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.apache2 libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.apache2
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.apache2 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.apache2 2015-05-28 14:33:50.279448613 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql_mysql.so
+mod debian/log_sql_mysql.load
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.dirs libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.dirs
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.dirs 2012-02-28 19:32:57.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/apache2/modules
-etc/apache2/mods-available
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.install libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.install
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.install 2013-07-10 07:48:42.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-.libs/mod_log_sql_mysql.so usr/lib/apache2/modules/
-debian/log_sql_mysql.load etc/apache2/mods-available/
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.postinst libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.postinst
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.postinst 2012-04-01 08:31:03.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- a2enmod log_sql_mysql || :
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.prerm libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.prerm
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-mysql.prerm 2012-04-01 08:31:32.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- a2dismod log_sql_mysql || :
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.postinst libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.postinst
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.postinst 2012-04-01 08:31:39.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- a2enmod log_sql || :
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- echo "Called with abort-upgrade|abort-remove|abort-deconfigure"
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.prerm libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.prerm
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql.prerm 2012-04-01 08:31:45.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- a2dismod log_sql || :
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.apache2 libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.apache2
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.apache2 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.apache2 2015-05-28 14:34:50.749071439 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql_ssl.so
+mod debian/log_sql_ssl.load
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.dirs libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.dirs
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.dirs 2012-02-28 19:32:57.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/apache2/modules
-etc/apache2/mods-available
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.install libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.install
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.install 2013-07-10 07:48:42.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-.libs/mod_log_sql_ssl.so usr/lib/apache2/modules/
-debian/log_sql_ssl.load etc/apache2/mods-available/
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.postinst libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.postinst
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.postinst 2012-04-01 08:31:52.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- a2enmod log_sql_ssl || :
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.prerm libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.prerm
--- libapache-mod-log-sql-1.100.original/debian/libapache2-mod-log-sql-ssl.prerm 2012-04-01 08:32:00.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- a2dismod log_sql_ssl || :
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Naur libapache-mod-log-sql-1.100.original/debian/rules libapache-mod-log-sql-1.100/debian/rules
--- libapache-mod-log-sql-1.100.original/debian/rules 2014-05-06 12:56:16.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/rules 2015-05-28 14:25:14.757698760 +0200
@@ -74,6 +74,7 @@
dh_testroot
dh_installchangelogs CHANGELOG
dh_install
+ dh_apache2
dh_installdocs
dh_installman
dh_installdebconf
