--- facile-1.1.orig/debian/watch +++ facile-1.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.recherche.enac.fr/opti/facile/distrib/ \ + facile-([\d.]+).tar.gz --- facile-1.1.orig/debian/svn-deblayout +++ facile-1.1/debian/svn-deblayout @@ -0,0 +1,3 @@ +origDir=../upstream +origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/facile/upstream +tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/facile --- facile-1.1.orig/debian/libfacile-ocaml-dev.examples +++ facile-1.1/debian/libfacile-ocaml-dev.examples @@ -0,0 +1,2 @@ +examples/*.ml +examples/*.dat --- facile-1.1.orig/debian/rules +++ facile-1.1/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/class/makefile.mk + +OCAMLABI := $(shell ocamlc -version) +FACILEDIR := $(shell ocamlc -where)/facile +DEB_INSTALL_DIRS_ALL += $(FACILEDIR) +DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlABI="$(OCAMLABI)" +DEB_MAKE_INVOKE += OCAMLC="ocamlc -g" OCAMLMLI=ocamlc +DEB_MAKE_INSTALL_TARGET := install +DEB_MAKE_CHECK_TARGET := check + +common-configure-arch common-configure-indep:: common-configure-impl +common-configure-impl:: config_Makefile +config_Makefile: + ./configure --faciledir debian/libfacile-ocaml-dev/$(FACILEDIR) + +clean:: + # not cleaned upstream + rm -f config_Makefile + $(DEB_MAKE_INVOKE) -k -C examples clean + --- facile-1.1.orig/debian/control +++ facile-1.1/debian/control @@ -0,0 +1,32 @@ +Source: facile +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: Steffen Joeris +Build-Depends: debhelper (>= 5), cdbs (>= 0.4.21), ocaml-nox (>= 3.09.2), dpatch +Standards-Version: 3.8.0 +Section: libdevel +Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/facile +Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/ + +Package: libfacile-ocaml-dev +Section: libdevel +Architecture: any +Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends} +Description: functional constraint library implemented in objective caml + FaCiLe is a constraint programming library over integer finite domain + written in Objective Caml. It offers all usual facilities to create + and manipulate finite domain variables, arithmetic expressions and + constraints (possibly non-linear), built-in global constraints and + search goals. FaCiLe allows as well to build easily user-defined + constraints and goals (including recursive ones), making pervasive use + of OCaml higher-order functionals to provide a simple and flexible + interface for the user. As FaCiLe is an OCaml library and not "yet + another language", the user benefits from type inference and strong + typing discipline, high level of abstraction, modules and objects + system, as well as native code compilation efficiency, garbage + collection and replay debugger, all features of OCaml (among many + others) that allow to prototype and experiment quickly: modeling, data + processing and interface are implemented with the same powerful and + efficient language. + . + Web site: http://www.recherche.enac.fr/opti/facile --- facile-1.1.orig/debian/compat +++ facile-1.1/debian/compat @@ -0,0 +1 @@ +5 --- facile-1.1.orig/debian/copyright +++ facile-1.1/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Steffen Joeris on +Sun, 30 Oct 2005 00:41:20 +0200. + +It was downloaded from http://www.recherche.enac.fr/opti/facile/distrib/ + +Copyright Holder: Copyright (C) 2001, 2004, CENA + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- facile-1.1.orig/debian/changelog +++ facile-1.1/debian/changelog @@ -0,0 +1,102 @@ +facile (1.1-6.3) unstable; urgency=low + + * Call clean in examples/ manually as upstream's Makefile wont and cdbs + doesn't keep the patches applied when cleaning. + * Fix ocamlopt usage; closes: #501672. + - New dpatch, 30-non-opt-check, ocamlopt isn't available on all arches; + don't use it for make check. + - New patch, 40-allow-ocamlc-override-in-examples, allow overriding OCAMLC + in examples by using separate _INVOKE vars to run misc commands. + + -- Loic Minier Thu, 09 Oct 2008 15:20:00 +0200 + +facile (1.1-6.2) unstable; urgency=low + + [ Stefano Zacchiroli ] + * fix vcs-svn field to point just above the debian/ dir + + [ Loic Minier ] + * Non-maintainer upload to fix misc packaging bugs; closes: #500830. + * Only compute OCAML_ABI once by using := instead of =. + * Don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of -- to pass + args to dpkg-gencontrol in a safer manner. + * Include dpatch.mk instead of calling dpatch manually; NB: this will cause + the patches to be applied before running configure which is more useful, + but doesn't change anything with the current patches; bump up cdbs bdep to + >= 0.4.21. + * Use the makefile.mk cdbs class instead of the autotools one. + - Move the configure flag to a new custom common-configure-impl / + config_Makefile rule. + - Drop --disable-maintainer-mode exclusion hack. + - Don't call make clean in clean; cdbs does that for us. + - Set DEB_MAKE_INSTALL_TARGET to install. + * Drop redundant setting of FACILEDIR with the echo >config_Makefile + construct; the configure flag works fine. + * Replace debian/libfacile-ocaml-dev.dirs.in template and logic with + DEB_INSTALL_DIRS_ALL; fixes lack of cleanup of + debian/libfacile-ocaml-dev.dirs. + * Set OCAMLC OCAMLMLI via DEB_MAKE_INVOKE instead of DEB_MAKE_BUILD_TARGET; + this sets the same environment for all make runs. + * Add year 2004 to copyright. + * Point at common-licenses for the full text of the LGPL and include the + full licensing header. + * Depend on ${misc:Depends} as recommended in debhelper 5. + * Set DEB_MAKE_CHECK_TARGET to check to run the testsuite during package + build. + * Use Vcs-* headers instead of XS-Vcs-*. + * Bump up Standards-Version to 3.8.0. + * Provide examples/*.ml and examples/*.dat as examples; closes: #446804. + + -- Loic Minier Thu, 02 Oct 2008 12:37:48 +0200 + +facile (1.1-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Rebuilding against ocaml 3.10 (closes: #442997) + + -- Stefano Zacchiroli Tue, 18 Sep 2007 09:34:40 +0200 + +facile (1.1-6) unstable; urgency=low + + * Bump debhelper level to 5 + * Change my maintainer address + + -- Steffen Joeris Wed, 3 Jan 2007 22:16:17 +0100 + +facile (1.1-5) unstable; urgency=low + + * Rebuild with OCaml 3.09.2 + * Bump standard version to 3.7.2 + * Remove control.in as we no longer have a need for that + + -- Steffen Joeris Wed, 17 May 2006 22:55:21 +0200 + +facile (1.1-4) unstable; urgency=low + + * Make sure that the *.mli files are installed before + the *.cmi files (Closes: #352008) + + -- Steffen Joeris Thu, 9 Feb 2006 12:52:11 +0100 + +facile (1.1-3) unstable; urgency=low + + * Rebuild with OCaml 3.09.1 + * Add control.in which is only called manually + with a special rule and not during the build + + -- Steffen Joeris Sun, 8 Jan 2006 18:51:12 +0100 + +facile (1.1-2) unstable; urgency=low + + * Adapt patch to upstream Makefile to not try to build the native library + when ocamlopt isn't available (Closes: #340305). + Thanks to Julien Cristau + + -- Steffen Joeris Tue, 22 Nov 2005 19:18:05 +0100 + +facile (1.1-1) unstable; urgency=low + + * Initial release (Closes: #336852) + + -- Steffen Joeris Sun, 30 Oct 2005 00:41:20 +0200 + --- facile-1.1.orig/debian/patches/40-allow-ocamlc-override-in-examples.dpatch +++ facile-1.1/debian/patches/40-allow-ocamlc-override-in-examples.dpatch @@ -0,0 +1,65 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40-allow-ocamlc-override-in-examples.dpatch by Loic Minier +## +## 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. + +@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 +@@ -7,32 +7,34 @@ + FACILEDIR= +facile + INCLUDES= -I $(FACILEDIR) + +-OCAMLC= ocamlc -g $(INCLUDES) +-OCAMLMLI= ocamlc $(INCLUDES) +-OCAMLOPT= ocamlopt $(INCLUDES) +-OCAMLDEP= ocamldep $(INCLUDES) ++OCAMLC= ocamlc -g ++OCAMLMLI= ocamlc ++OCAMLOPT= ocamlopt ++OCAMLDEP= ocamldep ++OCAMLC_INVOKE = $(OCAMLC) $(INCLUDES) ++OCAMLOPT_INVOKE = $(OCAMLOPT) $(INCLUDES) + + .SUFFIXES: + .SUFFIXES: .ml .mli .mly .mll .cmi .cmo .cmx .out .opt .p.cmx .popt + + .ml.cmo : +- $(OCAMLC) -c $< ++ $(OCAMLC_INVOKE) -c $< + .mli.cmi : +- $(OCAMLMLI) -c $< ++ $(OCAMLMLI) $(INCLUDES) -c $< + .ml.cmx : +- $(OCAMLOPT) -c $< ++ $(OCAMLOPT_INVOKE) -c $< + # To produce profiled objects + .ml.p.cmx : +- $(OCAMLOPT) -p -c $< ++ $(OCAMLOPT_INVOKE) -p -c $< + mv $*.cmx $@ + mv $*.o $*.p.o + .cmo.out : +- $(OCAMLC) -o $@ facile.cma $< ++ $(OCAMLC_INVOKE) -o $@ facile.cma $< + # To produce profiled binaries + .p.cmx.popt : +- $(OCAMLOPT) -p -o $@ facile.p.cmxa $< ++ $(OCAMLOPT_INVOKE) -p -o $@ facile.p.cmxa $< + .cmx.opt : +- $(OCAMLOPT) -o $@ facile.cmxa $< ++ $(OCAMLOPT_INVOKE) -o $@ facile.cmxa $< + .mly.ml : + ocamlyacc $< + .mll.ml : +@@ -42,6 +44,6 @@ + \rm -f *.cmo *.cmi *.cmx *.o *~ *.opt *.out .depend *.popt + + .depend: +- $(OCAMLDEP) *.mli *.ml > $@ ++ $(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@ + + include .depend --- facile-1.1.orig/debian/patches/20-Makefile.dpatch +++ facile-1.1/debian/patches/20-Makefile.dpatch @@ -0,0 +1,48 @@ +#!/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 :=) + +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 17:13:52.000000000 +0100 ++++ facile-1.1/Makefile 2005-11-04 17:18:33.000000000 +0100 +@@ -7,11 +7,15 @@ + + install: + if test -d $(FACILEDIR); then : ; else mkdir $(FACILEDIR); fi +- cp src/facile.cmi src/facile.cma src/facile.cmxa src/facile.a $(FACILEDIR) +- chmod a+r $(FACILEDIR)/facile.cmi +- chmod a+r $(FACILEDIR)/facile.cma +- chmod a+r $(FACILEDIR)/facile.cmxa +- chmod a+r $(FACILEDIR)/facile.a ++ install -m 644 src/*.mli $(FACILEDIR) ++ if [ -e src/facile.cmi ] ; then cp src/facile.cmi $(FACILEDIR) ; fi ++ if [ -e src/facile.cma ] ; then cp src/facile.cma $(FACILEDIR) ; fi ++ if [ -e src/facile.a ] ; then cp src/facile.a $(FACILEDIR) ; fi ++ if [ -e src/facile.cmxa ] ; then cp src/facile.cmxa $(FACILEDIR) ; fi ++ if [ -e $(FACILEDIR)/facile.cmi ] ; then chmod a+r $(FACILEDIR)/facile.cmi ; fi ++ if [ -e $(FACILEDIR)/facile.cma ] ; then chmod a+r $(FACILEDIR)/facile.cma ; fi ++ if [ -e $(FACILEDIR)/facile.cmxa ] ; then chmod a+r $(FACILEDIR)/facile.cmxa ; fi ++ if [ -e $(FACILEDIR)/facile.a ] ; then chmod a+r $(FACILEDIR)/facile.a ; fi + + clean: + cd src; make clean --- facile-1.1.orig/debian/patches/00list +++ facile-1.1/debian/patches/00list @@ -0,0 +1,4 @@ +10-srcMakefile +20-Makefile +30-non-opt-check +40-allow-ocamlc-override-in-examples --- facile-1.1.orig/debian/patches/30-non-opt-check.dpatch +++ facile-1.1/debian/patches/30-non-opt-check.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30-non-opt-check.dpatch by Loic Minier +## +## 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 --- facile-1.1.orig/debian/patches/10-srcMakefile.dpatch +++ facile-1.1/debian/patches/10-srcMakefile.dpatch @@ -0,0 +1,60 @@ +#!/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 :=) + +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