[Pkg-ocaml-maint-commits] [SCM] ocaml-r packaging branch, master, updated. upstream/0.1-14-ga64a6bd

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit a64a6bd749d593bc033341019514ecaa9b7aef78
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Sun Oct 18 19:26:07 2009 +0200

    Using debian/clean to clean rdevices files instead of a patch.

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..832c0d8
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+src/rdevices.ml
+src/r_devices.c
diff --git a/debian/patches/rm_rdevices.diff b/debian/patches/rm_rdevices.diff
deleted file mode 100644
index fd87c44..0000000
--- a/debian/patches/rm_rdevices.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-Subject: [PATCH] Removing src/rdevices.ml and src/r_devices.c
-
---- a/src/rdevices.ml
-+++ /dev/null
-@@ -1,32 +0,0 @@
--(*********************************************************************************)
--(*                OCaml-R                                                        *)
--(*                                                                               *)
--(*    Copyright (C) 2008 Institut National de Recherche en Informatique et       *)
--(*    en Automatique. All rights reserved.                                       *)
--(*                                                                               *)
--(*    This program is free software; you can redistribute it and/or modify       *)
--(*    it under the terms of the GNU General Public License as                    *)
--(*    published by the Free Software Foundation; either version 2 of the         *)
--(*    License, or  any later version.                                            *)
--(*                                                                               *)
--(*    This program is distributed in the hope that it will be useful,            *)
--(*    but WITHOUT ANY WARRANTY; without even the implied warranty of             *)
--(*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *)
--(*    GNU Library General Public License for more details.                       *)
--(*                                                                               *)
--(*    You should have received a copy of the GNU General Public                  *)
--(*    License along with this program; if not, write to the Free Software        *)
--(*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA                   *)
--(*    02111-1307  USA                                                            *)
--(*                                                                               *)
--(*    Contact: Maxence.Guesdon at inria.fr                                          *)
--(*                                                                               *)
--(*********************************************************************************)
--
--(** Bindings to the devices functions. *)
--
--(*
--external init_graphics : unit -> unit = "r_initGraphics"
--external kill_all_devices : unit -> unit = "r_killAllDevices"
--external free_type1_fonts : unit -> unit = "r_freeType1Fonts"
--*)
-\ No newline at end of file
---- a/src/r_devices.c
-+++ /dev/null
-@@ -1,42 +0,0 @@
--/*********************************************************************************/
--/*                OCaml-R                                                        */
--/*                                                                               */
--/*    Copyright (C) 2008 Institut National de Recherche en Informatique et       */
--/*    en Automatique. All rights reserved.                                       */
--/*                                                                               */
--/*    This program is free software; you can redistribute it and/or modify       */
--/*    it under the terms of the GNU General Public License as                    */
--/*    published by the Free Software Foundation; either version 2 of the         */
--/*    License, or  any later version.                                            */
--/*                                                                               */
--/*    This program is distributed in the hope that it will be useful,            */
--/*    but WITHOUT ANY WARRANTY; without even the implied warranty of             */
--/*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              */
--/*    GNU Library General Public License for more details.                       */
--/*                                                                               */
--/*    You should have received a copy of the GNU General Public                  */
--/*    License along with this program; if not, write to the Free Software        */
--/*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA                   */
--/*    02111-1307  USA                                                            */
--/*                                                                               */
--/*    Contact: Maxence.Guesdon at inria.fr                                          */
--/*                                                                               */
--/*********************************************************************************/
--
--/* Access to the devices. */
--
--#include <mlvalues.h>
--#include <alloc.h>
--#include <memory.h>
--#include <Rdefines.h>
--#include <Rdevices.h>
--#include "wrappers.h"
--
--#define Val_devdesc(x) Val_long(x)
--#define Devdesc_val(x) Long_val(x)
--
--/*
--CAMLprim void r_initGraphics() { InitGraphics(); }
--CAMLprim void r_killAllDevices() { KillAllDevices(); }
--CAMLprim void r_freeType1Fonts() { freeType1Fonts(); }
--*/
diff --git a/debian/patches/series b/debian/patches/series
index d58b4be..7f1fce4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fPIC.diff
 new-build-system.diff
-rm_rdevices.diff

-- 
ocaml-r packaging