Your message dated Fri, 24 May 2013 07:21:37 +0300
with message-id <[email protected]>
and subject line Bug#664433 Close bts:debian
has caused the Debian Bug report #664433,
regarding [PATCH] libapache-mod-log-sql: Helping to update to packaging format
3.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
664433: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664433
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: libapache-mod-log-sql
Severity: wishlist
Tags: patch
Hi Thomas,
As we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From 7bc3fdcf122949ffe87e8d93fc152c8660c4051b Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 15:15:23 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
...od_log_sql.c.dpatch => 001-mod_log_sql.c.patch} | 11 ++++-------
...od_log_sql.h.dpatch => 002-mod_log_sql.h.patch} | 11 ++++-------
...ql_dbi.c.dpatch => 003-mod_log_sql_dbi.c.patch} | 11 ++++-------
...ysql.c.dpatch => 004-mod_log_sql_mysql.c.patch} | 11 ++++-------
...gsql.c.dpatch => 005-mod_log_sql_pgsql.c.patch} | 11 ++++-------
...06-Makefile.in.dpatch => 006-Makefile.in.patch} | 7 ++-----
...h => 007-mod_log_sql.c_funny-table-names.patch} | 9 +++------
...dpatch => 008-create_tables.sql_adds-doc.patch} | 7 ++-----
debian/patches/00list | 7 -------
debian/patches/series | 7 +++++++
debian/rules | 5 ++---
debian/source/format | 1 +
15 files changed, 48 insertions(+), 64 deletions(-)
rename debian/patches/{001-mod_log_sql.c.dpatch => 001-mod_log_sql.c.patch} (95%)
rename debian/patches/{002-mod_log_sql.h.dpatch => 002-mod_log_sql.h.patch} (74%)
rename debian/patches/{003-mod_log_sql_dbi.c.dpatch => 003-mod_log_sql_dbi.c.patch} (73%)
rename debian/patches/{004-mod_log_sql_mysql.c.dpatch => 004-mod_log_sql_mysql.c.patch} (74%)
rename debian/patches/{005-mod_log_sql_pgsql.c.dpatch => 005-mod_log_sql_pgsql.c.patch} (74%)
rename debian/patches/{006-Makefile.in.dpatch => 006-Makefile.in.patch} (76%)
rename debian/patches/{007-mod_log_sql.c_funny-table-names.dpatch => 007-mod_log_sql.c_funny-table-names.patch} (89%)
rename debian/patches/{008-create_tables.sql_adds-doc.dpatch => 008-create_tables.sql_adds-doc.patch} (88%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 96df5ed..050e9ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
+
+ -- Jari Aalto <[email protected]> Tue, 28 Feb 2012 14:26:58 -0500
+
libapache-mod-log-sql (1.100-14.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 956f098..ebfd522 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: libapache-mod-log-sql
Priority: optional
Maintainer: Thomas Goirand <[email protected]>
-Build-Depends: debhelper (>= 4), autotools-dev, libmysqlclient15-dev | libmysqlclient12-dev | libmysqlclient-dev, apache2-prefork-dev (>= 2.0.53), libdbi-dev, dpatch, libssl-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), autotools-dev, libmysqlclient15-dev | libmysqlclient12-dev | libmysqlclient-dev, apache2-prefork-dev (>= 2.0.53), libdbi-dev, libssl-dev
+Standards-Version: 3.9.3
Section: libs
Homepage: http://www.outoforder.cc/projects/apache/mod_log_sql/
diff --git a/debian/patches/001-mod_log_sql.c.dpatch b/debian/patches/001-mod_log_sql.c.patch
similarity index 95%
rename from debian/patches/001-mod_log_sql.c.dpatch
rename to debian/patches/001-mod_log_sql.c.patch
index 1c1634b..0153462 100644
--- a/debian/patches/001-mod_log_sql.c.dpatch
+++ b/debian/patches/001-mod_log_sql.c.patch
@@ -1,11 +1,8 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 001-mod_log_sql.c.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: This patch adds a scoreboard feature to mod_log_sql, so you
-## DP: can keep tracks of number of hits and bytes for each of the
-## DP: hosted websites.
+From: Thomas Goirand <[email protected]>
+Subject: Add a scoreboard feature to mod_log_sql
+ You can keep tracks of number of hits and bytes for each of the
+ hosted websites.
-@DPATCH@
--- libapache-mod-log-sql/mod_log_sql.c.orig 2007-08-06 00:03:47.000000000 +0800
+++ libapache-mod-log-sql/mod_log_sql.c 2007-08-06 00:52:46.000000000 +0800
@@ -37,6 +37,11 @@
diff --git a/debian/patches/002-mod_log_sql.h.dpatch b/debian/patches/002-mod_log_sql.h.patch
similarity index 74%
rename from debian/patches/002-mod_log_sql.h.dpatch
rename to debian/patches/002-mod_log_sql.h.patch
index 60325a5..a0ffa67 100644
--- a/debian/patches/002-mod_log_sql.h.dpatch
+++ b/debian/patches/002-mod_log_sql.h.patch
@@ -1,11 +1,8 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 002-mod_log_sql.h.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: This patch adds a scoreboard feature to mod_log_sql, so you
-## DP: can keep tracks of number of hits and bytes for each of the
-## DP: hosted websites.
+From: Thomas Goirand <[email protected]>
+Subject: Add a scoreboard feature to mod_log_sql
+ You can keep tracks of number of hits and bytes for each of the
+ hosted websites.
-@DPATCH@
--- libapache-mod-log-sql/mod_log_sql.h.orig 2007-08-06 00:03:47.000000000 +0800
+++ libapache-mod-log-sql/mod_log_sql.h 2007-08-06 00:52:49.000000000 +0800
@@ -67,7 +67,8 @@
diff --git a/debian/patches/003-mod_log_sql_dbi.c.dpatch b/debian/patches/003-mod_log_sql_dbi.c.patch
similarity index 73%
rename from debian/patches/003-mod_log_sql_dbi.c.dpatch
rename to debian/patches/003-mod_log_sql_dbi.c.patch
index 5eb2afb..93f918e 100644
--- a/debian/patches/003-mod_log_sql_dbi.c.dpatch
+++ b/debian/patches/003-mod_log_sql_dbi.c.patch
@@ -1,11 +1,8 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 003-mod_log_sql_dbi.c.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: This patch adds a scoreboard feature to mod_log_sql, so you
-## DP: can keep tracks of number of hits and bytes for each of the
-## DP: hosted websites.
+From: Thomas Goirand <[email protected]>
+Subject: Add a scoreboard feature to mod_log_sql
+ You can keep tracks of number of hits and bytes for each of the
+ hosted websites.
-@DPATCH@
--- libapache-mod-log-sql/mod_log_sql_dbi.c.orig 2007-08-06 00:55:18.000000000 +0800
+++ libapache-mod-log-sql/mod_log_sql_dbi.c 2007-08-06 00:53:04.000000000 +0800
@@ -219,6 +219,10 @@
diff --git a/debian/patches/004-mod_log_sql_mysql.c.dpatch b/debian/patches/004-mod_log_sql_mysql.c.patch
similarity index 74%
rename from debian/patches/004-mod_log_sql_mysql.c.dpatch
rename to debian/patches/004-mod_log_sql_mysql.c.patch
index 99eb68c..1ddb366 100644
--- a/debian/patches/004-mod_log_sql_mysql.c.dpatch
+++ b/debian/patches/004-mod_log_sql_mysql.c.patch
@@ -1,11 +1,8 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 004-mod_log_sql_mysql.h.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: This patch adds a scoreboard feature to mod_log_sql, so you
-## DP: can keep tracks of number of hits and bytes for each of the
-## DP: hosted websites.
+From: Thomas Goirand <[email protected]>
+Subject: Add a scoreboard feature to mod_log_sql
+ You can keep tracks of number of hits and bytes for each of the
+ hosted websites.
-@DPATCH@
--- libapache-mod-log-sql/mod_log_sql_mysql.c.orig 2007-08-06 00:55:32.000000000 +0800
+++ libapache-mod-log-sql/mod_log_sql_mysql.c 2007-08-06 00:52:59.000000000 +0800
@@ -250,6 +250,10 @@
diff --git a/debian/patches/005-mod_log_sql_pgsql.c.dpatch b/debian/patches/005-mod_log_sql_pgsql.c.patch
similarity index 74%
rename from debian/patches/005-mod_log_sql_pgsql.c.dpatch
rename to debian/patches/005-mod_log_sql_pgsql.c.patch
index 8533906..5e539e2 100644
--- a/debian/patches/005-mod_log_sql_pgsql.c.dpatch
+++ b/debian/patches/005-mod_log_sql_pgsql.c.patch
@@ -1,11 +1,8 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 005-mod_log_sql_pgsql.c.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: This patch adds a scoreboard feature to mod_log_sql, so you
-## DP: can keep tracks of number of hits and bytes for each of the
-## DP: hosted websites.
+From: Thomas Goirand <[email protected]>
+Subject: Add a scoreboard feature to mod_log_sql
+ You can keep tracks of number of hits and bytes for each of the
+ hosted websites.
-@DPATCH@
--- libapache-mod-log-sql/mod_log_sql_pgsql.c.orig 2007-08-06 00:55:44.000000000 +0800
+++ libapache-mod-log-sql/mod_log_sql_pgsql.c 2007-08-06 00:52:55.000000000 +0800
@@ -235,6 +235,10 @@
diff --git a/debian/patches/006-Makefile.in.dpatch b/debian/patches/006-Makefile.in.patch
similarity index 76%
rename from debian/patches/006-Makefile.in.dpatch
rename to debian/patches/006-Makefile.in.patch
index 2d112a6..8e6a6aa 100644
--- a/debian/patches/006-Makefile.in.dpatch
+++ b/debian/patches/006-Makefile.in.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 003-Makefile.in.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: Make it compile for debian
+From: Thomas Goirand <[email protected]>
+Subject: Make it compile for debian
-@DPATCH@
--- mod_log_sql-1.100/Makefile.in 2005-01-12 06:00:10.000000000 +0800
+++ libapache-mod-log-sql-cvs/Makefile.in 2006-08-26 13:27:08.000000000 +0800
@@ -176,8 +176,8 @@
diff --git a/debian/patches/007-mod_log_sql.c_funny-table-names.dpatch b/debian/patches/007-mod_log_sql.c_funny-table-names.patch
similarity index 89%
rename from debian/patches/007-mod_log_sql.c_funny-table-names.dpatch
rename to debian/patches/007-mod_log_sql.c_funny-table-names.patch
index 268643f..9b6f04a 100644
--- a/debian/patches/007-mod_log_sql.c_funny-table-names.dpatch
+++ b/debian/patches/007-mod_log_sql.c_funny-table-names.patch
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 007-mod_log_sql.c_funny-table-names.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: This patch adds the possibility to use any kind of names for
-## DP: the table names by escaping it when calling SQL.
+From: Thomas Goirand <[email protected]>
+Subject: Add the possibility to use any kind of names for the table names
+ by escaping it when calling SQL.
-@DPATCH@
--- libapache-mod-log-sql-1.100/mod_log_sql.c.orig 2008-04-23 04:58:51.000000000 +0000
+++ libapache-mod-log-sql-1.100/mod_log_sql.c 2008-04-23 04:58:53.000000000 +0000
@@ -931,7 +931,7 @@
diff --git a/debian/patches/008-create_tables.sql_adds-doc.dpatch b/debian/patches/008-create_tables.sql_adds-doc.patch
similarity index 88%
rename from debian/patches/008-create_tables.sql_adds-doc.dpatch
rename to debian/patches/008-create_tables.sql_adds-doc.patch
index c41f7e4..39ff336 100644
--- a/debian/patches/008-create_tables.sql_adds-doc.dpatch
+++ b/debian/patches/008-create_tables.sql_adds-doc.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 003-Makefile.in.dpatch by Thomas Goirand <[email protected]>
-##
-## DP: Documents the score_board table format
+From: Thomas Goirand <[email protected]>
+Subject: Documents the score_board table format
-@DPATCH@
--- mod_log_sql-1.100/contrib/create_tables.sql 2005-01-11 22:00:11.000000000 +0000
+++ ../libapache-mod-log-sql-1.100/contrib/create_tables.sql 2008-09-24 08:21:59.000000000 +0000
@@ -49,3 +49,24 @@
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c94ad65..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-001-mod_log_sql.c.dpatch
-002-mod_log_sql.h.dpatch
-003-mod_log_sql_dbi.c.dpatch
-004-mod_log_sql_mysql.c.dpatch
-005-mod_log_sql_pgsql.c.dpatch
-006-Makefile.in.dpatch
-008-create_tables.sql_adds-doc.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..41b2322
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+001-mod_log_sql.c.patch
+002-mod_log_sql.h.patch
+003-mod_log_sql_dbi.c.patch
+004-mod_log_sql_mysql.c.patch
+005-mod_log_sql_pgsql.c.patch
+006-Makefile.in.patch
+008-create_tables.sql_adds-doc.patch
diff --git a/debian/rules b/debian/rules
index eb7ba9a..6347430 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -21,7 +20,7 @@ endif
# 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: patch-stamp
+configure-libapache2-mod-log-sql-stamp:
dh_testdir
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
@@ -42,7 +41,7 @@ build: build-stamp
build-stamp: build-libapache2-mod-log-sql-stamp
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp liba2-stamp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
--- End Message ---
--- Begin Message ---
Package: libapache-mod-log-sql
Version: 1.100-14.2
Reason for close:
Hi Thomas. I'm closing this bug as it was handled in 2012 upload.
The debian/chnagelog was just missing the "Closed:" line.
--- End Message ---
