[Pkg-ocaml-maint-commits] [dose3] 02/02: backport of 5.0.1-2
Ralf Treinen
treinen at moszumanska.debian.org
Mon Oct 17 15:05:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch jessie-backports/master
in repository dose3.
commit 7a386ff784576036eb7ef55bcf0c35edc97a4608
Author: Ralf Treinen <treinen at irif.fr>
Date: Mon Oct 17 16:47:29 2016 +0200
backport of 5.0.1-2
---
debian/changelog | 7 +++
debian/patches/jessie-backports.patch | 102 ++++++++++++++--------------------
2 files changed, 50 insertions(+), 59 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 16d17f6..2d50fc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dose3 (5.0.1-2~bpo8+1) unstable; urgency=medium
+
+ * backport to Debian Jessie
+ * Refreshed patch debian/patches/jessie-backports.patch
+
+ -- Ralf Treinen <treinen at debian.org> Mon, 17 Oct 2016 16:56:07 +0200
+
dose3 (5.0.1-2) unstable; urgency=medium
[ Johannes Schauer ]
diff --git a/debian/patches/jessie-backports.patch b/debian/patches/jessie-backports.patch
index e9c7436..e5c8f03 100644
--- a/debian/patches/jessie-backports.patch
+++ b/debian/patches/jessie-backports.patch
@@ -27,11 +27,11 @@ Date: Wed Jun 22 11:40:18 2016 +0200
ounit 2.0.0
re 1.2.2
-diff --git a/Makefile.config.in b/Makefile.config.in
-index b993aa6..e42b09c 100644
---- a/Makefile.config.in
-+++ b/Makefile.config.in
-@@ -4,7 +4,6 @@ NAME=@PACKAGE_NAME@
+Index: dose3/Makefile.config.in
+===================================================================
+--- dose3.orig/Makefile.config.in 2016-10-17 16:50:03.144331558 +0200
++++ dose3/Makefile.config.in 2016-10-17 16:50:03.136331476 +0200
+@@ -4,7 +4,6 @@
CFLAGS=@CFLAGS@ -fPIC -Wall -pedantic -Werror -Wno-long-long -warn-error FPSXY
CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
@@ -39,10 +39,10 @@ index b993aa6..e42b09c 100644
OCAMLFIND=@OCAMLFIND@
DOSELIBS = _build/doselibs
-diff --git a/_tags.in b/_tags.in
-index 6c78ecd..050578f 100644
---- a/_tags.in
-+++ b/_tags.in
+Index: dose3/_tags.in
+===================================================================
+--- dose3.orig/_tags.in 2016-10-17 16:50:03.144331558 +0200
++++ dose3/_tags.in 2016-10-17 16:50:03.136331476 +0200
@@ -1,12 +1,12 @@
true: -traverse
<{common,versioning,algo,doseparse,doseparseNoRpm,deb,opam,npm,opencsw,pef,rpm,applications,experimental}/**>: traverse
@@ -60,11 +60,11 @@ index 6c78ecd..050578f 100644
<*/*.ml{i,}>: pp(cppo)
<*/*.ml{i,}>: package(extlib), @PKG_CUDF@, package(re.pcre)
-diff --git a/algo/diagnostic.ml b/algo/diagnostic.ml
-index d150928..69612a9 100644
---- a/algo/diagnostic.ml
-+++ b/algo/diagnostic.ml
-@@ -505,7 +505,7 @@ let print_error ?(condense=false) ?(minimal=false) pp root fmt l =
+Index: dose3/algo/diagnostic.ml
+===================================================================
+--- dose3.orig/algo/diagnostic.ml 2016-10-17 16:50:03.144331558 +0200
++++ dose3/algo/diagnostic.ml 2016-10-17 16:50:03.140331517 +0200
+@@ -505,7 +505,7 @@
type label = G.E.label
type t = int
type edge = G.E.t
@@ -73,27 +73,11 @@ index d150928..69612a9 100644
let compare = Pervasives.compare
let add = (+)
let zero = 0
-diff --git a/algo/dominators.ml b/algo/dominators.ml
-index d7be032..872f03c 100644
---- a/algo/dominators.ml
-+++ b/algo/dominators.ml
-@@ -101,11 +101,7 @@ let dominators_tarjan graph =
- ) graph;
-
- Util.Timer.start tjntimer;
--#if OCAMLGRAPHVERSION <= 186
-- let module Dom = Dominator.Make_graph(G) in
--#else
- let module Dom = Dominator.Make(G) in
--#endif
- let idom = Dom.compute_all graph start_pkg in
- let domgr = idom.Dom.dom_graph () in
- Util.Timer.stop tjntimer ();
-diff --git a/configure b/configure
-index 62790bc..baddf44 100755
---- a/configure
-+++ b/configure
-@@ -646,7 +646,6 @@ CONFIG_PARMAP
+Index: dose3/configure
+===================================================================
+--- dose3.orig/configure 2016-10-17 16:50:03.144331558 +0200
++++ dose3/configure 2016-10-17 16:50:03.140331517 +0200
+@@ -646,7 +646,6 @@
ZIP
PKG_ZIP
CONFIG_ZIP
@@ -101,7 +85,7 @@ index 62790bc..baddf44 100755
LN
OCAML_SYSTEM
EGREP
-@@ -3344,8 +3343,6 @@ fi
+@@ -3344,8 +3343,6 @@
if test x"$CPPO_CHECK" != x"yes" ; then
as_fn_error $? "You must install the cppo pre-processor to compile dose3" "$LINENO" 5
fi
@@ -110,19 +94,19 @@ index 62790bc..baddf44 100755
# checking for ocamllex
if test -n "$ac_tool_prefix"; then
-@@ -5367,7 +5364,6 @@ fi
+@@ -5339,7 +5336,6 @@
-
- LDFLAGS="-fstack-protector"
-diff --git a/configure.ac b/configure.ac
-index 694b2eb..3299b0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,8 +22,6 @@ AC_CHECK_PROG(CPPO_CHECK,cppo,yes)
+
+Index: dose3/configure.ac
+===================================================================
+--- dose3.orig/configure.ac 2016-10-17 16:50:03.144331558 +0200
++++ dose3/configure.ac 2016-10-17 16:50:03.140331517 +0200
+@@ -22,8 +22,6 @@
if test x"$CPPO_CHECK" != x"yes" ; then
AC_MSG_ERROR([You must install the cppo pre-processor to compile dose3])
fi
@@ -131,7 +115,7 @@ index 694b2eb..3299b0d 100644
AC_PROG_OCAMLLEX
if test "$OCAMLEX" = "no"; then
-@@ -267,7 +265,6 @@ AS_IF([test "${OCAML_OS_TYPE}" = "Win32"],[
+@@ -267,7 +265,6 @@
])
AC_SUBST(LN)
@@ -139,11 +123,11 @@ index 694b2eb..3299b0d 100644
AC_SUBST(CONFIG_ZIP)
AC_SUBST(PKG_ZIP)
AC_SUBST(ZIP)
-diff --git a/doseparse/stdOptions.ml b/doseparse/stdOptions.ml
-index 19d4ab2..2d76977 100644
---- a/doseparse/stdOptions.ml
-+++ b/doseparse/stdOptions.ml
-@@ -22,7 +22,6 @@ include Util.Logging(struct let label = label end) ;;
+Index: dose3/doseparse/stdOptions.ml
+===================================================================
+--- dose3.orig/doseparse/stdOptions.ml 2016-10-17 16:50:03.144331558 +0200
++++ dose3/doseparse/stdOptions.ml 2016-10-17 16:50:03.140331517 +0200
+@@ -22,7 +22,6 @@
module type Ot = sig
val options :
?usage:string ->
@@ -151,7 +135,7 @@ index 19d4ab2..2d76977 100644
?version:string ->
?suppress_usage:bool ->
?suppress_help:bool ->
-@@ -104,7 +103,7 @@ module MakeOptions(O : Ot) = struct
+@@ -104,7 +103,7 @@
let quiet = StdOpt.store_true ()
let progress = StdOpt.store_true ()
let timers = StdOpt.store_true ()
@@ -160,10 +144,10 @@ index 19d4ab2..2d76977 100644
open OptParser ;;
add options ~short_name:'v' ~long_name:"verbose" ~help:"print additional information" verbose;
-diff --git a/myocamlbuild.ml.pp b/myocamlbuild.ml.pp
-index a903e0f..ed49866 100644
---- a/myocamlbuild.ml.pp
-+++ b/myocamlbuild.ml.pp
+Index: dose3/myocamlbuild.ml.pp
+===================================================================
+--- dose3.orig/myocamlbuild.ml.pp 2016-10-17 16:50:03.144331558 +0200
++++ dose3/myocamlbuild.ml.pp 2016-10-17 16:50:03.140331517 +0200
@@ -2,11 +2,6 @@
open Ocamlbuild_plugin;;
@@ -176,11 +160,11 @@ index a903e0f..ed49866 100644
let modules_dirs = [
"common"; "versioning"; "pef"; "opam"; "npm"; "deb"; "opencsw"; "rpm"; "algo";
-diff --git a/npm/packages.ml b/npm/packages.ml
-index b4628d9..b0c02b1 100644
---- a/npm/packages.ml
-+++ b/npm/packages.ml
-@@ -30,7 +30,7 @@ let lexbuf_wrapper type_parser v =
+Index: dose3/npm/packages.ml
+===================================================================
+--- dose3.orig/npm/packages.ml 2016-10-17 16:50:03.144331558 +0200
++++ dose3/npm/packages.ml 2016-10-17 16:50:03.140331517 +0200
+@@ -30,7 +30,7 @@
match v with
| (_, (_, package)) ->
let splited = Pcre.split (Pcre.regexp " : ") package in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
More information about the Pkg-ocaml-maint-commits
mailing list