[SCM] Debian packaging of libdbd-mysql-perl branch, master, updated. debian/4.021-1-8-g5fe0c8f
Xavier
x.guimard at free.fr
Tue Oct 30 06:11:49 UTC 2012
The following commit has been merged in the master branch:
commit 5fe0c8fa79311f2981037f06675bbf44e224399f
Author: Xavier <x.guimard at free.fr>
Date: Tue Oct 30 07:11:16 2012 +0100
Adapt patches offsets
diff --git a/debian/changelog b/debian/changelog
index edb6d2d..874ce65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ libdbd-mysql-perl (4.022-1) UNRELEASED; urgency=low
TODO:
- in general, I'd suggest to wait with libdbd* uploads until after the
wheezy release
- - both patches apply with an offset
* New upstream release
* Bump Standards-Version to 3.9.4 (no changes).
@@ -11,6 +10,7 @@ libdbd-mysql-perl (4.022-1) UNRELEASED; urgency=low
>=1.612 since wheezy
* Correct copyright format error
* Add version dependency for libdbi-perl
+ * Adapt patches offsets
-- Xavier Guimard <x.guimard at free.fr> Sun, 28 Oct 2012 08:10:11 +0100
diff --git a/debian/patches/fix_pod_for_manpage b/debian/patches/fix_pod_for_manpage
index c40f038..04f9f68 100644
--- a/debian/patches/fix_pod_for_manpage
+++ b/debian/patches/fix_pod_for_manpage
@@ -8,7 +8,7 @@ Last-Update: 2012-05-07
--- a/lib/DBD/mysql.pm
+++ b/lib/DBD/mysql.pm
-@@ -1293,6 +1293,7 @@
+@@ -1295,6 +1295,7 @@
$bool_value = $dbh->{mysql_auto_reconnect};
$dbh->{mysql_auto_reconnect} = $AutoReconnect ? 1 : 0;
@@ -16,7 +16,7 @@ Last-Update: 2012-05-07
=item mysql_auto_reconnect
-@@ -1444,7 +1445,7 @@
+@@ -1446,7 +1447,7 @@
$dbh->{mysql_no_autocommit_cmd} = 1;
@@ -25,7 +25,7 @@ Last-Update: 2012-05-07
=head1 STATEMENT HANDLES
-@@ -1707,8 +1708,6 @@
+@@ -1709,8 +1710,6 @@
=back
diff --git a/debian/patches/fix_spelling b/debian/patches/fix_spelling
index ffc8077..110d453 100644
--- a/debian/patches/fix_spelling
+++ b/debian/patches/fix_spelling
@@ -7,7 +7,7 @@ Last-Update: 2011-05-14
--- a/lib/DBD/mysql.pm
+++ b/lib/DBD/mysql.pm
-@@ -1099,7 +1099,7 @@
+@@ -1101,7 +1101,7 @@
=item mysql_multi_statements
--
Debian packaging of libdbd-mysql-perl
More information about the Pkg-perl-cvs-commits
mailing list