[Pkg-ocaml-maint-commits] [SCM] ocaml-r packaging branch, master, updated. upstream/0.1-38-g1b4b772
Guillaume Yziquel
guillaume.yziquel at citycable.ch
Fri Nov 6 22:49:01 UTC 2009
The following commit has been merged in the master branch:
commit 1b4b772ab0d0d167b33bc864d7cdc442711ae3a7
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date: Fri Nov 6 23:47:24 2009 +0100
Removing the cleaning patch, ignoring files instead.
diff --git a/debian/patches/cleaning.diff b/debian/patches/cleaning.diff
deleted file mode 100644
index 4937a51..0000000
--- a/debian/patches/cleaning.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-Subject: [PATCH] Cleaning two useless upstream files.
-===================================================================
---- 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(); }
--*/
---- 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
diff --git a/debian/patches/series b/debian/patches/series
index d9d2924..fbae5cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
fPIC.diff
-cleaning.diff
new-build-system.diff
cmxs.diff
--
ocaml-r packaging
More information about the Pkg-ocaml-maint-commits
mailing list