[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-28-g5f02eb5

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 3ba828c5fe8794c4799e8643d33dc83b95d8a126
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Mar 8 12:53:13 2009 +0100

    Remove unused patches

diff --git a/debian/patches/byte_compilation.dpatch b/debian/patches/byte_compilation.dpatch
deleted file mode 100755
index 22106dc..0000000
--- a/debian/patches/byte_compilation.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## byte_compilation.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad cameleon-1.9.9.cvs20051129~/src/Makefile cameleon-1.9.9.cvs20051129/src/Makefile
---- cameleon-1.9.9.cvs20051129~/src/Makefile	2005-12-19 23:06:28.000000000 +0100
-+++ cameleon-1.9.9.cvs20051129/src/Makefile	2005-12-19 23:07:10.000000000 +0100
-@@ -336,7 +336,7 @@
- OCAMLCVS_LIB_CMOFILES=$(OCAMLCVS_COMMON_CMOFILES) \
- 	ocamlcvs/ocamlcvs.cmo
- OCAMLCVS_LIB_CMXFILES= $(OCAMLCVS_LIB_CMOFILES:.cmo=.cmx)
--OCAMLCVS_LIB_CMIFILES= $(OCAMLCVS_LIB_CMOFILES:.cmo=.cmx)
-+OCAMLCVS_LIB_CMIFILES= $(OCAMLCVS_LIB_CMOFILES:.cmo=.cmi)
- 
- LIBOCAMLCVS=ocamlcvs/ocamlcvs.cmxa
- LIBOCAMLCVS_BYTE=$(LIBOCAMLCVS:.cmxa=.cma)
-@@ -357,7 +357,11 @@
- tools: libs $(TOOLS)
- tools_byte: libs_byte $(TOOLS_BYTE)
- 
-+ifeq ($(OCAMLBEST),opt)
- all: byte plugins opt
-+else
-+all: byte plugins
-+endif
- 
- libcf: $(LIBCF_INT) $(LIBCF)
- libcf_byte: $(LIBCF_INT) $(LIBCF_BYTE)
diff --git a/debian/patches/mktop_bad_header.dpatch b/debian/patches/mktop_bad_header.dpatch
deleted file mode 100755
index 34f75af..0000000
--- a/debian/patches/mktop_bad_header.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mktop_bad_header.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad cameleon-1.9.16~/src/camtop/cam-mktop2.in cameleon-1.9.16/src/camtop/cam-mktop2.in
---- cameleon-1.9.16~/src/camtop/cam-mktop2.in	2006-11-23 23:25:42.000000000 +0100
-+++ cameleon-1.9.16/src/camtop/cam-mktop2.in	2006-11-30 01:13:27.000000000 +0100
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #################################################################################
- #                Cameleon                                                       #
- #                                                                               #
-@@ -22,19 +23,6 @@
- #    Contact: Maxence.Guesdon at inria.fr                                          #
- #                                                                               #
- #################################################################################
--
--#!/bin/sh
--#########################################################################
--#                                                                       #
--#                            Objective Caml                             #
--#                                                                       #
--#            Maxence Guesdon, projet Cristal, INRIA Rocquencourt        #
--#                                                                       #
--#   Copyright 2002 Institut National de Recherche en Informatique et    #
--#   en Automatique.  All rights reserved.  This file is distributed     #
--#   under the terms of the GNU General Public License version 2.        #
--#                                                                       #
--#########################################################################
- # From the original ocamlmktop script by Damien Doligez
- 
- # $Id: cam-mktop2.in 334 2006-10-06 07:34:42Z zoggy $
diff --git a/debian/patches/testpcre.dpatch b/debian/patches/testpcre.dpatch
deleted file mode 100755
index cc5b9cc..0000000
--- a/debian/patches/testpcre.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## testpcre.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad cameleon-1.9.17~/utils/checkocaml.ml cameleon-1.9.17/utils/checkocaml.ml
---- cameleon-1.9.17~/utils/checkocaml.ml	2006-11-27 16:46:38.000000000 +0100
-+++ cameleon-1.9.17/utils/checkocaml.ml	2006-12-04 23:18:07.000000000 +0100
-@@ -947,7 +947,7 @@
-   let prog = "assert Pcre.config_utf8;;" in
-   let f mode =
-     let prog = create_temp_file ~contents: prog ~ext: "ml" () in
--    let out = "testpcre.x" in
-+    let out = "./testpcre.x" in
-     let mes = Printf.sprintf
-       "Testing compiling a pcre program to check for UTF-8 support [%s]..." 
-       (string_of_mode mode)
-@@ -1023,4 +1023,4 @@
-   if Array.length Sys.argv < 2 then
-     !fatal_error "No output file given for substitutions!"
-   else
--    output_substs_to_file Sys.argv.(1);;
-\ No newline at end of file
-+    output_substs_to_file Sys.argv.(1);;

-- 
cameleon packaging