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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f67303fd28d612865c7c88539eca853b68184145
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Nov 1 21:47:19 2009 +0100

    Fix download of torrent files with no 'announce' field (Closes: #551896)

diff --git a/debian/changelog b/debian/changelog
index b0a641b..da36664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mldonkey (3.0.0-4) unstable; urgency=low
     - Use debhelper's overrides
   * Pass "--iosched idle" to start-stop-daemon (Closes: #549498)
   * Rotate the log files found in /var/log/mldonkey/ (Closes: #539726)
+  * Fix download of torrent files with no 'announce' field (Closes: #551896)
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Nov 2009 20:59:25 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index d40d0c3..bf07972 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01_see
 ocaml_3.11.1
 remove_bashism
+no-announce
diff --git a/debian/patches/no-announce.dpatch b/debian/patches/no-announce.dpatch
new file mode 100755
index 0000000..9d42b15
--- /dev/null
+++ b/debian/patches/no-announce.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-announce.dpatch by Mehdi Dogguy <mehdi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix download of torrent files with no 'announce' field
+
+ at DPATCH@
+diff -urNad mldonkey~/src/networks/bittorrent/bTTorrent.ml mldonkey/src/networks/bittorrent/bTTorrent.ml
+--- mldonkey~/src/networks/bittorrent/bTTorrent.ml	2009-11-01 19:08:52.000000000 +0100
++++ mldonkey/src/networks/bittorrent/bTTorrent.ml	2009-11-01 21:44:23.000000000 +0100
+@@ -285,7 +285,6 @@
+     | None -> Charset.safe_convert !file_encoding !file_name
+     | Some name -> name
+   in
+-  assert (!announce <> "");
+   assert (real_file_name <> "");
+   assert (!file_piece_size <> zero);
+   assert (!file_pieces <> "");

-- 
mldonkey packaging