[Pkg-ocaml-maint-commits] [ocamldap] 01/05: Remove unused patches

Stéphane Glondu glondu at moszumanska.debian.org
Sat Dec 7 12:25:46 UTC 2013


This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamldap.

commit 4dcdcdbe5fd01414252b14dfb3f6c40359b0c79d
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Dec 7 13:06:41 2013 +0100

    Remove unused patches
---
 debian/patches/make_bytecode.dpatch    |  53 ---------
 debian/patches/makefile.dpatch         |  45 -------
 debian/patches/makefile_findlib.dpatch |  37 ------
 debian/patches/ocamldoc.dpatch         | 207 ---------------------------------
 4 files changed, 342 deletions(-)

diff --git a/debian/patches/make_bytecode.dpatch b/debian/patches/make_bytecode.dpatch
deleted file mode 100755
index dddbdee..0000000
--- a/debian/patches/make_bytecode.dpatch
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh -e
-## make_bytecode.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 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@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/ocamldap/ocamldap-1.4.1/Makefile ocamldap-1.4.1/Makefile
---- /mnt/nfs0/gildor/deb/ocaml-package/ocamldap/ocamldap-1.4.1/Makefile	2004-02-16 23:52:19.000000000 +0100
-+++ ocamldap-1.4.1/Makefile	2004-02-16 23:56:54.000000000 +0100
-@@ -24,13 +24,22 @@
- .c.o:
- 		$(CAMLC) -ccopt "$(CFLAGS) $(PPDEFINES)" -c $<
- 
--all: ocamldap.cma ocamldap.cmxa testbc testopt testoo testoobc
-+all-byte: ocamldap.cma testbc testoobc
-+
-+all-opt: all-byte ocamldap.cmxa testopt testoo
-+
-+all: all-opt
- 
- dep: ocamldap ocamldap.i
- 
--install: all
-+install-byte: all-byte
-+	ocamlfind install $(DESTDIR) ocamldap ocamldap.mli ocamldap.cmi ooldap.mli ooldif.mli ooldap.cmi ooldif.cmi ocamldap.cma libocamldap.a schemaparser.cmi META
-+
-+install-opt: all-opt
- 	ocamlfind install $(DESTDIR) ocamldap ocamldap.mli ocamldap.cmi ooldap.mli ooldif.mli ooldap.cmi ooldif.cmi ocamldap.cma ocamldap.cmxa ocamldap.a libocamldap.a schemaparser.cmi META
- 
-+install: install-opt
-+
- # preprocess
- ocamldap.i:
- 	$(CPP) -traditional-cpp $(PPDEFINES) ocamldap.mli4 | grep -v "^\#.*" >ocamldap.mli
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch
deleted file mode 100644
index 6ab2c0e..0000000
--- a/debian/patches/makefile.dpatch
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-## makefile.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-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@
-diff -urNad /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap-1.1.0/Makefile ocamldap-1.1.0/Makefile
---- /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap-1.1.0/Makefile	2003-09-21 15:16:13.000000000 +0200
-+++ ocamldap-1.1.0/Makefile	2003-09-21 15:16:21.000000000 +0200
-@@ -2,6 +2,7 @@
- # vim:noet:
- 
- prefix?=/sw
-+library_prefix?=${prefix}/lib/ocaml
- CAMLC=ocamlc
- CAMLOPT=ocamlopt
- CAMLP4O=camlp4o
-@@ -27,7 +28,7 @@
- dep: ocamldap ocamldap.i
- 
- install: all
--	install ocamldap.a ooldap.cmi ocamldap.cm[ia] ocamldap.cmxa ooldap.mli ocamldap.mli libocamldap.a ${prefix}/lib/ocaml
-+	install -m 644 ocamldap.a ooldap.cmi ocamldap.cm[ia] ocamldap.cmxa ooldap.mli ocamldap.mli libocamldap.a ${library_prefix}
- 
- # preprocess
- ocamldap.i:
diff --git a/debian/patches/makefile_findlib.dpatch b/debian/patches/makefile_findlib.dpatch
deleted file mode 100644
index 36c1cd8..0000000
--- a/debian/patches/makefile_findlib.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## makefile_findlib.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-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@
-diff -urNad /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap/Makefile ocamldap/Makefile
---- /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap/Makefile	2003-09-13 09:24:48.000000000 +0200
-+++ ocamldap/Makefile	2003-09-21 17:00:30.000000000 +0200
-@@ -25,7 +25,7 @@
- dep: ocamldap ocamldap.i
- 
- install: all
--	ocamlfind install ocamldap ocamldap.mli ocamldap.cmi ooldap.mli ooldap.cmi ocamldap.cma ocamldap.cmxa ocamldap.a libocamldap.a META
-+	ocamlfind install $(DESTDIR) ocamldap ocamldap.mli ocamldap.cmi ooldap.mli ooldap.cmi ocamldap.cma ocamldap.cmxa ocamldap.a libocamldap.a META
- 
- # preprocess
- ocamldap.i:
diff --git a/debian/patches/ocamldoc.dpatch b/debian/patches/ocamldoc.dpatch
deleted file mode 100644
index 527430f..0000000
--- a/debian/patches/ocamldoc.dpatch
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/bin/sh -e
-## ocamldoc.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-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@
-diff -urNad /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap-1.1.0/ocamldap.mli4 ocamldap-1.1.0/ocamldap.mli4
---- /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap-1.1.0/ocamldap.mli4	2003-09-21 16:18:45.000000000 +0200
-+++ ocamldap-1.1.0/ocamldap.mli4	2003-09-21 16:21:31.000000000 +0200
-@@ -153,20 +153,22 @@
-   PUBLIC INTERFACE FUNCTIONS
- *)
- 
--(* Adds a new entry to the ldap database. *)
-+(** Direct access to LDAP function *)
-+
-+(** Adds a new entry to the ldap database. *)
- val add_s : conn -> dn:string -> attr:modattr list -> unit
- 
--(* Binds to the ldap server with the given credential and auth_method. *)
-+(** Binds to the ldap server with the given credential and auth_method. *)
- val bind_s :
-   ?who:string -> ?cred:string -> ?auth_method:auth_method -> conn -> unit
- 
--(* Deletes the entry with the given dn from the database. *)
-+(** Deletes the entry with the given dn from the database. *)
- val delete_s : conn -> dn:string -> unit
- 
--(* Retrieves an error message for the given ldap error code. *)
-+(** Retrieves an error message for the given ldap error code. *)
- val err2string : error_code -> string
- 
--(* Initializes a connection to the given ldap server.  The connection is
-+(** Initializes a connection to the given ldap server.  The connection is
-  * not actually established until one of the bind functions is called. *)
- val init : ?version:int -> ?port:int -> string -> conn
- 
-@@ -183,29 +185,29 @@
- ifdef HAVE_KERBEROS then
- val kerberos_bind2_s : conn -> who:string -> unit
- 
--(* Modifies the specified entry with the modifications supplied in 'mods'. *)
-+(** Modifies the specified entry with the modifications supplied in 'mods'. *)
- val modify_s : conn -> dn:string -> mods:modattr list -> unit
- 
--(* Renames the given entry to newdn.  modrdn2 optionally deletes the old rdn.
--modrdn always deletes the old rdn. *)
--val modrdn_s : conn -> dn:string -> newdn:string -> unit
-+(** Renames the given entry to newdn, modrdn always deletes the old rdn. *)
-+val modrdn_s : conn -> dn:string -> newdn:string -> unit  
-+(** Same as modrdn but modrdn2 optionally deletes the old rdn. *)
- val modrdn2_s :
-   conn -> dn:string -> newdn:string -> deleteoldrdn:bool -> unit
- 
--(* Prints the given entry in LDIF format to the specified channel. *)
-+(** Prints the given entry in LDIF format to the specified channel. *)
- val print_entry : ?channel:out_channel -> entry -> unit
- 
--(* Search for the given entry with the specified base node and search scope,
-+(** Search for the given entry with the specified base node and search scope,
-  optionally limiting the returned attributes to those listed in 'attrs'. *)
- val search_s :
-   ?base:string ->
-   ?scope:search_scope ->
-   ?attrs:string list -> ?attrsonly:bool -> conn -> string -> result
- 
--(* Bind using simple authentication.  This is equivalent to calling bind_s
-+(** Bind using simple authentication.  This is equivalent to calling bind_s
- with auth_method `SIMPLE *)
- val simple_bind_s : ?who:string -> ?password:string -> conn -> unit
- 
--(* Releases the ldap connection and frees associated resources.  The ldap
-+(** Releases the ldap connection and frees associated resources.  The ldap
- connection should not be used after it has been unbound. *)
- val unbind : conn -> unit
-diff -urNad /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap-1.1.0/ooldap.mli ocamldap-1.1.0/ooldap.mli
---- /mnt/nfs0/gildor/deb/cvs-package/ocamldap/ocamldap-1.1.0/ooldap.mli	2003-09-21 16:18:45.000000000 +0200
-+++ ocamldap-1.1.0/ooldap.mli	2003-09-21 16:23:20.000000000 +0200
-@@ -1,87 +1,85 @@
- 
--(* 
--   The object oriented interface to ocamldap
--*)
-+(** Object oriented interface to LDAP *)
- 
--(* just like modatts, but the mod_op is not needed *)
-+(* Just like modatts, but the mod_op is not needed *)
- type op = string * string list
- type op_lst = op list
- type changetype = ADD | DELETE | MODIFY | MODDN | MODRDN
- 
--(* an ldap entry, returned from a server *)
-+(** An ldap entry, returned from a server *)
- class ldapentry :
- object
--  (* add attributes and objectclasses to an entry locally *)
-+  (** Add attributes and objectclasses to an entry locally *)
-   method add : op_lst -> unit
- 
--  (* delete attributes and objectclasses from an entry locally *)
-+  (** Delete attributes and objectclasses from an entry locally *)
-   method delete : op_lst -> unit
- 
--  (* replace attributes and objectclasses in an entry locally *)
-+  (** Replace attributes and objectclasses in an entry locally *)
-   method replace : op_lst -> unit
- 
--  (* get a list of attributes on the entry *)
-+  (** Get a list of attributes on the entry *)
-   method attributes : string list
- 
--  (* get a list of values for an entry *)
-+  (** Get a list of values for an entry *)
-   method get_value : string -> string list
- 
--  (* get a list of changes made to the entry locally in the
-+  (** Get a list of changes made to the entry locally in the
-      form of a modattr list suitable for feeding directly to
-      modify_s *)
-   method changes : (Ocamldap.mod_op * string * string list) list
- 
--  (* get the changetype. Controls whether or not local changes to the
-+  (** Get the changetype. Controls whether or not local changes to the
-      entry are recorded or not. *)
-   method changetype : changetype
- 
--  (* set the changetype. changetype MODIFY will record changes, all others
-+  (** Set the changetype. changetype MODIFY will record changes, all others
-      will ignore them for now. This only applies to the changes list, 
-      locally stored attributs will always be changed *)
-   method set_changetype : changetype -> unit
- 
--  (* get rid of recorded changes. Note, this will not change the
-+  (** Get rid of recorded changes. Note, this will not change the
-      the locally recorded value of any attributes on the entry, it
-      will only prevent changes from being propigated to the server when
-      passing this entry to update_entry *)
-   method flush_changes : unit
- 
--  (* get the distinguished name of the entry *)
-+  (** Get the distinguished name of the entry *)
-   method dn : string
-   
--  (* set the destinguished name of the entry *)
-+  (** Set the destinguished name of the entry *)
-   method set_dn : string -> unit
- 
--  (* print the enty in a semi ldif like format (line breaks aren't correct yet) *)
-+  (** Print the enty in a semi ldif like format (line breaks aren't correct yet) *)
-   method print : unit
- end
- 
--(* a connection to an ldap server. *)
-+(** A connection to an ldap server. *)
- class ldapcon :
-   ?version:int ->
-   ?async:bool ->
-   ?port:int ->
-   string ->
- object
--  (* add an entry to the server *)
-+  (** Add an entry to the server *)
-   method add : ldapentry -> unit
- 
--  (* bind to the server *)
-+  (** Bind to the server *)
-   method bind :
-     ?cred:string -> ?meth:Ocamldap.auth_method -> string -> unit
- 
--  (* delete an entry from the server *)
-+  (** Delete an entry from the server *)
-   method delete : string -> unit
- 
--  (* modify an entry in the server *)
-+  (** Modify an entry in the server *)
-   method modify : string -> Ocamldap.modattr list -> unit
- 
--  (* find entries, and return them as ldapentry objects *)
-+  (** Find entries, and return them as ldapentry objects *)
-   method search :
-     ?scope:Ocamldap.search_scope ->
-     ?attrs:string list ->
-     ?attrsonly:bool -> ?base:string -> string -> ldapentry list
- 
--  (* sync changes made locally with the server *)
-+  (** Sync changes made locally with the server *)
-   method update_entry : ldapentry -> unit
- end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamldap.git



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