[Pkg-ocaml-maint-commits] [SCM] cryptokit packaging branch, master, updated. debian/1.3-10-8-gbe4f040

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4dc26f909351829c39d5571fa4a4f94bf4089cc9
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Apr 12 01:01:52 2009 +0200

    Remove unused patches and dpatch dependency

diff --git a/debian/control b/debian/control
index 184cb4e..0c844c3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:  Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), dpatch, ocaml-nox (>= 3.11), debhelper (>= 7), zlib1g-dev, dpkg-dev (>= 1.13.19), dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), zlib1g-dev, dpkg-dev (>= 1.13.19), dh-ocaml
 Standards-Version: 3.8.0
 Homepage: http://pauillac.inria.fr/~xleroy/software.html#cryptokit
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cryptokit.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/40_input_buffer_too_big.dpatch b/debian/patches/40_input_buffer_too_big.dpatch
deleted file mode 100644
index 49db816..0000000
--- a/debian/patches/40_input_buffer_too_big.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## input_buffer_too_big.dpatch by malc <malc at pulsesoft.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Raise an error (Input_buffer_too_big) when too much data has been
-## DP: given to the put_substring method of uncompress.
-## DP: See: http://caml.inria.fr/archives/200411/msg00008.html
-
- at DPATCH@
-diff -urNad cryptokit-1.2/cryptokit.ml /tmp/dpep.kRwDla/cryptokit-1.2/cryptokit.ml
---- cryptokit-1.2/cryptokit.ml	2004-11-03 14:31:25.000000000 +0100
-+++ /tmp/dpep.kRwDla/cryptokit-1.2/cryptokit.ml	2004-11-03 14:32:15.000000000 +0100
-@@ -33,6 +33,7 @@
-   | No_entropy_source
-   | Entropy_source_closed
-   | Compression_not_supported
-+  | Input_buffer_too_big
- 
- exception Error of error
- 
-@@ -2029,12 +2030,13 @@
-     method put_substring src ofs len =
-       if len > 0 then begin
-         self#ensure_capacity 64;
--        let (_, used_in, used_out) =
-+        let (finished, used_in, used_out) =
-           inflate zs
-                   src ofs len
-                   obuf oend (String.length obuf - oend)
-                   Z_SYNC_FLUSH in
-         oend <- oend + used_out;
-+        if finished && not (used_in = len) then raise (Error Input_buffer_too_big);
-         if used_in < len
-         then self#put_substring src (ofs + used_in) (len - used_in)
-       end
-diff -urNad cryptokit-1.2/cryptokit.mli /tmp/dpep.kRwDla/cryptokit-1.2/cryptokit.mli
---- cryptokit-1.2/cryptokit.mli	2003-07-10 15:37:38.000000000 +0200
-+++ /tmp/dpep.kRwDla/cryptokit-1.2/cryptokit.mli	2004-11-03 14:32:22.000000000 +0100
-@@ -922,6 +922,9 @@
-       (** End of file on a device or EGD entropy source. *)
-   | Compression_not_supported
-       (** The data compression functions are not available. *)
-+  | Input_buffer_too_big
-+      (** More data has been passed to a function than it can
-+          gracefully hanlde. *)
- 
- exception Error of error
-   (** Exception raised by functions in this library
diff --git a/debian/patches/50_output_buffering.dpatch b/debian/patches/50_output_buffering.dpatch
deleted file mode 100644
index 8978c63..0000000
--- a/debian/patches/50_output_buffering.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-## 50_output_buffering.dpatch by Michael K. Edwards <mkedeb at sane.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix buffering code to output the last buffer properly.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- orig/cryptokit.ml
-+++ mod/cryptokit.ml
-@@ -512,7 +512,7 @@
- 
-     method put_substring src ofs len =
-       if len <= 0 then () else
--      if used + len <= blocksize then begin
-+      if used + len < blocksize then begin
-         (* Just accumulate len characters in ibuf *)
-         String.blit src ofs ibuf used len;
-         used <- used + len
diff --git a/debian/rules b/debian/rules
index f186be8..fbd82a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@
 # fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 

-- 
cryptokit packaging