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

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit c9a3e253fc5a9b042e9c5d2225b0f78276994738
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Fri Oct 16 16:36:04 2009 +0200

    Removing src/r_devices.c too.

diff --git a/debian/patches/rm_rdevices.diff b/debian/patches/rm_rdevices.diff
index bc26e29..fd87c44 100644
--- a/debian/patches/rm_rdevices.diff
+++ b/debian/patches/rm_rdevices.diff
@@ -1,8 +1,6 @@
 From: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-Subject: [PATCH] Removing src/rdevices.ml
+Subject: [PATCH] Removing src/rdevices.ml and src/r_devices.c
 
-Index: ocaml-r-0.1/src/rdevices.ml
-===================================================================
 --- a/src/rdevices.ml
 +++ /dev/null
 @@ -1,32 +0,0 @@
@@ -39,3 +37,48 @@ Index: ocaml-r-0.1/src/rdevices.ml
 -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(); }
+-*/

-- 
ocaml-r packaging