[SCM] branch, master, updated. debian/0.44-2-12-g03ed5c3

[gregor herrmann]

The following commit has been merged in the master branch:
commit f68a1a1b17f0d9e8f3e14089614a0575a3d9c866
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Sep 23 22:28:38 2011 +0200

    Update 5.14-ccflags.patch (CCFLAGS are now set in
    ext/Module/Install/PRIVATE/Mongo.pm).

diff --git a/debian/patches/5.14-ccflags.patch b/debian/patches/5.14-ccflags.patch
index 2222c3c..8178298 100644
--- a/debian/patches/5.14-ccflags.patch
+++ b/debian/patches/5.14-ccflags.patch
@@ -1,21 +1,28 @@
-Index: mongodb-perl/Makefile.PL
-===================================================================
---- mongodb-perl.orig/Makefile.PL	2011-08-22 19:55:45.000000000 +0100
-+++ mongodb-perl/Makefile.PL	2011-08-22 19:56:00.000000000 +0100
-@@ -2,6 +2,7 @@
+Description: add $Config{ccflags} to CCFLAGS to fix FTBFS with perl 5.14
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/638894
+Forwarded: not-needes
+Author: Dominic Hargreaves <dom at earth.li>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-09-23
+
+--- a/ext/Module/Install/PRIVATE/Mongo.pm
++++ b/ext/Module/Install/PRIVATE/Mongo.pm
+@@ -1,5 +1,6 @@
+ use strict;
  use warnings;
- use lib 'ext';
- use inc::Module::Install;
 +use Config;
  
- name 'MongoDB';
- perl_version '5.8.7';
-@@ -42,7 +43,7 @@
+ package Module::Install::PRIVATE::Mongo;
  
- my $ccflags = makemaker_args->{CCFLAGS};
- $ccflags = $ccflags . $archStr;
--makemaker_args(CCFLAGS => $ccflags);
-+makemaker_args(CCFLAGS => "$ccflags $Config{ccflags}");
+@@ -17,6 +18,10 @@
+     my ($self, @mongo_vars) = @_;
+     my $custom_cflags = 0;
+     my $ccflags = $self->makemaker_args->{CCFLAGS};
++
++    # #638894
++    $ccflags .= " $Config{ccflags}");
++    $custom_cflags = 1;
  
- makemaker_args(
-     dynamic_lib => {
+     if ($Config{osname} eq 'darwin') {
+         my @arch = $Config::Config{ccflags} =~ m/-arch\s+(\S+)/g;

--