[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.1-1-11-gb3b19e0
Stephane Glondu
steph at glondu.net
Fri Aug 6 03:16:12 UTC 2010
The following commit has been merged in the master branch:
commit f06ae4ee359a7f839e94a2e5efbdb54a3991ceea
Author: Stephane Glondu <steph at glondu.net>
Date: Thu Aug 5 20:53:07 2010 -0400
New upstream release
diff --git a/debian/changelog b/debian/changelog
index fc3efe4..8651470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-mldonkey (3.0.1-2) UNRELEASED; urgency=low
+mldonkey (3.0.3-1) UNRELEASED; urgency=low
- * debian/patches: (Closes: #580087)
- - rename ocaml_3.11.1.dpatch into ocaml_3.1x.dpatch, and adapt it
- so that all 3.1x.* are accepted
- - add ocaml_312_typechecking.dpatch
+ * New upstream release (Closes: #580087)
+ * Switch source package format to 3.0 (quilt)
- -- Stéphane Glondu <glondu at debian.org> Tue, 15 Jun 2010 21:27:49 -0700
+ -- Stéphane Glondu <glondu at debian.org> Thu, 05 Aug 2010 20:58:48 -0400
mldonkey (3.0.1-1) unstable; urgency=low
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 b33644d..e3c3a62 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
@@ -8,10 +8,10 @@ Signed-off-by: Sylvain Le Gall <gildor at debian.org>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/daemon/common/commonOptions.ml b/src/daemon/common/commonOptions.ml
-index 528b496..bb28e64 100644
+index 60542fc..31189f5 100644
--- a/src/daemon/common/commonOptions.ml
+++ b/src/daemon/common/commonOptions.ml
-@@ -1363,7 +1363,7 @@ let hdd_send_warning_interval = define_option current_section ["hdd_send_warning
+@@ -1364,7 +1364,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/0004-Fix-build-on-OCaml-3.1x.patch b/debian/patches/0004-Fix-build-on-OCaml-3.1x.patch
deleted file mode 100644
index c720e59..0000000
--- a/debian/patches/0004-Fix-build-on-OCaml-3.1x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Thu, 5 Aug 2010 20:32:17 -0400
-Subject: [PATCH] Fix build on OCaml 3.1x
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=580087
-Signed-off-by: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- config/configure | 4 ++--
- config/configure.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/config/configure b/config/configure
-index 3656d85..c38f601 100755
---- a/config/configure
-+++ b/config/configure
-@@ -4784,7 +4784,7 @@ if test -z "$OCAMLC" || test -z "$CAMLP4" || test "$REQUIRED_OCAML" = "CVS"
- else
- OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
- case "$OCAMLVERSION" in
-- "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-+ "$REQUIRED_OCAML"*|3.1?.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
- *)
- echo "Need build"
- BUILD_OCAML=yes
-@@ -5263,7 +5263,7 @@ OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
- OCAMLLIB=`$OCAMLC -where`
- REBUILD_OCAML=no
- case "$OCAMLVERSION" in
-- 3.10*|3.11*)
-+ 3.1?.*)
- if test "$GUI" = "oldgui"; then
- OLDGUI_NO_310=yes
- GUI=no
-diff --git a/config/configure.in b/config/configure.in
-index 39af110..f044e15 100644
---- a/config/configure.in
-+++ b/config/configure.in
-@@ -486,7 +486,7 @@ if [ test -z "$OCAMLC" ] || [ test -z "$CAMLP4" ] || [ test "$REQUIRED_OCAML" =
- else
- OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
- case "$OCAMLVERSION" in
-- "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-+ "$REQUIRED_OCAML"*|3.1?.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
- *)
- echo "Need build"
- BUILD_OCAML=yes
-@@ -640,7 +640,7 @@ OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
- OCAMLLIB=`$OCAMLC -where`
- REBUILD_OCAML=no
- case "$OCAMLVERSION" in
-- 3.10*|3.11*)
-+ 3.1?.*)
- if test "$GUI" = "oldgui"; then
- OLDGUI_NO_310=yes
- GUI=no
---
diff --git a/debian/patches/0005-Adapt-to-OCaml-3.12-bugfix-in-typechecking-of-inheri.patch b/debian/patches/0005-Adapt-to-OCaml-3.12-bugfix-in-typechecking-of-inheri.patch
deleted file mode 100644
index a8fc703..0000000
--- a/debian/patches/0005-Adapt-to-OCaml-3.12-bugfix-in-typechecking-of-inheri.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: =?UTF-8?q?St=C3=A9phane=20Glondu?= <glondu at debian.org>
-Date: Thu, 5 Aug 2010 20:33:42 -0400
-Subject: [PATCH] Adapt to OCaml 3.12 bugfix in typechecking of inheritance
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=580087
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- src/gtk2/gui/guiTemplates.mli | 3 ++-
- src/gtk2/gui/guiTools.mli | 1 +
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/gtk2/gui/guiTemplates.mli b/src/gtk2/gui/guiTemplates.mli
-index e7a024f..e42ae70 100644
---- a/src/gtk2/gui/guiTemplates.mli
-+++ b/src/gtk2/gui/guiTemplates.mli
-@@ -125,9 +125,10 @@ module Gview :
- method update_item : Gtk.tree_iter -> V.item -> V.item -> unit
- end
-
-- class treeview : [> Gtk.box] Gtk.obj ->
-+ class treeview : ([> Gtk.box] as 'a) Gtk.obj ->
- object
- inherit GPack.box
-+ val obj : 'a Gtk.obj
- method expanded_paths : int array list
- method gview : g_view
- method id : int
-diff --git a/src/gtk2/gui/guiTools.mli b/src/gtk2/gui/guiTools.mli
-index 3e13ab5..66140c8 100644
---- a/src/gtk2/gui/guiTools.mli
-+++ b/src/gtk2/gui/guiTools.mli
-@@ -174,6 +174,7 @@ type b_children =
- class tool_bar : ([> Gtk.box] as 'a) Gtk.obj ->
- object
- inherit GPack.box
-+ val obj : 'a Gtk.obj
- val mutable bb_children : b_children list
- method add_toggle_button :
- style : Gtk.Tags.toolbar_style ->
---
diff --git a/debian/patches/series b/debian/patches/series
index 5b4203c..efbcb3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
0001-Use-usr-bin-see-as-default-previewer.patch
0002-Remove-bashisms.patch
0003-Fix-tiger-tree-corruption.patch
-0004-Fix-build-on-OCaml-3.1x.patch
-0005-Adapt-to-OCaml-3.12-bugfix-in-typechecking-of-inheri.patch
--
mldonkey packaging
More information about the Pkg-ocaml-maint-commits
mailing list