Here's the missing attachment.
diff -Nru libapache-mod-log-sql-1.100/debian/changelog libapache-mod-log-sql-1.100/debian/changelog
--- libapache-mod-log-sql-1.100/debian/changelog 2014-05-06 12:54:42.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/changelog 2015-05-30 16:58:15.000000000 +0200
@@ -1,3 +1,17 @@
+libapache-mod-log-sql (1.100-16.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Thomas Goirand ]
+ * Added debian/gbp.conf
+ * Switched to dh short style, and using dh-apache2 (build depend on it).
+
+ [ Jean-Michel Vourgère ]
+ * Dropped dependencies on obsolete apache2-mpm-* packages. (Closes: #717472).
+ * Removed references to apache 1.3 and 2.0 from package descriptions.
+
+ -- Jean-Michel Vourgère <nir...@debian.org> Sat, 30 May 2015 16:53:33 +0200
+
libapache-mod-log-sql (1.100-16) unstable; urgency=medium
* Patches configure script to search libdbi in a multiarch system
diff -Nru libapache-mod-log-sql-1.100/debian/control libapache-mod-log-sql-1.100/debian/control
--- libapache-mod-log-sql-1.100/debian/control 2014-05-06 12:53:51.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/control 2015-05-30 16:55:00.000000000 +0200
@@ -1,8 +1,9 @@
Source: libapache-mod-log-sql
Section: libs
Priority: optional
-Maintainer: Thomas Goirand <tho...@goirand.fr>
+Maintainer: Thomas Goirand <z...@debian.org>
Build-Depends: apache2-dev (>= 2.4),
+ dh-apache2,
autotools-dev,
debhelper (>= 9),
libdbi-dev,
@@ -13,13 +14,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 +32,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 +44,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 +56,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 -Nru libapache-mod-log-sql-1.100/debian/copyright libapache-mod-log-sql-1.100/debian/copyright
--- libapache-mod-log-sql-1.100/debian/copyright 2013-07-10 08:12:06.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/copyright 2015-05-30 16:38:31.000000000 +0200
@@ -52,7 +52,7 @@
2. You may apply bug fixes, portability fixes and other modifications derived
from the Public Domain or from the Copyright Holder. A Package modified in
such a way shall still be considered the Standard Version.
-
+ .
3. You may otherwise modify your copy of this Package in any way, provided
that you insert a prominent notice in each changed file stating how and when
you changed that file, and provided that you do at least ONE of the following:
diff -Nru libapache-mod-log-sql-1.100/debian/gbp.conf libapache-mod-log-sql-1.100/debian/gbp.conf
--- libapache-mod-log-sql-1.100/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/gbp.conf 2015-05-30 16:38:31.000000000 +0200
@@ -0,0 +1,7 @@
+[DEFAULT]
+upstream-branch = upstream-sid
+debian-branch = debian-sid
+upstream-tag = %(version)s
+
+[git-buildpackage]
+export-dir = ../build-area/
diff -Nru libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.apache2 libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.apache2
--- libapache-mod-log-sql-1.100/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-30 16:38:31.000000000 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql.so
+mod debian/log_sql.load
diff -Nru libapache-mod-log-sql-1.100/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/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-30 16:38:31.000000000 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql_dbi.so
+mod debian/log_sql_dbi.load
diff -Nru libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.links libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.links
--- libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.links 2012-02-28 19:32:57.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-dbi.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libapache2-mod-log-sql usr/share/doc/libapache2-mod-log-sql-dbi
diff -Nru libapache-mod-log-sql-1.100/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/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 -Nru libapache-mod-log-sql-1.100/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/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 -Nru libapache-mod-log-sql-1.100/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/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-30 16:38:31.000000000 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql_mysql.so
+mod debian/log_sql_mysql.load
diff -Nru libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.links libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.links
--- libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.links 2012-02-28 19:32:57.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-mysql.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libapache2-mod-log-sql usr/share/doc/libapache2-mod-log-sql-mysql
diff -Nru libapache-mod-log-sql-1.100/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/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 -Nru libapache-mod-log-sql-1.100/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/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 -Nru libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.postinst libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.postinst
--- libapache-mod-log-sql-1.100/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 -Nru libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.prerm libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql.prerm
--- libapache-mod-log-sql-1.100/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 -Nru libapache-mod-log-sql-1.100/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/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-30 16:38:31.000000000 +0200
@@ -0,0 +1,2 @@
+mod .libs/mod_log_sql_ssl.so
+mod debian/log_sql_ssl.load
diff -Nru libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.links libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.links
--- libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.links 2012-02-28 19:32:57.000000000 +0100
+++ libapache-mod-log-sql-1.100/debian/libapache2-mod-log-sql-ssl.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libapache2-mod-log-sql usr/share/doc/libapache2-mod-log-sql-ssl
diff -Nru libapache-mod-log-sql-1.100/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/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 -Nru libapache-mod-log-sql-1.100/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/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 -Nru libapache-mod-log-sql-1.100/debian/rules libapache-mod-log-sql-1.100/debian/rules
--- libapache-mod-log-sql-1.100/debian/rules 2014-05-06 12:56:16.000000000 +0200
+++ libapache-mod-log-sql-1.100/debian/rules 2015-05-30 16:45:28.000000000 +0200
@@ -1,11 +1,8 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --with apache2
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_MULTIARCH ?= $(dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -21,9 +18,7 @@
# Configure for libapache-mod-log-sql
# Note: no libapache-mod-log-sql-ssl currently because mod_ssl.h
# is not provided anywhere in the Debian distro (a bug repport has been filled)
-configure-libapache2-mod-log-sql-stamp:
- dh_testdir
- dh_autotools-dev_updateconfig
+override_dh_auto_configure:
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -33,59 +28,18 @@
--with-dbi=/usr \
--with-mysql=/usr \
--with-ssl-inc=/usr/include/apache2
- touch $@
-
-build-libapache2-mod-log-sql-stamp: configure-libapache2-mod-log-sql-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-build-arch: build
-build-indep: build
-
-build: build-stamp
-build-stamp: build-libapache2-mod-log-sql-stamp
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp liba2-stamp
+override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) clean
rm -f *.so
rm -f config.cache config.status config.log
rm -f Makefile config.h config.nice contrib/Makefile docs/Makefile stamp-h
- dh_autotools-dev_restoreconfig
+ dh_auto_clean
- dh_clean
+override_dh_auto_install:
+ echo "nothing to do..."
-install: build
- dh_testdir
- dh_testroot
- dh_prep
+override_dh_installdirs:
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
-
-binary-indep: build install
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG
- dh_install
- dh_installdocs
- dh_installman
- dh_installdebconf
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
