[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.1.0-3-6-g02f3c4e

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 02f3c4ef9777479aa84b482367527aa8c404224c
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Apr 11 14:14:18 2012 +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 01e3fd3..f937916 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
@@ -5,10 +5,10 @@ Subject: Use /usr/bin/see as default previewer
 Signed-off-by: Sylvain Le Gall <gildor at debian.org>
 ---
  src/daemon/common/commonOptions.ml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/daemon/common/commonOptions.ml b/src/daemon/common/commonOptions.ml
-index b3ddb6c..e3a2e64 100644
+index fc91bd0..4496cf0 100644
 --- a/src/daemon/common/commonOptions.ml
 +++ b/src/daemon/common/commonOptions.ml
 @@ -1386,7 +1386,7 @@ let hdd_send_warning_interval = define_option current_section ["hdd_send_warning
diff --git a/debian/patches/0002-Remove-bashisms.patch b/debian/patches/0002-Remove-bashisms.patch
index 1c49f3c..212f949 100644
--- a/debian/patches/0002-Remove-bashisms.patch
+++ b/debian/patches/0002-Remove-bashisms.patch
@@ -5,7 +5,7 @@ Subject: Remove bashisms
 Signed-off-by: Mehdi Dogguy <dogguy at pps.jussieu.fr>
 ---
  distrib/make_buginfo |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/distrib/make_buginfo b/distrib/make_buginfo
 index 211ffd3..cecd509 100755
diff --git a/debian/patches/0003-Fix-tiger-tree-corruption.patch b/debian/patches/0003-Fix-tiger-tree-corruption.patch
index 1358477..cb6e203 100644
--- a/debian/patches/0003-Fix-tiger-tree-corruption.patch
+++ b/debian/patches/0003-Fix-tiger-tree-corruption.patch
@@ -5,7 +5,7 @@ Subject: Fix tiger tree corruption
 Signed-off-by: Sylvain Le Gall <gildor at debian.org>
 ---
  src/utils/lib/tiger.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 diff --git a/src/utils/lib/tiger.c b/src/utils/lib/tiger.c
 index 650722e..2eddb03 100644
diff --git a/debian/patches/0004-Fix-FTBFS-with-GCC-4.7.patch b/debian/patches/0004-Fix-FTBFS-with-GCC-4.7.patch
deleted file mode 100644
index 410b40a..0000000
--- a/debian/patches/0004-Fix-FTBFS-with-GCC-4.7.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Thu, 5 Apr 2012 07:35:39 +0200
-Subject: Fix FTBFS with GCC 4.7
-
-Author: spiralvoice
-Origin: http://savannah.nongnu.org/patch/?7755
-Bug: http://savannah.nongnu.org/bugs/?36078
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667283
----
- src/utils/lib/CryptoPP.cc |    2 +-
- src/utils/lib/CryptoPP.h  |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
-index 6b12b0a..be0b04a 100644
---- a/src/utils/lib/CryptoPP.cc
-+++ b/src/utils/lib/CryptoPP.cc
-@@ -5413,7 +5413,7 @@ template <class T> const T& AbstractEuclideanDomain<T>::Gcd(const Element &a, co
- 	Element g[3]={b, a};
- 	unsigned int i0=0, i1=1, i2=2;
- 
--	while (!Equal(g[i1], this->Identity()))
-+	while (!this->Equal(g[i1], this->Identity()))
- 	{
- 		g[i2] = Mod(g[i0], g[i1]);
- 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
-diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
-index af1621b..900e711 100644
---- a/src/utils/lib/CryptoPP.h
-+++ b/src/utils/lib/CryptoPP.h
-@@ -2633,7 +2633,7 @@ public:
- 
- 	pointer allocate(size_type n, const void * = NULL)
- 	{
--		CheckSize(n);
-+		this->CheckSize(n);
- 		if (n == 0)
- 			return NULL;
- 		return new T[n];
-@@ -5612,7 +5612,7 @@ template <class T, class B, class BASE> void IteratedHashBase2<T, B, BASE>::Trun
- {
- 	this->ThrowIfInvalidTruncatedSize(size);
- 
--	PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
-+	this->PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
- 	CorrectEndianess(this->m_data, this->m_data, this->BlockSize() - 2*sizeof(HashWordType));
- 
- 	this->m_data[this->m_data.size()-2] = B::ToEnum() ? this->GetBitCountHi() : this->GetBitCountLo();
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 7016920..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-Fix-FTBFS-with-GCC-4.7.patch

-- 
mldonkey packaging