[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.1-1-3-g9c7f6b6

Stephane Glondu steph at glondu.net
Fri Aug 6 00:51:09 UTC 2010 

The following commit has been merged in the master branch:
commit 9c7f6b6b67988047eb5c050a99925df4c289c344
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 5 20:41:46 2010 -0400

    Switch source package format to 3.0 (quilt)

diff --git a/debian/control b/debian/control
index 22fbea1..cf0f49a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends: autoconf, autotools-dev,
  docbook-xsl,
  docbook-xml,
  m4,
- dpatch,
  debconf,
  liblablgtk2-ocaml-dev (>= 2.12.0-3),
  libgd2-xpm-dev,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4f61398..b253107 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,10 @@
 [DEFAULT]
 pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
 filter = [
     "docs/http-1.1.txt",
     "docs/uri-res.txt",
     "docs/uri.txt",
     "src/networks/fasttrack",
     "packages/debian"
-    ]
\ No newline at end of file
+    ]
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
new file mode 100644
index 0000000..b33644d
--- /dev/null
+++ b/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch
@@ -0,0 +1,23 @@
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Thu, 5 Aug 2010 20:24:58 -0400
+Subject: [PATCH] Use /usr/bin/see as default previewer
+
+Signed-off-by: Sylvain Le Gall <gildor at debian.org>
+---
+ src/daemon/common/commonOptions.ml |    2 +-
+ 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
+--- 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
+ 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"
+-    string_option "mldonkey_previewer"
++    string_option "/usr/bin/see"
+ 
+ let mldonkey_bin = define_expert_option current_section ["mldonkey_bin"]
+   "Directory where mldonkey binaries are installed"
+-- 
diff --git a/debian/patches/remove_bashism.dpatch b/debian/patches/0002-Remove-bashisms.patch
old mode 100755
new mode 100644
similarity index 61%
rename from debian/patches/remove_bashism.dpatch
rename to debian/patches/0002-Remove-bashisms.patch
index a27ee48..e548951
--- a/debian/patches/remove_bashism.dpatch
+++ b/debian/patches/0002-Remove-bashisms.patch
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_bashism.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
+Date: Thu, 5 Aug 2010 20:26:06 -0400
+Subject: [PATCH] Remove bashisms
 
- at DPATCH@
-diff -urNad mldonkey~/distrib/make_buginfo mldonkey/distrib/make_buginfo
---- mldonkey~/distrib/make_buginfo	2009-07-04 21:30:34.000000000 +0200
-+++ mldonkey/distrib/make_buginfo	2009-07-04 21:30:50.000000000 +0200
-@@ -21,14 +21,14 @@
+Signed-off-by: Mehdi Dogguy <dogguy at pps.jussieu.fr>
+---
+ distrib/make_buginfo |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/distrib/make_buginfo b/distrib/make_buginfo
+index 211ffd3..cecd509 100755
+--- a/distrib/make_buginfo
++++ b/distrib/make_buginfo
+@@ -21,14 +21,14 @@ echo -n "Building file 'buginfo.tar.gz'..."
  rm -f buginfo.tar.gz
  mkdir -p buginfo
  cp -f *.ini buginfo/
@@ -31,3 +34,4 @@ diff -urNad mldonkey~/distrib/make_buginfo mldonkey/distrib/make_buginfo
  
  tar cf buginfo.tar buginfo
  rm -rf buginfo
+-- 
diff --git a/debian/patches/0003-Fix-tiger-tree-corruption.patch b/debian/patches/0003-Fix-tiger-tree-corruption.patch
new file mode 100644
index 0000000..ed4c4f7
--- /dev/null
+++ b/debian/patches/0003-Fix-tiger-tree-corruption.patch
@@ -0,0 +1,27 @@
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Thu, 5 Aug 2010 20:28:57 -0400
+Subject: [PATCH] Fix tiger tree corruption
+
+Signed-off-by: Sylvain Le Gall <gildor at debian.org>
+---
+ src/utils/lib/tiger.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/utils/lib/tiger.c b/src/utils/lib/tiger.c
+index 650722e..2eddb03 100644
+--- a/src/utils/lib/tiger.c
++++ b/src/utils/lib/tiger.c
+@@ -172,8 +172,12 @@ void tiger_compress(word64 *str, word64 state[3])
+ static void static_tiger(word64 *str, word64 length, word64 res[3])
+ {
+   register word64 i, j;
++#ifdef __sparc__
++  double temp[256];
++#else
+   word64 temp_[64 / 8];
+   unsigned char *temp = (unsigned char *) temp_;
++#endif
+ 
+   res[0]=0x0123456789ABCDEFLL;
+   res[1]=0xFEDCBA9876543210LL;
+-- 
diff --git a/debian/patches/ocaml_3.1x.dpatch b/debian/patches/0004-Fix-build-on-OCaml-3.1x.patch
old mode 100755
new mode 100644
similarity index 65%
rename from debian/patches/ocaml_3.1x.dpatch
rename to debian/patches/0004-Fix-build-on-OCaml-3.1x.patch
index fbf75d8..c720e59
--- a/debian/patches/ocaml_3.1x.dpatch
+++ b/debian/patches/0004-Fix-build-on-OCaml-3.1x.patch
@@ -1,26 +1,20 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ocaml_3.11.1.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+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
 
- at DPATCH@
-diff -urNad mldonkey~/config/configure mldonkey/config/configure
---- mldonkey~/config/configure	2009-07-04 21:12:20.000000000 +0200
-+++ mldonkey/config/configure	2009-07-04 21:17:10.000000000 +0200
-@@ -4580,7 +4580,7 @@
- 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
-diff -urNad mldonkey~/config/configure.in mldonkey/config/configure.in
---- mldonkey~/config/configure.in	2009-07-04 21:12:20.000000000 +0200
-+++ mldonkey/config/configure.in	2009-07-04 21:16:57.000000000 +0200
-@@ -486,7 +486,7 @@
+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
@@ -29,10 +23,6 @@ diff -urNad mldonkey~/config/configure.in mldonkey/config/configure.in
      *)
          echo "Need build"
          BUILD_OCAML=yes
-diff --git a/config/configure b/config/configure
-index 3656d85..caac3ee 100755
---- a/config/configure
-+++ b/config/configure
 @@ -5263,7 +5263,7 @@ OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
  OCAMLLIB=`$OCAMLC -where`
  REBUILD_OCAML=no
@@ -43,9 +33,18 @@ index 3656d85..caac3ee 100755
          OLDGUI_NO_310=yes
          GUI=no
 diff --git a/config/configure.in b/config/configure.in
-index 39af110..c313ee5 100644
+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
@@ -55,3 +54,4 @@ index 39af110..c313ee5 100644
        if test "$GUI" = "oldgui"; then
          OLDGUI_NO_310=yes
          GUI=no
+-- 
diff --git a/debian/patches/ocaml_312_typechecking.dpatch b/debian/patches/0005-Adapt-to-OCaml-3.12-bugfix-in-typechecking-of-inheri.patch
old mode 100755
new mode 100644
similarity index 70%
rename from debian/patches/ocaml_312_typechecking.dpatch
rename to debian/patches/0005-Adapt-to-OCaml-3.12-bugfix-in-typechecking-of-inheri.patch
index 9d9c5a5..a8fc703
--- a/debian/patches/ocaml_312_typechecking.dpatch
+++ b/debian/patches/0005-Adapt-to-OCaml-3.12-bugfix-in-typechecking-of-inheri.patch
@@ -1,10 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ocaml_312_typechecking.dpatch by Stéphane Glondu <glondu at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix build with OCaml 3.12 (Closes: #580087)
+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(-)
 
- at DPATCH@
 diff --git a/src/gtk2/gui/guiTemplates.mli b/src/gtk2/gui/guiTemplates.mli
 index e7a024f..e42ae70 100644
 --- a/src/gtk2/gui/guiTemplates.mli
@@ -33,3 +37,4 @@ index 3e13ab5..66140c8 100644
      val mutable bb_children : b_children list
      method add_toggle_button : 
        style : Gtk.Tags.toolbar_style ->
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 738a682..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_see
-ocaml_3.1x
-remove_bashism
-ocaml_312_typechecking
diff --git a/debian/patches/00list.sparc b/debian/patches/00list.sparc
deleted file mode 100644
index 05b4d89..0000000
--- a/debian/patches/00list.sparc
+++ /dev/null
@@ -1 +0,0 @@
-13_tiger_tree_corruption
diff --git a/debian/patches/01_see.dpatch b/debian/patches/01_see.dpatch
deleted file mode 100755
index 73dbc9c..0000000
--- a/debian/patches/01_see.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_see.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use /usr/bin/see as default previewer.
-
- at DPATCH@
-diff -urNad mldonkey-2.7.7~/src/daemon/common/commonOptions.ml mldonkey-2.7.7/src/daemon/common/commonOptions.ml
---- mldonkey-2.7.7~/src/daemon/common/commonOptions.ml	2006-09-10 22:45:39.000000000 +0000
-+++ mldonkey-2.7.7/src/daemon/common/commonOptions.ml	2006-09-10 22:46:15.000000000 +0000
-@@ -1252,7 +1252,7 @@
- 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"
--    string_option "mldonkey_previewer"
-+    string_option "/usr/bin/see"
- 
- let mldonkey_bin = define_expert_option current_section ["mldonkey_bin"]
-     "Directory where mldonkey binaries are installed"
diff --git a/debian/patches/13_tiger_tree_corruption.dpatch b/debian/patches/13_tiger_tree_corruption.dpatch
deleted file mode 100755
index 4d2215b..0000000
--- a/debian/patches/13_tiger_tree_corruption.dpatch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## 13_tiger_tree_corruption.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## DP: Fix tiger tree corruption.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/mldonkey/mldonkey-2.5.17/src/utils/lib/tiger.c mldonkey-2.5.17/src/utils/lib/tiger.c
---- /mnt/nfs0/gildor/deb/ocaml-package/mldonkey/mldonkey-2.5.17/src/utils/lib/tiger.c	2004-02-16 15:02:17.000000000 +0100
-+++ mldonkey-2.5.17/src/utils/lib/tiger.c	2004-04-08 22:17:18.000000000 +0200
-@@ -176,8 +176,9 @@
- static void static_tiger(word64 *str, word64 length, word64 res[3])
- {
-   register word64 i, j;
--  word64 temp_[64 / 8];
--  unsigned char *temp = (unsigned char *) temp_;
-+  /*word64 temp_[64 / 8];
-+  unsigned char *temp = (unsigned char *) temp_;*/
-+  double temp[256];
- 
-   res[0]=0x0123456789ABCDEFLL;
-   res[1]=0xFEDCBA9876543210LL;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5b4203c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+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
diff --git a/debian/patches/url_slashes.dpatch b/debian/patches/url_slashes.dpatch
deleted file mode 100755
index 40f4110..0000000
--- a/debian/patches/url_slashes.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## url_slashes.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix double slash vulnerability.
-## DP: See: https://savannah.nongnu.org/bugs/?25667
-
- at DPATCH@
-diff -urNad mldonkey~/src/utils/lib/url.ml mldonkey/src/utils/lib/url.ml
---- mldonkey~/src/utils/lib/url.ml	2009-02-18 20:53:45.000000000 +0100
-+++ mldonkey/src/utils/lib/url.ml	2009-02-24 09:56:17.000000000 +0100
-@@ -175,6 +175,19 @@
-   Buffer.contents res  
-   
- let of_string ?(args=[]) s =
-+  let remove_leading_slashes s =
-+    let len = String.length s in
-+    let left =
-+      let rec aux i =
-+        if i < len && s.[i] = '/' then aux (i+1) else i in
-+      aux 0 in
-+    if left = 0 then s
-+    else
-+      String.sub s left (len - left) in
-+
-+  (* redefine s to remove all leading slashes *)
-+  let s = remove_leading_slashes s in
-+
-   let s = put_args s args in
-   let url =
-     let get_two init_pos =
diff --git a/debian/rules b/debian/rules
index f47bb8a..340ee35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -20,7 +19,6 @@ else
 endif
 
 override_dh_auto_clean:
-	dpatch deapply-all
 # Update the PO, as suggested in "man 7 po-debconf"
 	debconf-updatepo
 # Add here commands to clean up after the build process.
@@ -33,7 +31,6 @@ override_dh_auto_clean:
 	-$(RM) config/confdefs.h
 
 override_dh_auto_configure:
-	dpatch apply-all
 	cd config; autoconf
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(confflags) \
 	  --enable-gui=newgui2 \
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
mldonkey packaging

More information about the Pkg-ocaml-maint-commits mailing list