This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch jessie-backports/master
in repository dose3.

commit e6b2a9b7321cf5639826ef73ff6f668dfc3fdf0d
Author: Johannes Schauer <jo...@debian.org>
Date:   Wed Jun 22 13:05:00 2016 +0200

    backport experimental branch to Debian Jessie
---
 debian/changelog                      |   6 ++
 debian/control                        |   8 +-
 debian/patches/jessie-backports.patch | 191 ++++++++++++++++++++++++++++++++++
 debian/patches/series                 |   1 +
 4 files changed, 202 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05e532c..82cfb78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dose3 (5.0~rc2-2) UNRELEASED; urgency=medium
+
+  * backport to Debian Jessie
+
+ -- Johannes Schauer <jo...@debian.org>  Wed, 22 Jun 2016 13:04:16 +0200
+
 dose3 (5.0~rc2-1) experimental; urgency=medium
 
   * new upstream release:
diff --git a/debian/control b/debian/control
index afcab9e..200c6f5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Uploaders: Stefano Zacchiroli <z...@debian.org>,
 Build-Depends: debhelper (>= 9), dh-ocaml (>= 0.9~), dh-autoreconf,
 # use the following line only when autoconf stuff has been patched:
 # automake, autoconf,
- ocaml-nox (>= 3.11.2), cppo (>= 1.1.2),
+ ocaml-nox (>= 3.11.2), cppo (>= 0.9.3),
  libre-ocaml-dev,
- libextlib-ocaml-dev (>= 1.7.0),
- libocamlgraph-ocaml-dev (>= 1.8.6),
+ libextlib-ocaml-dev (>= 1.6.1),
+ libocamlgraph-ocaml-dev (>= 1.8.5),
  libcudf-ocaml-dev (>= 0.7),
  libzip-ocaml-dev, libbz2-ocaml-dev, librpm-dev (>= 4.12),
  perl 
@@ -147,4 +147,4 @@ Description: Documentation for dose tools and libraries.
  tools for analyzing package relationships in a large package repository.
  This package contains the documentation of the dose API, and tutorials of
  various dose tools.
- 
\ No newline at end of file
+ 
diff --git a/debian/patches/jessie-backports.patch 
b/debian/patches/jessie-backports.patch
new file mode 100644
index 0000000..e9c7436
--- /dev/null
+++ b/debian/patches/jessie-backports.patch
@@ -0,0 +1,191 @@
+commit 84e40af0c3d6240b771d777a4c2b47f1f17fb3d4
+Author: Pietro Abate <pietro.ab...@pps.univ-paris-diderot.fr>
+Date:   Wed Jun 22 11:40:18 2016 +0200
+
+    Backport to Debian jessie.
+    
+    compiles with opam switch 4.01.0 and
+    
+    base-bigarray   base
+    base-ocamlbuild base
+    base-threads    base
+    base-unix       base
+    camlbz2         0.6.0
+    camlp4          4.01
+    camlzip         1.05
+    conf-m4         1
+    conf-ncurses    1
+    conf-perl       1
+    conf-pkg-config 1.0
+    cppo            0.9.3
+    cudf            0.7
+    extlib          1.6.1
+    ocaml           4.01.0
+    ocamlbuild      0
+    ocamlfind       1.6.2
+    ocamlgraph      1.8.5
+    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@
+ CFLAGS=@CFLAGS@ -fPIC -Wall -pedantic -Werror -Wno-long-long -warn-error FPSXY
+ CPPFLAGS=@CPPFLAGS@
+ LDFLAGS=@LDFLAGS@
+-CPPOFLAGS=@CPPOFLAGS@
+ OCAMLFIND=@OCAMLFIND@
+ 
+ DOSELIBS = _build/doselibs
+diff --git a/_tags.in b/_tags.in
+index 6c78ecd..050578f 100644
+--- a/_tags.in
++++ b/_tags.in
+@@ -1,12 +1,12 @@
+ true: -traverse
+ 
<{common,versioning,algo,doseparse,doseparseNoRpm,deb,opam,npm,opencsw,pef,rpm,applications,experimental}/**>:
 traverse
+ 
+-<doseparseNoRpm/*.ml{i,}>: pp(cppo @CPPOFLAGS@ @CONFIG_ZIP@ @CONFIG_BZ2@ 
@CONFIG_OCAMLGRAPH@)
+-<doseparse/*.ml{i,}>: pp(cppo @CPPOFLAGS@ @CONFIG_ZIP@ @CONFIG_BZ2@ 
@CONFIG_RPM@ @CONFIG_OCAMLGRAPH@)
++<doseparseNoRpm/*.ml{i,}>: pp(cppo @CONFIG_ZIP@ @CONFIG_BZ2@ 
@CONFIG_OCAMLGRAPH@)
++<doseparse/*.ml{i,}>: pp(cppo @CONFIG_ZIP@ @CONFIG_BZ2@ @CONFIG_RPM@ 
@CONFIG_OCAMLGRAPH@)
+ 
+-<{common,algo,versioning}/*.ml{i,}>: pp(cppo @CPPOFLAGS@ @CONFIG_ZIP@ 
@CONFIG_BZ2@ @CONFIG_RPM@ @CONFIG_OCAMLGRAPH@)
++<{common,algo,versioning}/*.ml{i,}>: pp(cppo @CONFIG_ZIP@ @CONFIG_BZ2@ 
@CONFIG_RPM@ @CONFIG_OCAMLGRAPH@)
+ 
+-<applications/*.ml> or <experimental/*/*.ml> or <experimental/*.ml>: pp(cppo 
@CPPOFLAGS@ @CONFIG_PARMAP@ @CONFIG_OCAMLGRAPH@)
++<applications/*.ml> or <experimental/*/*.ml> or <experimental/*.ml>: pp(cppo 
@CONFIG_PARMAP@ @CONFIG_OCAMLGRAPH@)
+ 
+ <*/*.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 =
+       type label = G.E.label
+       type t = int
+       type edge = G.E.t
+-      let weight e = match G.E.label e with { contents = PkgE.Conflict _ } -> 
1000 | _ -> 0
++      let weight = function { contents = PkgE.Conflict _ } -> 1000 | _ -> 0
+       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
+ ZIP
+ PKG_ZIP
+ CONFIG_ZIP
+-CPPOFLAGS
+ LN
+ OCAML_SYSTEM
+ EGREP
+@@ -3344,8 +3343,6 @@ fi
+ if test x"$CPPO_CHECK" != x"yes" ; then
+     as_fn_error $? "You must install the cppo pre-processor to compile dose3" 
"$LINENO" 5
+ fi
+-# this option cause problems with old versions of cppo
+-CPPOFLAGS="-V OCAML:$OCAMLVERSION"
+ 
+   # checking for ocamllex
+   if test -n "$ac_tool_prefix"; then
+@@ -5367,7 +5364,6 @@ fi
+ 
+ 
+ 
+-
+ 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)
+ if test x"$CPPO_CHECK" != x"yes" ; then
+     AC_MSG_ERROR([You must install the cppo pre-processor to compile dose3])
+ fi
+-# this option cause problems with old versions of cppo
+-CPPOFLAGS="-V OCAML:$OCAMLVERSION"
+ 
+ AC_PROG_OCAMLLEX
+ if test "$OCAMLEX" = "no"; then
+@@ -267,7 +265,6 @@ AS_IF([test "${OCAML_OS_TYPE}" = "Win32"],[
+ ])
+ AC_SUBST(LN)
+ 
+-AC_SUBST(CPPOFLAGS)
+ 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) ;;
+ module type Ot = sig
+   val options :
+     ?usage:string ->
+-    ?status:int ->
+     ?version:string ->
+     ?suppress_usage:bool ->
+     ?suppress_help:bool ->
+@@ -104,7 +103,7 @@ module MakeOptions(O : Ot) = struct
+   let quiet = StdOpt.store_true ()
+   let progress = StdOpt.store_true ()
+   let timers = StdOpt.store_true ()
+-  let options = O.options ~status:64 ~version:VersionInfo.version () ;;
++  let options = O.options ~version:VersionInfo.version () ;;
+ 
+   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
+@@ -2,11 +2,6 @@
+ open Ocamlbuild_plugin;;
+ 
+ Options.use_ocamlfind := true ;;
+-#if OCAML_VERSION > (4, 1, 0)
+-Ocamlbuild_pack.Flags.mark_tag_used "use_" ;;
+-Ocamlbuild_pack.Flags.mark_tag_used "pkg_" ;;
+-Ocamlbuild_pack.Flags.mark_tag_used "link_" ;;
+-#endif
+ 
+ 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 =
+     match v with
+     | (_, (_, package)) -> 
+       let splited = Pcre.split (Pcre.regexp " : ") package in
+-      let base64 = Bytes.to_string (Base64.str_encode (List.nth splited 1)) in
++      let base64 = (Base64.str_encode (List.nth splited 1)) in
+       [[("", None), Some ("=", base64)]]
+ 
+ let parse_dependlist v = lexbuf_wrapper Npm_parser.dependlist_top v ;;
diff --git a/debian/patches/series b/debian/patches/series
index 9dceec7..0191dd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 binaries-prefix-edos
+jessie-backports.patch

-- 
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

Reply via email to