[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.7-1-6-gab322b2

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 227a6cb97d45b186ecb118fc1162395109d1340a
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat May 7 15:22:14 2011 +0200

    Fix FTBFS with g++ 4.6 (Closes: #625051)

diff --git a/debian/patches/0004-Add-a-constructor-to-NullNameValuePairs-in-CryptoPP..patch b/debian/patches/0004-Add-a-constructor-to-NullNameValuePairs-in-CryptoPP..patch
new file mode 100644
index 0000000..03fab2f
--- /dev/null
+++ b/debian/patches/0004-Add-a-constructor-to-NullNameValuePairs-in-CryptoPP..patch
@@ -0,0 +1,25 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 7 May 2011 15:19:41 +0200
+Subject: Add a constructor to NullNameValuePairs in CryptoPP.h
+
+Fixes FTBFS with g++ 4.6.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625051
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/utils/lib/CryptoPP.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
+index 775a898..af1621b 100644
+--- a/src/utils/lib/CryptoPP.h
++++ b/src/utils/lib/CryptoPP.h
+@@ -695,6 +695,7 @@ class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs
+ {
+ public:
+ 	bool GetVoidValue(const char* /* name */, const std::type_info& /* valueType */, void* /* pValue */) const {return false;}
++	NullNameValuePairs() {}
+ };
+ 
+ //! _
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index efbcb3b..5d14726 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-usr-bin-see-as-default-previewer.patch
 0002-Remove-bashisms.patch
 0003-Fix-tiger-tree-corruption.patch
+0004-Add-a-constructor-to-NullNameValuePairs-in-CryptoPP..patch

-- 
mldonkey packaging