2012-03-22 18:10 Thomas Goirand <[email protected]>: | | > If you still think that 8 is more appropriate, please confirm and I'll | > update accordingly. | | No, it's ok, please go ahead.
Uploaded. I also included few lintian fixes (see attachment). Aternatively download the full archive with all changes. Thanks, Jari W: libapache-mod-log-sql source: debhelper-but-no-misc-depends libapache2-mod-log-sql-ssl W: libapache-mod-log-sql source: debhelper-but-no-misc-depends libapache2-mod-log-sql W: libapache-mod-log-sql source: debhelper-but-no-misc-depends libapache2-mod-log-sql-mysql W: libapache-mod-log-sql source: debhelper-but-no-misc-depends libapache2-mod-log-sql-dbi W: libapache-mod-log-sql source: dh-clean-k-is-deprecated W: libapache-mod-log-sql source: debian-rules-missing-recommended-target build-arch W: libapache-mod-log-sql source: debian-rules-missing-recommended-target build-indep W: libapache2-mod-log-sql-ssl: spelling-error-in-description informations information W: libapache2-mod-log-sql-ssl: command-with-path-in-maintainer-script prerm:7 /bin/true W: libapache2-mod-log-sql-ssl: command-with-path-in-maintainer-script postinst:7 /bin/true I: libapache2-mod-log-sql-mysql: capitalization-error-in-description apache Apache W: libapache2-mod-log-sql-mysql: command-with-path-in-maintainer-script prerm:7 /bin/true W: libapache2-mod-log-sql-mysql: command-with-path-in-maintainer-script postinst:7 /bin/true I: libapache2-mod-log-sql-dbi: capitalization-error-in-description apache Apache W: libapache2-mod-log-sql-dbi: command-with-path-in-maintainer-script prerm:7 /bin/true W: libapache2-mod-log-sql-dbi: command-with-path-in-maintainer-script postinst:7 /bin/true I: libapache2-mod-log-sql: capitalization-error-in-description apache Apache W: libapache2-mod-log-sql: command-with-path-in-maintainer-script prerm:7 /bin/true W: libapache2-mod-log-sql: command-with-path-in-maintainer-script postinst:7 /bin/true
>From 4c0669d491424f050625b39a10160f2f00b8161f Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Sun, 1 Apr 2012 09:34:16 +0300 Subject: [PATCH] lintian Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/changelog | 6 +++++- debian/control | 24 ++++++++++++------------ debian/libapache2-mod-log-sql-dbi.postinst | 2 +- debian/libapache2-mod-log-sql-dbi.prerm | 2 +- debian/libapache2-mod-log-sql-mysql.postinst | 2 +- debian/libapache2-mod-log-sql-mysql.prerm | 2 +- debian/libapache2-mod-log-sql-ssl.postinst | 2 +- debian/libapache2-mod-log-sql-ssl.prerm | 2 +- debian/libapache2-mod-log-sql.postinst | 2 +- debian/libapache2-mod-log-sql.prerm | 2 +- debian/rules | 5 ++++- 11 files changed, 29 insertions(+), 22 deletions(-) mode change 100644 => 100755 debian/libapache2-mod-log-sql-dbi.postinst mode change 100644 => 100755 debian/libapache2-mod-log-sql-dbi.prerm mode change 100644 => 100755 debian/libapache2-mod-log-sql-mysql.postinst mode change 100644 => 100755 debian/libapache2-mod-log-sql-mysql.prerm mode change 100644 => 100755 debian/libapache2-mod-log-sql-ssl.postinst mode change 100644 => 100755 debian/libapache2-mod-log-sql-ssl.prerm mode change 100644 => 100755 debian/libapache2-mod-log-sql.postinst mode change 100644 => 100755 debian/libapache2-mod-log-sql.prerm diff --git a/debian/changelog b/debian/changelog index 050e9ac..8ce1f2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,12 @@ libapache-mod-log-sql (1.100-14.2) unstable; urgency=low * Non-maintainer upload. * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". * Update to Standards-Version to 3.9.3 and debhelper to 9. + * Add ${misc:Depends} and correct spelling of "Apache" in control file. + * Add build-arch and build-indep targets; use dh_prep in rules file. + * Correct Lintian command-with-path-in-maintainer-script by using + standards ":" shell operator instead of /bin/true in *.{post*,pre*}. - -- Jari Aalto <[email protected]> Tue, 28 Feb 2012 14:26:58 -0500 + -- Jari Aalto <[email protected]> Sun, 01 Apr 2012 09:33:46 +0300 libapache-mod-log-sql (1.100-14.1) unstable; urgency=low diff --git a/debian/control b/debian/control index ebfd522..7053baa 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Homepage: http://www.outoforder.cc/projects/apache/mod_log_sql/ Package: libapache2-mod-log-sql Architecture: any -Depends: ${shlibs:Depends}, apache2-mpm-prefork (>= 2.0.53) | apache2-mpm-itk +Depends: ${misc:Depends}, ${shlibs:Depends}, apache2-mpm-prefork (>= 2.0.53) | apache2-mpm-itk Recommends: perl -Description: Use SQL to store/write your apache queries logs - Base +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. . @@ -19,37 +19,37 @@ Description: Use SQL to store/write your apache queries logs - Base If you want to use make_combined_log and mysql_import_combined_log scripts you will need installed perl package. . - Created for apache 2. Use libapache-mod-log-sql for apache 1.3. + Created for Apache 2. Use libapache-mod-log-sql for Apache 1.3. Package: libapache2-mod-log-sql-mysql Architecture: any -Depends: ${shlibs:Depends}, libapache2-mod-log-sql (= ${binary:Version}) +Depends: ${misc:Depends}, ${shlibs:Depends}, libapache2-mod-log-sql (= ${binary:Version}) Recommends: libapache2-mod-log-sql-ssl -Description: Use SQL to store/write your apache queries logs - MySQL interface +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. . MySQL interface. . - Created for apache 2. Use libapache-mod-log-sql-mysql for apache-1.3. + Created for Apache 2. Use libapache-mod-log-sql-mysql for Apache 1.3. Package: libapache2-mod-log-sql-dbi Architecture: any -Depends: ${shlibs:Depends}, libapache2-mod-log-sql (= ${binary:Version}) +Depends: ${misc:Depends}, ${shlibs:Depends}, libapache2-mod-log-sql (= ${binary:Version}) Recommends: libapache2-mod-log-sql-ssl -Description: Use SQL to store/write your apache queries logs - DBI interface +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. . DBI interface. . - Created for apache 2. Use libapache-mod-log-sql-dbi for apache-1.3. + Created for Apache 2. Use libapache-mod-log-sql-dbi for Apache 1.3. Package: libapache2-mod-log-sql-ssl Architecture: any -Depends: ${shlibs:Depends}, libapache2-mod-log-sql (= ${binary:Version}), libapache2-mod-log-sql-mysql (= ${binary:Version}) | libapache2-mod-log-sql-dbi (= ${binary:Version}) -Description: Use SQL to store/write your apache queries logs - SSL extension +Depends: ${misc:Depends}, ${shlibs:Depends}, libapache2-mod-log-sql (= ${binary:Version}), libapache2-mod-log-sql-mysql (= ${binary:Version}) | libapache2-mod-log-sql-dbi (= ${binary:Version}) +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. . - For logging SSL connection informations (cipher, hash, etc.). + For logging SSL connection information (cipher, hash, etc.). diff --git a/debian/libapache2-mod-log-sql-dbi.postinst b/debian/libapache2-mod-log-sql-dbi.postinst old mode 100644 new mode 100755 index a84cc72..9099fb4 --- a/debian/libapache2-mod-log-sql-dbi.postinst +++ b/debian/libapache2-mod-log-sql-dbi.postinst @@ -4,7 +4,7 @@ set -e case "$1" in configure) - a2enmod log_sql_dbi || /bin/true + a2enmod log_sql_dbi || : ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libapache2-mod-log-sql-dbi.prerm b/debian/libapache2-mod-log-sql-dbi.prerm old mode 100644 new mode 100755 index c86c0a6..42856b8 --- a/debian/libapache2-mod-log-sql-dbi.prerm +++ b/debian/libapache2-mod-log-sql-dbi.prerm @@ -4,7 +4,7 @@ set -e case "$1" in remove|upgrade|deconfigure) - a2dismod log_sql_dbi || /bin/true + a2dismod log_sql_dbi || : ;; failed-upgrade) diff --git a/debian/libapache2-mod-log-sql-mysql.postinst b/debian/libapache2-mod-log-sql-mysql.postinst old mode 100644 new mode 100755 index fe473ae..2fd85ee --- a/debian/libapache2-mod-log-sql-mysql.postinst +++ b/debian/libapache2-mod-log-sql-mysql.postinst @@ -4,7 +4,7 @@ set -e case "$1" in configure) - a2enmod log_sql_mysql || /bin/true + a2enmod log_sql_mysql || : ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libapache2-mod-log-sql-mysql.prerm b/debian/libapache2-mod-log-sql-mysql.prerm old mode 100644 new mode 100755 index be8b8c9..4114e55 --- a/debian/libapache2-mod-log-sql-mysql.prerm +++ b/debian/libapache2-mod-log-sql-mysql.prerm @@ -4,7 +4,7 @@ set -e case "$1" in remove|upgrade|deconfigure) - a2dismod log_sql_mysql || /bin/true + a2dismod log_sql_mysql || : ;; failed-upgrade) diff --git a/debian/libapache2-mod-log-sql-ssl.postinst b/debian/libapache2-mod-log-sql-ssl.postinst old mode 100644 new mode 100755 index ee0606c..3d09e3b --- a/debian/libapache2-mod-log-sql-ssl.postinst +++ b/debian/libapache2-mod-log-sql-ssl.postinst @@ -4,7 +4,7 @@ set -e case "$1" in configure) - a2enmod log_sql_ssl || /bin/true + a2enmod log_sql_ssl || : ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libapache2-mod-log-sql-ssl.prerm b/debian/libapache2-mod-log-sql-ssl.prerm old mode 100644 new mode 100755 index d64d784..ac9d501 --- a/debian/libapache2-mod-log-sql-ssl.prerm +++ b/debian/libapache2-mod-log-sql-ssl.prerm @@ -4,7 +4,7 @@ set -e case "$1" in remove|upgrade|deconfigure) - a2dismod log_sql_ssl || /bin/true + a2dismod log_sql_ssl || : ;; failed-upgrade) diff --git a/debian/libapache2-mod-log-sql.postinst b/debian/libapache2-mod-log-sql.postinst old mode 100644 new mode 100755 index c736681..1893a6d --- a/debian/libapache2-mod-log-sql.postinst +++ b/debian/libapache2-mod-log-sql.postinst @@ -4,7 +4,7 @@ set -e case "$1" in configure) - a2enmod log_sql || /bin/true + a2enmod log_sql || : ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libapache2-mod-log-sql.prerm b/debian/libapache2-mod-log-sql.prerm old mode 100644 new mode 100755 index 682d738..6c55400 --- a/debian/libapache2-mod-log-sql.prerm +++ b/debian/libapache2-mod-log-sql.prerm @@ -4,7 +4,7 @@ set -e case "$1" in remove|upgrade|deconfigure) - a2dismod log_sql || /bin/true + a2dismod log_sql || : ;; failed-upgrade) diff --git a/debian/rules b/debian/rules index 6347430..da5423d 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,9 @@ build-libapache2-mod-log-sql-stamp: configure-libapache2-mod-log-sql-stamp $(MAKE) touch $@ +build-arch: build +build-indep: build + build: build-stamp build-stamp: build-libapache2-mod-log-sql-stamp touch $@ @@ -56,7 +59,7 @@ clean: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs -A install -m 0755 contrib/make_combined_log.pl debian/libapache2-mod-log-sql/usr/bin/make_combined_log2 install -m 0755 contrib/mysql_import_combined_log.pl debian/libapache2-mod-log-sql/usr/bin/mysql_import_combined_log2 -- 1.7.9.1
