[DRE-commits] [SCM] ruby-passenger.git branch, master, updated. debian/3.0.12debian-1-8-g92cff53

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit fa3c75e9014ffc0ac3297f3c4e7e880f4fda85e3
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Thu Jun 28 16:01:47 2012 +0200

    Drop debian/patches/fix_ftbfs_gcc47.patch: Applied upstream

diff --git a/debian/changelog b/debian/changelog
index b8d4a7e..fe65b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ruby-passenger (3.0.13debian-1) UNRELEASED; urgency=low
   * New upstream release
   * debian/control: Add apache2-mpm-event to the dependency alternative, it is
     now supported by passenger (Closes: #600679)
+  * Drop debian/patches/fix_ftbfs_gcc47.patch: Applied upstream
 
- -- Laurent Bigonville <bigon at debian.org>  Thu, 28 Jun 2012 15:58:53 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 28 Jun 2012 16:01:36 +0200
 
 ruby-passenger (3.0.12debian-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_ftbfs_gcc47.patch b/debian/patches/fix_ftbfs_gcc47.patch
deleted file mode 100644
index 112b4f0..0000000
--- a/debian/patches/fix_ftbfs_gcc47.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix FTBFS with GCC 4.7
-Origin: https://svn.boost.org/trac/boost/attachment/ticket/6165/libstdcpp3.hpp.patch
-Bug: https://code.google.com/p/phusion-passenger/issues/detail?id=747
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672096
-
---- a/ext/boost/config/stdlib/libstdcpp3.hpp
-+++ b/ext/boost/config/stdlib/libstdcpp3.hpp
-@@ -31,7 +31,8 @@
- 
- #ifdef __GLIBCXX__ // gcc 3.4 and greater:
- #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
--        || defined(_GLIBCXX__PTHREADS)
-+        || defined(_GLIBCXX__PTHREADS) \
-+        || defined(_GLIBCXX_HAS_GTHREADS)
-       //
-       // If the std lib has thread support turned on, then turn it on in Boost
-       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
---- a/ext/common/StaticString.h
-+++ b/ext/common/StaticString.h
-@@ -31,6 +31,8 @@
- #include <ostream>
- #include <stdexcept>
- 
-+#include <unistd.h>
-+
- namespace Passenger {
- 
- using namespace std;
diff --git a/debian/patches/series b/debian/patches/series
index 7b2ee10..7a4b3dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix_install_path.patch
-fix_ftbfs_gcc47.patch

-- 
ruby-passenger.git