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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit ef27628422b4244e20c76b6af305294a7c8c81a1
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Feb 11 23:08:39 2010 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index d508e30..0db70e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,17 @@
-mldonkey (3.0.0-4) unstable; urgency=low
+mldonkey (3.0.1-1) unstable; urgency=low
 
+  * New upstream release
+    - Fix download of torrent files with no 'announce' field (Closes: #551896)
+    - Fix torrent parsing when announce-list is empty (Closes: #552004)
   * Update my e-mail address and remove DMUA
   * Refresh packaging
     - Use new features of dh-ocaml 0.9
     - 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)
-  * Fix torrent parsing when announce-list is empty (Closes: #552004)
   * Modify ocaml_3.11.1 so that it works with all 3.11.* versions
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sun, 10 Jan 2010 17:46:37 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 11 Feb 2010 23:05:41 +0100
 
 mldonkey (3.0.0-3) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index bf07972..d40d0c3 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 01_see
 ocaml_3.11.1
 remove_bashism
-no-announce
diff --git a/debian/patches/no-announce.dpatch b/debian/patches/no-announce.dpatch
deleted file mode 100755
index 9c19cd8..0000000
--- a/debian/patches/no-announce.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /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
-## DP: and fix torrent parsing when announce-list is empty
-
- 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:48:56.000000000 +0100
-@@ -169,7 +169,7 @@
-                             announce_list := !next_urls @ !announce_list
-                           end
-                         else
--                          announce_list := List.hd !next_urls :: !announce_list
-+                          announce_list := (try List.hd !next_urls with _ -> "") :: !announce_list
-                     | _ ->
-                         lprintf_nl "[BT] unknown field in announce list"
-                     ) list;
-@@ -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