[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.7-2-7-gca40bd6

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 437d84897aa7a278d1a089c08ca65d82bb98bcae
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Sep 8 21:05:16 2011 +0200

    Refresh patches

diff --git a/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch b/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch
index f0908b3..01e3fd3 100644
--- a/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch
+++ b/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch
@@ -8,10 +8,10 @@ Signed-off-by: Sylvain Le Gall <gildor at debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/daemon/common/commonOptions.ml b/src/daemon/common/commonOptions.ml
-index d390ebb..4ded0e4 100644
+index b3ddb6c..e3a2e64 100644
 --- a/src/daemon/common/commonOptions.ml
 +++ b/src/daemon/common/commonOptions.ml
-@@ -1387,7 +1387,7 @@ let hdd_send_warning_interval = define_option current_section ["hdd_send_warning
+@@ -1386,7 +1386,7 @@ let hdd_send_warning_interval = define_option current_section ["hdd_send_warning
  let previewer = define_expert_option current_section ["previewer"]
    "Name of program used for preview (first arg is local filename, second arg
    is name of file as searched on eDonkey"
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
deleted file mode 100644
index 03fab2f..0000000
--- a/debian/patches/0004-Add-a-constructor-to-NullNameValuePairs-in-CryptoPP..patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 5d14726..efbcb3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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