[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.7-1-6-gab322b2
The following commit has been merged in the master branch: commit ab322b22bd193ec1bf9532f3b7484b2112be0415 Author: Stephane Glondu Date: Sat May 7 15:25:24 2011 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index b607d35..0772bc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mldonkey (3.0.7-2) unstable; urgency=low + + * Fix FTBFS with g++ 4.6 (Closes: #625051) + * Remove unused mldonkey-server/fasttrack_problem template + * Bump Standards-Version to 3.9.2 (no changes) + + -- Stéphane Glondu Sat, 07 May 2011 15:38:22 +0200 + mldonkey (3.0.7-1) unstable; urgency=low * New upstream release (Closes: #599204) -- mldonkey packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.7-1-6-gab322b2
The following commit has been merged in the master branch: commit afe80a10663747ac118609cbe4618d33d2aabd78 Author: Stephane Glondu Date: Sat May 7 15:37:36 2011 +0200 Remove unused mldonkey-server/fasttrack_problem template ...as suggested by Lintian. diff --git a/debian/mldonkey-server.templates b/debian/mldonkey-server.templates index 6226d13..2679156 100644 --- a/debian/mldonkey-server.templates +++ b/debian/mldonkey-server.templates @@ -1,19 +1,3 @@ -Template: mldonkey-server/fasttrack_problem -Type: note -_Description: Bug #200500 - Previous versions of mldonkey-server suffer from a serious DFSG policy - violation. - . - The plugin for the fasttrack protocol (e.g. used by kazaa) of mldonkey-server - was made with illegal coding practice. This version fixes the problem by - removing this plugin from the MLDonkey package. Any fasttrack sources will be - filtered out of your files.ini. - . - Your entire fasttrack upload will disappear with the next restart of the - mldonkey server. - . - See /usr/share/doc/mldonkey-server/README.Debian for more information. - Template: mldonkey-server/launch_at_startup Type: boolean Default: false -- mldonkey packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.7-1-6-gab322b2
The following commit has been merged in the master branch: commit 094102cb2f00571b5f1dbfcefa8fa721b55aa1b3 Author: Stephane Glondu Date: Sat May 7 15:37:19 2011 +0200 Bump Standards-Version to 3.9.2 diff --git a/debian/control b/debian/control index d8beb07..abac636 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: autoconf, autotools-dev, libgd2-xpm-dev, liblablgtk2-gnome-ocaml-dev, libxml2-utils -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mldonkey.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mldonkey.git -- mldonkey packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.7-1-6-gab322b2
The following commit has been merged in the master branch:
commit 227a6cb97d45b186ecb118fc1162395109d1340a
Author: Stephane Glondu
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 000..03fab2f
--- /dev/null
+++
b/debian/patches/0004-Add-a-constructor-to-NullNameValuePairs-in-CryptoPP..patch
@@ -0,0 +1,25 @@
+From: Stephane Glondu
+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
+---
+ 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
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.7-1-6-gab322b2
The following commit has been merged in the master branch: commit 0bea45a168557cd43594f5bcce55335b5df198bb Author: Stephane Glondu Date: Sat May 7 15:23:32 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 e3c3a62..f0908b3 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 @@ -1,6 +1,6 @@ From: Sylvain Le Gall Date: Thu, 5 Aug 2010 20:24:58 -0400 -Subject: [PATCH] Use /usr/bin/see as default previewer +Subject: Use /usr/bin/see as default previewer Signed-off-by: Sylvain Le Gall --- @@ -8,10 +8,10 @@ Signed-off-by: Sylvain Le Gall 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/daemon/common/commonOptions.ml b/src/daemon/common/commonOptions.ml -index 60542fc..31189f5 100644 +index d390ebb..4ded0e4 100644 --- a/src/daemon/common/commonOptions.ml +++ b/src/daemon/common/commonOptions.ml -@@ -1364,7 +1364,7 @@ let hdd_send_warning_interval = define_option current_section ["hdd_send_warning +@@ -1387,7 +1387,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/0002-Remove-bashisms.patch b/debian/patches/0002-Remove-bashisms.patch index e548951..1c49f3c 100644 --- a/debian/patches/0002-Remove-bashisms.patch +++ b/debian/patches/0002-Remove-bashisms.patch @@ -1,6 +1,6 @@ From: Mehdi Dogguy Date: Thu, 5 Aug 2010 20:26:06 -0400 -Subject: [PATCH] Remove bashisms +Subject: Remove bashisms Signed-off-by: Mehdi Dogguy --- diff --git a/debian/patches/0003-Fix-tiger-tree-corruption.patch b/debian/patches/0003-Fix-tiger-tree-corruption.patch index ed4c4f7..1358477 100644 --- a/debian/patches/0003-Fix-tiger-tree-corruption.patch +++ b/debian/patches/0003-Fix-tiger-tree-corruption.patch @@ -1,6 +1,6 @@ From: Sylvain Le Gall Date: Thu, 5 Aug 2010 20:28:57 -0400 -Subject: [PATCH] Fix tiger tree corruption +Subject: Fix tiger tree corruption Signed-off-by: Sylvain Le Gall --- -- mldonkey packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
