[Pkg-ocaml-maint-commits] [SCM] gmetadom packaging branch, master, updated. debian/0.2.6-4-1-ge8dcba8
The following commit has been merged in the master branch: commit e8dcba8a2d0a15f15a3d2611bf3304cdb21625ef Author: Stefano Zacchiroli z...@upsilon.cc Date: Thu Feb 11 17:00:40 2010 +0100 debian/rules: fix include order ensure dh-ocaml deps for ocaml-base-nox are actually generated diff --git a/debian/changelog b/debian/changelog index 0357031..e6d57a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gmetadom (0.2.6-5) UNRELEASED; urgency=low + + * debian/rules: fix include order to ensure dh-ocaml deps for +ocaml-base-nox are actually generated + + -- Stefano Zacchiroli z...@debian.org Thu, 11 Feb 2010 17:00:01 +0100 + gmetadom (0.2.6-4) unstable; urgency=low * Use dh-ocaml 0.9.1 features diff --git a/debian/rules b/debian/rules index 4b9e746..a3a3a21 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,8 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/ocaml.mk +include /usr/share/cdbs/1/rules/dpatch.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/rules/ocaml.mk DEB_CONFIGURE_EXTRA_FLAGS = --with-modules=gdome_cpp_smart gdome_caml common-binary-post-install-arch:: -- gmetadom 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] frama-c packaging branch, master, updated. debian/20090902+beryllium+dfsg-3-1-g7386e02
The following commit has been merged in the master branch: commit 7386e02a069a9b29cfaa0f162a3fd0dfc4013f24 Author: Mehdi Dogguy me...@debian.org Date: Thu Feb 11 20:58:07 2010 +0100 Make it compile with OCaml 3.11.2 diff --git a/debian/changelog b/debian/changelog index 4e7e177..9f09dd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +frama-c (20090902+beryllium+dfsg-4) unstable; urgency=low + + * Make it compile with OCaml 3.11.2 (Closes: #569260) +- Add 0004-temp_file-changed-in-OCaml-3.11.2.patch + + -- Mehdi Dogguy me...@debian.org Thu, 11 Feb 2010 20:57:17 +0100 + frama-c (20090902+beryllium+dfsg-3) unstable; urgency=low * Fix FTBFS on bytecode architectures diff --git a/debian/patches/0004-temp_file-changed-in-OCaml-3.11.2.patch b/debian/patches/0004-temp_file-changed-in-OCaml-3.11.2.patch new file mode 100644 index 000..c56da8a --- /dev/null +++ b/debian/patches/0004-temp_file-changed-in-OCaml-3.11.2.patch @@ -0,0 +1,22 @@ +From: Mehdi Dogguy me...@debian.org +Date: Thu, 11 Feb 2010 20:56:48 +0100 +Subject: [PATCH] temp_file changed in OCaml 3.11.2 + +--- + ptests/ptests.ml |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ptests/ptests.ml b/ptests/ptests.ml +index 5e5df70..6931a66 100644 +--- a/ptests/ptests.ml b/ptests/ptests.ml +@@ -54,7 +54,7 @@ module Filename = struct + fun a b - let r = temp_file a b in + cygpath r + else +- temp_file ++ (fun x y - temp_file x y) + end + + let default_env var value = +-- diff --git a/debian/patches/series b/debian/patches/series index 2381cb1..1449896 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Use-GSourceView2.patch 0002-Fix-hyphen-used-as-minus-sign.patch 0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch +0004-temp_file-changed-in-OCaml-3.11.2.patch -- frama-c 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] frama-c packaging annotated tag, debian/20090902+beryllium+dfsg-4, created. debian/20090902+beryllium+dfsg-4
The annotated tag, debian/20090902+beryllium+dfsg-4 has been created at ebd74dae8482cd40b04df6fcaf8193f18e941f7f (tag) tagging 7386e02a069a9b29cfaa0f162a3fd0dfc4013f24 (commit) replaces debian/20090902+beryllium+dfsg-3 tagged by Mehdi Dogguy on Thu Feb 11 23:56:38 2010 +0100 - Shortlog Debian release 20090902+beryllium+dfsg-4 Mehdi Dogguy (1): Make it compile with OCaml 3.11.2 --- -- frama-c 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.0-3-10-gef27628
The following commit has been merged in the master branch: commit 8b945e34517435b59bf3f336983e9e83b11decd0 Merge: 64462a757ca91c6fd138b4a5600995a629421c71 8b0757c589d62dd012c7ac4685fc36a9f15887f0 Author: Mehdi Dogguy me...@debian.org Date: Thu Feb 11 23:05:03 2010 +0100 Merge commit 'upstream/3.0.1' -- 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.0-3-10-gef27628
The following commit has been merged in the master branch: commit ef27628422b4244e20c76b6af305294a7c8c81a1 Author: Mehdi Dogguy me...@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 me...@debian.org Sun, 10 Jan 2010 17:46:37 +0100 + -- Mehdi Dogguy me...@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..000 --- 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 me...@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 - -...@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.0 +0100 -+++ mldonkey/src/networks/bittorrent/bTTorrent.ml 2009-11-01 21:48:56.0 +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 ___ 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
