The following commit has been merged in the master branch:
commit 496697df89eb0fb41333ca23787360eb15e59047
Author: Stephane Glondu
Date: Wed Aug 17 21:34:39 2011 +0200
Switch source package format to 3.0 (quilt)
diff --git a/config_Makefile b/config_Makefile
deleted file mode 100644
index bb5313e..000
--- a/config_Makefile
+++ /dev/null
@@ -1 +0,0 @@
-FACILEDIR=please_run_configure_before_make
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 9bd8e80..000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package use dpatch for patching the source.
-
-Please consider reading dpatch manpage to patch the source.
-
- -- Mehdi Dogguy , Tue, 6 Oct 2009 13:15:48 +0200
diff --git a/debian/control b/debian/control
index 349aa70..fa43a24 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
debhelper (>= 7.0.50~),
cdbs,
ocaml-nox (>= 3.11.1-3~),
- dpatch,
dh-ocaml (>= 0.9~)
Standards-Version: 3.9.2
Section: ocaml
diff --git
a/debian/patches/0001-Make-facile-available-for-more-architectures.patch
b/debian/patches/0001-Make-facile-available-for-more-architectures.patch
new file mode 100644
index 000..b0da524
--- /dev/null
+++ b/debian/patches/0001-Make-facile-available-for-more-architectures.patch
@@ -0,0 +1,46 @@
+From: Steffen Joeris
+Date: Wed, 17 Aug 2011 21:26:52 +0200
+Subject: Make facile available for more architectures
+
+---
+ src/Makefile | 11 ---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 94d8326..d1c032f 100644
+--- a/src/Makefile
b/src/Makefile
+@@ -15,8 +15,13 @@ CSTR= fcl_debug.ml fcl_misc.ml fcl_domain.ml
fcl_setDomain.ml fcl_float.ml fcl_s
+ CSTRCMO = $(CSTR:.ml=.cmo)
+ CSTRCMX = $(CSTR:.ml=.cmx)
+
++CMXA =
++ifneq ($(wildcard /usr/bin/ocamlopt),)
++CMXA = facile.cmxa
++endif
++
+ # Default target: libraries and toplevel
+-all : facile.cma facile.cmxa facile
++all : facile.cma $(CMXA) facile
+
+ # Libraries
+ facile.cma : $(CSTRCMO)
+@@ -31,7 +36,7 @@ facile.p.cmxa : $(CSTR)
+ make facile.cmxa OPTOPT=-p
+ rm -fr $(CSTRCMX)
+ mv facile.cmxa $@
+- mv facile.a facile.p.a
++ if [ -e facile.a ] ; then mv facile.a facile.p.a ; fi
+
+ # Toplevel (to be run with the "-I +facile" option)
+ facile : facile.cma
+@@ -45,7 +50,7 @@ facile.exp.cmxa : $(CSTR)
+ make facile.cmxa OPTOPT="-pp inline_functors"
+ rm -fr $(CSTRCMX)
+ mv facile.cmxa $@
+- mv facile.a facile.exp.a
++ if [ -e facile.a ] ; then mv facile.a facile.exp.a ; fi
+
+ .SUFFIXES:
+ .SUFFIXES: .ml .mli .mly .mll .cmi .cmo .cmx .p.cmx .s
+--
diff --git a/debian/patches/20-Makefile.dpatch
b/debian/patches/0002-Make-facile-available-for-more-architectures.patch
old mode 100755
new mode 100644
similarity index 54%
rename from debian/patches/20-Makefile.dpatch
rename to debian/patches/0002-Make-facile-available-for-more-architectures.patch
index 49388a4..a466ac3
--- a/debian/patches/20-Makefile.dpatch
+++ b/debian/patches/0002-Make-facile-available-for-more-architectures.patch
@@ -1,31 +1,16 @@
-#!/bin/sh -e
-## 10-debianlike.dpatch by Steffen Joeris
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Here we make facile available for more architectures :=)
+From: Steffen Joeris
+Date: Wed, 17 Aug 2011 21:28:29 +0200
+Subject: Make facile available for more architectures
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
+---
+ Makefile | 14 +-
+ 1 files changed, 9 insertions(+), 5 deletions(-)
-[ -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
-
-@DPATCH@
Makefile.orig 2005-11-04 17:13:52.0 +0100
-+++ facile-1.1/Makefile2005-11-04 17:18:33.0 +0100
-@@ -7,11 +7,15 @@
+diff --git a/Makefile b/Makefile
+index 1f15b06..78a6dfe 100644
+--- a/Makefile
b/Makefile
+@@ -7,11 +7,15 @@ compile:
install:
if test -d $(FACILEDIR); then : ; else mkdir $(FACILEDIR); fi
@@ -46,3 +31,4 @@ exit 0
clean:
cd src; make clean
+--
diff --git
a/debian/patches/0003-ocamlopt-isn-t-available-on-all-arches-don-t-use-it-.patch
b/debian/patches/0003-ocamlopt-isn-t-available-on-all-arches-don-t-use-it-.patch
new file mode 100644
index 000..9b810ed
--- /dev/null
+++
b/debian/patches/0003-ocamlopt-isn-t-available-on-all-arches-don-t-use-it-.patch
@@ -0,0 +1,19 @@
+From: Loic Minier
+Date: Wed, 17 Aug 2011 21:29:27 +0200
+Subject: ocamlopt isn't available on all arches; don't use it for make check
+
+---
+ Makefile |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(
