The following commit has been merged in the master branch:
commit 496697df89eb0fb41333ca23787360eb15e59047
Author: Stephane Glondu <st...@glondu.net>
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..0000000
--- 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..0000000
--- 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 <me...@debian.org>, 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 0000000..b0da524
--- /dev/null
+++ b/debian/patches/0001-Make-facile-available-for-more-architectures.patch
@@ -0,0 +1,46 @@
+From: Steffen Joeris <steffen.joe...@skolelinux.de>
+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 <steffen.joe...@skolelinux.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Here we make facile available for more architectures :=)
+From: Steffen Joeris <steffen.joe...@skolelinux.de>
+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.000000000 +0100
-+++ facile-1.1/Makefile        2005-11-04 17:18:33.000000000 +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 0000000..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 <l...@dooz.org>
+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(-)
+
+diff --git a/Makefile b/Makefile
+index 78a6dfe..0854fb2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,4 +24,4 @@ distclean uninstall:
+       rm -fr $(FACILEDIR)
+ 
+ check:
+-      cd examples; make FACILEDIR=../src queens.opt; ./queens.opt 8
++      cd examples; $(MAKE) FACILEDIR=../src queens.out && ./queens.out 8
+-- 
diff --git a/debian/patches/40-allow-ocamlc-override-in-examples.dpatch 
b/debian/patches/0004-Allow-overriding-OCAMLC-in-examples.patch
old mode 100755
new mode 100644
similarity index 70%
rename from debian/patches/40-allow-ocamlc-override-in-examples.dpatch
rename to debian/patches/0004-Allow-overriding-OCAMLC-in-examples.patch
index c72bf5e..7a9b017
--- a/debian/patches/40-allow-ocamlc-override-in-examples.dpatch
+++ b/debian/patches/0004-Allow-overriding-OCAMLC-in-examples.patch
@@ -1,14 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-allow-ocamlc-override-in-examples.dpatch by Loic Minier <l...@dooz.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: allow overriding OCAMLC in examples by using separate _INVOKE vars to
-## DP: run misc commands.
+From: Loic Minier <l...@dooz.org>
+Date: Wed, 17 Aug 2011 21:30:26 +0200
+Subject: Allow overriding OCAMLC in examples
 
-@DPATCH@
-diff -urNad facile-1.1~/examples/Makefile facile-1.1/examples/Makefile
---- facile-1.1~/examples/Makefile      2004-09-08 11:51:02.000000000 +0200
-+++ facile-1.1/examples/Makefile       2008-10-09 15:36:32.000000000 +0200
+This is done by using separate _INVOKE vars to run misc commands.
+---
+ examples/Makefile |   26 ++++++++++++++------------
+ 1 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/examples/Makefile b/examples/Makefile
+index e3a2194..82029f1 100644
+--- a/examples/Makefile
++++ b/examples/Makefile
 @@ -7,32 +7,34 @@
  FACILEDIR= +facile
  INCLUDES= -I $(FACILEDIR)
@@ -55,7 +57,7 @@ diff -urNad facile-1.1~/examples/Makefile 
facile-1.1/examples/Makefile
  .mly.ml :
        ocamlyacc $<
  .mll.ml :
-@@ -42,6 +44,6 @@
+@@ -42,6 +44,6 @@ clean:
        \rm -f *.cmo *.cmi *.cmx *.o *~ *.opt *.out .depend *.popt
  
  .depend:
@@ -63,3 +65,4 @@ diff -urNad facile-1.1~/examples/Makefile 
facile-1.1/examples/Makefile
 +      $(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@
  
  include .depend
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 00ab557..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-10-srcMakefile
-20-Makefile
-30-non-opt-check
-40-allow-ocamlc-override-in-examples
diff --git a/debian/patches/10-srcMakefile.dpatch 
b/debian/patches/10-srcMakefile.dpatch
deleted file mode 100755
index 222ae07..0000000
--- a/debian/patches/10-srcMakefile.dpatch
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh -e
-## 10-debianlike.dpatch by Steffen Joeris <steffen.joe...@skolelinux.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Here we make facile available for more architectures :=)
-
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -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 16:52:50.000000000 +0100
-+++ facile-1.1/src/Makefile    2005-11-04 16:54:54.000000000 +0100
-@@ -15,8 +15,13 @@
- 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 @@
-       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 @@
-       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/30-non-opt-check.dpatch 
b/debian/patches/30-non-opt-check.dpatch
deleted file mode 100755
index c6a8def..0000000
--- a/debian/patches/30-non-opt-check.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30-non-opt-check.dpatch by Loic Minier <l...@dooz.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ocamlopt isn't available on all arches; don't use it for make check
-
-@DPATCH@
-diff -urNad facile-1.1~/Makefile facile-1.1/Makefile
---- facile-1.1~/Makefile       2008-10-09 15:26:49.000000000 +0200
-+++ facile-1.1/Makefile        2008-10-09 15:26:57.000000000 +0200
-@@ -24,4 +24,4 @@
-       rm -fr $(FACILEDIR)
- 
- check:
--      cd examples; make FACILEDIR=../src queens.opt; ./queens.opt 8
-+      cd examples; $(MAKE) FACILEDIR=../src queens.out && ./queens.out 8
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..13ec16d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+0001-Make-facile-available-for-more-architectures.patch
+0002-Make-facile-available-for-more-architectures.patch
+0003-ocamlopt-isn-t-available-on-all-arches-don-t-use-it-.patch
+0004-Allow-overriding-OCAMLC-in-examples.patch
diff --git a/debian/rules b/debian/rules
index c84d1b2..07d07ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
@@ -19,6 +18,7 @@ config_Makefile:
        sed 's/@VERSION@/$(VERSION)/' debian/META.in > $(CURDIR)/META
 
 clean::
+       rm -f META
        # not cleaned upstream
        rm -f config_Makefile
        $(DEB_MAKE_INVOKE) -k -C examples clean
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
facile packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to