This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch experimental/master in repository dose3.
commit 4cdd84f3a0917e5ffaf51b335361bf78e34dc365 Author: Ralf Treinen <trei...@free.fr> Date: Sun Apr 27 17:46:38 2014 +0200 drop patch configure-dynlink solved (differently) by upstream --- debian/changelog | 1 + debian/patches/configure-dynlink | 19 ------------------- debian/patches/series | 2 -- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index f32c376..7abbb43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ dose3 (3.2-rc1-1) experimental; urgency=medium - replace libpcre-ocaml-dev by libre-ocaml-dev * Drop debian patches integrated by upstream: - pod2man-5.18 + - configure-dynlink * Refreshed patches: - binaries-prefix-edos diff --git a/debian/patches/configure-dynlink b/debian/patches/configure-dynlink deleted file mode 100644 index 6abf583..0000000 --- a/debian/patches/configure-dynlink +++ /dev/null @@ -1,19 +0,0 @@ -Author: Mehdi Dogguy <me...@dogguy.org> -Description: use dynamic loading only where available. Load bytecode, not - native code, on bytecode architectures. - -Index: dose3/configure.ac -=================================================================== ---- dose3.orig/configure.ac 2013-01-20 17:21:15.000000000 +0100 -+++ dose3/configure.ac 2013-01-20 17:24:29.000000000 +0100 -@@ -10,8 +10,8 @@ - AC_MSG_ERROR([You must install the Camlp4 pre-processor]) - fi - --if test "$CAMLP4OOPT" = "no" ; then -- CAMLP4OMACRO="$CAMLP4O Camlp4MacroParser.cmx" -+if test "$CAMLP4OOPT" = "no" || (test ! -f /usr/lib/ocaml/dynlink.cmxa) ; then -+ CAMLP4OMACRO="$CAMLP4O Camlp4MacroParser.cmo" - else - CAMLP4OMACRO="$CAMLP4OOPT -I_build Camlp4MacroParser.cmxs" - fi diff --git a/debian/patches/series b/debian/patches/series index 4ade999..ba5ab43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ -pod2man-5.18 binaries-prefix-edos doc-makefile-html -configure-dynlink ocaml-4.1 ocaml-4.1-zip -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git _______________________________________________ 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