[SCM] branch, master, updated. debian/0.45-1-7-g7f0c701
Harlan Lieberman-Berg
H.LiebermanBerg at gmail.com
Fri Oct 19 22:24:45 UTC 2012
The following commit has been merged in the master branch:
commit e677b4d56773e13c7323c3aa3cecfe22cf547ecd
Author: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
Date: Fri Oct 19 15:33:37 2012 -0400
Remove spelling.patch applied upstream. Refresh 5.14-ccflags.patch.
diff --git a/debian/patches/5.14-ccflags.patch b/debian/patches/5.14-ccflags.patch
index 8178298..364af82 100644
--- a/debian/patches/5.14-ccflags.patch
+++ b/debian/patches/5.14-ccflags.patch
@@ -15,14 +15,14 @@ Last-Update: 2011-09-23
package Module::Install::PRIVATE::Mongo;
-@@ -17,6 +18,10 @@
- my ($self, @mongo_vars) = @_;
+@@ -18,6 +19,10 @@
my $custom_cflags = 0;
my $ccflags = $self->makemaker_args->{CCFLAGS};
-+
+
+ # #638894
+ $ccflags .= " $Config{ccflags}");
+ $custom_cflags = 1;
-
++
if ($Config{osname} eq 'darwin') {
my @arch = $Config::Config{ccflags} =~ m/-arch\s+(\S+)/g;
+ my $archStr = join '', map { " -arch $_ " } @arch;
diff --git a/debian/patches/series b/debian/patches/series
index 02aa422..9fd7c6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
5.14-ccflags.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index db136de..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: fix a spelling mistake
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=71195
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=71195
-Author: gregor herrmann <gregoa at debian.org>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-09-23
-Applied-Upstream: *** FIXME ***
-
---- a/lib/MongoDB/Collection.pm
-+++ b/lib/MongoDB/Collection.pm
-@@ -454,7 +454,7 @@
- $collection->ensure_index({"foo" => 1, "bar" => -1}, { unique => true });
-
- Makes sure the given C<$keys> of this collection are indexed. C<$keys> can be an
--array reference, hash reference, or C<Tie::IxHash>. C<Tie::IxHash> is prefered
-+array reference, hash reference, or C<Tie::IxHash>. C<Tie::IxHash> is preferred
- for multi-key indexes, so that the keys are in the correct order. 1 creates an
- ascending index, -1 creates a descending index.
-
--
More information about the Pkg-perl-cvs-commits
mailing list