diff -Nru ben-0.6.1ubuntu2/debian/changelog ben-0.6.1ubuntu2~ubuntu12.04.1/debian/changelog --- ben-0.6.1ubuntu2/debian/changelog 2012-07-04 20:50:39.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/debian/changelog 2012-07-04 22:32:07.000000000 +0100 @@ -1,3 +1,13 @@ +ben (0.6.1ubuntu2~ubuntu12.04.1) precise-backports; urgency=low + + * Source change backport to lucid. (LP: #1021071) + * Revert port from ocsigen-xhtml to tyxml. We don't have the required + version of tyxml in Precise and bug #888665 means we wouldn't be able to + use it to build with if backported. + * Update Vcs-* for backports branch + + -- Iain Lane Wed, 04 Jul 2012 22:32:01 +0100 + ben (0.6.1ubuntu2) quantal; urgency=low * Update Vcs-* for Ubuntu diff -Nru ben-0.6.1ubuntu2/debian/control ben-0.6.1ubuntu2~ubuntu12.04.1/debian/control --- ben-0.6.1ubuntu2/debian/control 2012-07-04 20:28:18.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/debian/control 2012-07-04 22:31:30.000000000 +0100 @@ -15,7 +15,7 @@ libpcre-ocaml-dev, libocamlgraph-ocaml-dev, libfileutils-ocaml-dev, - libtyxml-ocaml-dev (>= 2.1-1~), + libocsigen-xhtml-ocaml-dev, libpostgresql-ocaml-dev, ocaml-nox (>= 3.11.1-3~), asciidoc, @@ -26,8 +26,8 @@ Standards-Version: 3.9.3 Section: ocaml Homepage: http://ben.debian.net -Vcs-Browser: https://code.launchpad.net/~ubuntu-transition-trackers/ubuntu-transition-tracker/ben -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-transition-trackers/ubuntu-transition-tracker/ben +Vcs-Browser: https://code.launchpad.net/~ubuntu-transition-trackers/ubuntu-transition-tracker/precise-backports +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-transition-trackers/ubuntu-transition-tracker/precise-backports Package: libben-ocaml-dev Architecture: any diff -Nru ben-0.6.1ubuntu2/debian/libben-ocaml-dev.ocamldoc ben-0.6.1ubuntu2~ubuntu12.04.1/debian/libben-ocaml-dev.ocamldoc --- ben-0.6.1ubuntu2/debian/libben-ocaml-dev.ocamldoc 2012-07-04 17:38:29.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/debian/libben-ocaml-dev.ocamldoc 2012-07-04 21:57:07.000000000 +0100 @@ -1,2 +1,2 @@ # OCamldoc generated documentation - -package unix -package pcre -package ocamlgraph -package tyxml -package fileutils -package threads -package postgresql + -package unix -package pcre -package ocamlgraph -package ocsigen_xhtml -package fileutils -package threads -package postgresql diff -Nru ben-0.6.1ubuntu2/frontends/ben_monitor.ml ben-0.6.1ubuntu2~ubuntu12.04.1/frontends/ben_monitor.ml --- ben-0.6.1ubuntu2/frontends/ben_monitor.ml 2012-07-04 19:05:02.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/frontends/ben_monitor.ml 2012-07-04 21:49:57.000000000 +0100 @@ -21,7 +21,7 @@ open Benl_core open Benl_base open Benl_marshal -open Xhtml.M +open XHTML.M module M = Package.Map module S = Package.Set @@ -810,7 +810,7 @@ :: rows, (i - 1) end ([], (List.length monitor_data - 1)) (List.rev monitor_data) in let table = table (tr (td [ pcdata "" ]) []) rows in - (all, bad, packages, html table) + (all, bad, packages, Xhtmlpretty.xhtml_print (html table)) let print_dependency_levels dep_graph rounds = list_iteri begin fun i xs -> @@ -846,9 +846,7 @@ | Xhtml -> let (_, _, _, output) = print_html_monitor sources binaries dep_graph rounds - in - Xhtml.P.print print_string output; - print_newline () + in printf "%s\n" output let frontend = { Benl_frontend.name = "monitor"; diff -Nru ben-0.6.1ubuntu2/frontends/ben_tracker.ml ben-0.6.1ubuntu2~ubuntu12.04.1/frontends/ben_tracker.ml --- ben-0.6.1ubuntu2/frontends/ben_tracker.ml 2012-07-04 19:00:17.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/frontends/ben_tracker.ml 2012-07-04 21:50:43.000000000 +0100 @@ -17,7 +17,7 @@ (* . *) (**************************************************************************) -open Xhtml.M +open XHTML.M open Printf open Benl_clflags open Benl_utils @@ -202,7 +202,7 @@ with _ -> true in let result = all, bad, htmlp, profile, transition, packages, export in try - Benl_utils.dump_xhtml_to_file html output; + Benl_utils.dump_to_file html output; result with _ -> eprintf "Something bad happened while generating %s!\n" html; @@ -328,10 +328,10 @@ [] in let index = Filename.concat !base "index.html" in - let output = html mybody in + let output = Xhtmlpretty.xhtml_print (html mybody) in try p "Generating index...\n"; - dump_xhtml_to_file index output + dump_to_file index output with exc -> eprintf "E: %s\n" $ Printexc.to_string exc; Printexc.print_backtrace stderr; diff -Nru ben-0.6.1ubuntu2/lib/benl_utils.ml ben-0.6.1ubuntu2~ubuntu12.04.1/lib/benl_utils.ml --- ben-0.6.1ubuntu2/lib/benl_utils.ml 2012-07-04 17:38:29.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/lib/benl_utils.ml 2012-07-04 21:49:15.000000000 +0100 @@ -70,8 +70,3 @@ let outchan = open_out name in let () = output_string outchan string in close_out outchan - -let dump_xhtml_to_file filename xhtml = - let outchan = open_out filename in - let () = Xhtml.P.print (output_string outchan) xhtml in - close_out outchan diff -Nru ben-0.6.1ubuntu2/lib/benl_utils.mli ben-0.6.1ubuntu2~ubuntu12.04.1/lib/benl_utils.mli --- ben-0.6.1ubuntu2/lib/benl_utils.mli 2012-07-04 17:38:29.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/lib/benl_utils.mli 2012-07-04 21:49:15.000000000 +0100 @@ -33,4 +33,3 @@ val file_content : string -> string val dump_to_file : string -> string -> unit -val dump_xhtml_to_file : string -> Xhtml.M.html -> unit diff -Nru ben-0.6.1ubuntu2/myocamlbuild.ml ben-0.6.1ubuntu2~ubuntu12.04.1/myocamlbuild.ml --- ben-0.6.1ubuntu2/myocamlbuild.ml 2012-07-04 17:38:29.000000000 +0100 +++ ben-0.6.1ubuntu2~ubuntu12.04.1/myocamlbuild.ml 2012-07-04 21:49:15.000000000 +0100 @@ -22,7 +22,7 @@ open Ocamlbuild_plugin let name = "ben" -let packages = ["unix"; "pcre"; "ocamlgraph"; "tyxml"; "fileutils"; "threads"; "postgresql"] +let packages = ["unix"; "pcre"; "ocamlgraph"; "ocsigen_xhtml"; "fileutils"; "threads"; "postgresql"] exception Require_findlib exception Missing_findlib_package of string