[SCM] Debian packaging of DBD-Firebird CPAN distribution branch, master, updated. debian/0.80-1
Damyan Ivanov
dmn at debian.org
Tue Oct 4 18:22:37 UTC 2011
The following commit has been merged in the master branch:
commit 6ad4c76f95be47539ed9ea48781707a17a97d39d
Author: Damyan Ivanov <dmn at debian.org>
Date: Tue Oct 4 21:10:39 2011 +0300
remove all patches (released upstream)
diff --git a/debian/patches/git-append-config-ccflags.patch b/debian/patches/git-append-config-ccflags.patch
deleted file mode 100644
index 254f1e1..0000000
--- a/debian/patches/git-append-config-ccflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit f2cf59cd734fb7563665d366fd1490ab876d3736
-Author: Damyan Ivanov <dmn at debian.org>
-Commit: Damyan Ivanov <dmn at debian.org>
-
- append $Config{ccflags} to CCFLAGS
-
- This makes it possible for binary distributions to rebuild the module
- if perl's $Config{ccflags} is changed for whatever reason. Without
- this appending, binary compatibility can't be guaranteed.
-
- http://bugs.debian.org/643038
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 63fbe28..f48e574 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -158,7 +158,7 @@ my %MakeParams = (
- VERSION_FROM => 'Firebird.pm', # finds $VERSION
- C => ['dbdimp.c'],
- H => [ 'dbdimp.h', 'Firebird.h' ],
-- CCFLAGS => '-Wall -fno-strict-aliasing',
-+ CCFLAGS => "-Wall -fno-strict-aliasing $Config{ccflags}",
- INC => qq(-I"$fb_INC" -I"$dbi_arch_dir"),
- OBJECT => "Firebird.o dbdimp.o",
- LIBS => [''],
diff --git a/debian/patches/git/fix-tests-skipping.patch b/debian/patches/git/fix-tests-skipping.patch
deleted file mode 100644
index 21e531e..0000000
--- a/debian/patches/git/fix-tests-skipping.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit f72d792657e40649640802f8df94ba3014110727
-Author: Damyan Ivanov <dmn at debian.org>
-Commit: Damyan Ivanov <dmn at debian.org>
-
- fix test skipping in t/75-utf8t and t/dbi-rowcount.t
-
-diff --git a/t/75-utf8.t b/t/75-utf8.t
-index f0db40d..db17993 100644
---- a/t/75-utf8.t
-+++ b/t/75-utf8.t
-@@ -16,12 +16,12 @@ use lib 't','.';
-
- use Encode qw(encode_utf8);
-
-+require 'tests-setup.pl';
-+
- eval "use Test::Exception; 1"
- or plan skip_all => 'Test::Exception needed for this test';
- plan tests => 37;
-
--require 'tests-setup.pl';
--
- my $rc = read_cached_configs();
-
- # first connect with charset ASCII
-diff --git a/t/dbi-rowcount.t b/t/dbi-rowcount.t
-index cf2ec7a..b4f79fe 100644
---- a/t/dbi-rowcount.t
-+++ b/t/dbi-rowcount.t
-@@ -6,7 +6,7 @@
-
- use strict;
- use warnings;
--use Test::More tests => 84;
-+use Test::More;
- use DBI;
- use vars qw($dbh $table);
-
-@@ -29,6 +29,8 @@ sub is_maybe_zbt {
-
- # == Test Initialization =========================================
-
-+plan tests => 84;
-+
- ($dbh) = connect_to_database({RaiseError => 1});
- pass("connect");
- $table = find_new_table($dbh);
diff --git a/debian/patches/git/gnukfreebsd-support.patch b/debian/patches/git/gnukfreebsd-support.patch
deleted file mode 100644
index a4ab52a..0000000
--- a/debian/patches/git/gnukfreebsd-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 45af8eee8bc0c4991608b6a04fe750b4762e1757
-Author: Damyan Ivanov <dmn at debian.org>
-Commit: Damyan Ivanov <dmn at debian.org>
-
- add support for 'gnukfreebsd' platform
-
- This is the FreeBSD kernel with GNU userland. For our needs, this is identical
- to 'freebsd' and 'linux'.
-
- Closes http://bugs.debian.org/643717
-
-diff --git a/Makefile.PL b/Makefile.PL
-index f48e574..c6b1d9d 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -217,6 +217,10 @@ SWITCH: {
- $MakeParams{LIBS} = "-L$fb_LIB -l$client_lib ";
- last SWITCH;
- };
-+ $os eq 'gnukfreebsd' && do {
-+ $MakeParams{LIBS} = "-L$fb_LIB -l$client_lib ";
-+ last SWITCH;
-+ };
- $os eq 'hpux' && do {
- $MakeParams{LIBS} = '-lgds -ldld';
- last SWITCH;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 20365bc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-git/fix-tests-skipping.patch
-git-append-config-ccflags.patch
-git/gnukfreebsd-support.patch
--
Debian packaging of DBD-Firebird CPAN distribution
More information about the Pkg-perl-cvs-commits
mailing list